diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 4c7792a0468..f186e44ad22 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1385,3 +1385,9 @@ Entries: - {message: "Новая еда, Вульпикс.", type: Add} id: 55696 #костыль отображения в Обновлениях time: '2024-03-05T21:00:43.0000000+00:00' + +- author: Xelasto + changes: + - {message: "Добавлена одежда торговцев. Автор спрайтов - prazat911", type: Add} + id: 55697 #костыль отображения в Обновлениях + time: '2024-03-06T21:00:43.0000000+00:00' diff --git a/Resources/Locale/ru-RU/ADT/Trader/trader.ftl b/Resources/Locale/ru-RU/ADT/Trader/trader.ftl index 58ec1947655..96d963a14d7 100644 --- a/Resources/Locale/ru-RU/ADT/Trader/trader.ftl +++ b/Resources/Locale/ru-RU/ADT/Trader/trader.ftl @@ -16,3 +16,13 @@ ent-EncryptionKeyTrader = ключ шифрования торговцев .desc = Ключ шифрования, используемый торговцами. ent-ClothingHeadsetTrader = гарнитура торговцев .desc = Гарнитура, используемая торговцами. +ent-ADTBannerTSF = знамя ТСФ + .desc = Это знамя с логотипом ТСФ. +ent-ADTClothingHeadHatTrader = кепка торговца + .desc = Бейсболка, окрашенная в цвета ТСФ +ent-ADTClothingUniformTrader = комбинезон торговца + .desc = Это комбинезон, который носят торговцы ТСФ +ent-ADTClothingOuterCoatTrader = бомбер торговца + .desc = Куртка-бомбер торговцев ТСФ +ent-ClothingBackpackTraderFilled = дюротканевый вещмешок + .desc = Вещмешок выполненый из более прочной и эластичной дюраткани. diff --git a/Resources/Maps/traderpost.yml b/Resources/Maps/traderpost.yml index 78df94243da..0c0e166819a 100644 --- a/Resources/Maps/traderpost.yml +++ b/Resources/Maps/traderpost.yml @@ -91,66 +91,66 @@ entities: color: '#8000E1FF' id: BotGreyscale decals: - 79: -17,-9 - 80: -17,-10 - 81: -17,-11 + 44: -17,-9 + 45: -17,-10 + 46: -17,-11 - node: color: '#B40000FF' id: BotGreyscale decals: - 72: -17,-19 - 73: -17,-18 - 74: -17,-17 - 75: -17,-16 - 76: -17,-15 - 77: -17,-14 - 78: -17,-13 + 37: -17,-19 + 38: -17,-18 + 39: -17,-17 + 40: -17,-16 + 41: -17,-15 + 42: -17,-14 + 43: -17,-13 - node: color: '#FFFFFFFF' id: BotGreyscale decals: - 28: -7,-19 - 29: -7,-18 - 30: -7,-17 - 31: -7,-16 - 32: -7,-15 - 33: -7,-14 - 34: -7,-13 - 35: -9,-13 - 36: -9,-14 - 37: -9,-15 - 38: -9,-16 - 39: -9,-17 - 40: -9,-18 - 41: -9,-19 - 42: -11,-19 - 43: -11,-18 - 44: -11,-17 - 45: -11,-16 - 46: -11,-15 - 47: -11,-14 - 48: -11,-13 - 49: -13,-13 - 50: -13,-14 - 51: -13,-15 - 52: -13,-16 - 53: -13,-17 - 54: -13,-18 - 55: -13,-19 - 56: -15,-19 - 57: -15,-18 - 58: -15,-17 - 59: -15,-15 - 60: -15,-16 - 61: -15,-14 - 62: -15,-13 + 2: -7,-19 + 3: -7,-18 + 4: -7,-17 + 5: -7,-16 + 6: -7,-15 + 7: -7,-14 + 8: -7,-13 + 9: -9,-13 + 10: -9,-14 + 11: -9,-15 + 12: -9,-16 + 13: -9,-17 + 14: -9,-18 + 15: -9,-19 + 16: -11,-19 + 17: -11,-18 + 18: -11,-17 + 19: -11,-16 + 20: -11,-15 + 21: -11,-14 + 22: -11,-13 + 23: -13,-13 + 24: -13,-14 + 25: -13,-15 + 26: -13,-16 + 27: -13,-17 + 28: -13,-18 + 29: -13,-19 + 30: -15,-19 + 31: -15,-18 + 32: -15,-17 + 33: -15,-15 + 34: -15,-16 + 35: -15,-14 + 36: -15,-13 - node: angle: 4.71238898038469 rad color: '#FFFFFFFF' id: WarnLineW decals: - 26: -7,-10 - 27: -7,-11 + 0: -7,-10 + 1: -7,-11 - type: GridAtmosphere version: 2 data: @@ -194,7 +194,8 @@ entities: 0,-5: 0: 65535 1,-5: - 0: 65535 + 0: 61439 + 1: 4096 2,-5: 0: 13107 -4,-5: @@ -253,6 +254,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14948 + moles: + - 18.472576 + - 69.49208 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -316,9 +332,6 @@ entities: tiles: eAAAAAAAeAAAAAAAgwAAAAAAeAAAAAAAeAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: Broadphase - - type: Tag - tags: - - Trader - type: Physics bodyStatus: InAir angularDamping: 0.05 @@ -327,6 +340,9 @@ entities: bodyType: Dynamic - type: Fixtures fixtures: {} + - type: Tag + tags: + - Trader - type: OccluderTree - type: SpreaderGrid - type: Shuttle @@ -517,6 +533,48 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-6.5 parent: 2 +- proto: ADTBannerTSF + entities: + - uid: 238 + components: + - type: Transform + pos: 5.5,1.5 + parent: 2 + - uid: 239 + components: + - type: Transform + pos: 2.5,-8.5 + parent: 2 + - uid: 240 + components: + - type: Transform + pos: 6.5,-12.5 + parent: 2 + - uid: 241 + components: + - type: Transform + pos: -2.5,-12.5 + parent: 2 + - uid: 449 + components: + - type: Transform + pos: 2.5,2.5 + parent: 420 + - uid: 450 + components: + - type: Transform + pos: -1.5,2.5 + parent: 420 + - uid: 451 + components: + - type: Transform + pos: 2.5,10.5 + parent: 420 + - uid: 452 + components: + - type: Transform + pos: -1.5,10.5 + parent: 420 - proto: ADTFoodMeatChickenBakedWithVegetables entities: - uid: 228 @@ -851,48 +909,6 @@ entities: rot: 3.141592653589793 rad pos: -12.5,-7.5 parent: 2 -- proto: BannerCargo - entities: - - uid: 238 - components: - - type: Transform - pos: 2.5,-8.5 - parent: 2 - - uid: 239 - components: - - type: Transform - pos: 6.5,-12.5 - parent: 2 - - uid: 240 - components: - - type: Transform - pos: -2.5,-12.5 - parent: 2 - - uid: 241 - components: - - type: Transform - pos: 5.5,1.5 - parent: 2 - - uid: 449 - components: - - type: Transform - pos: 2.5,2.5 - parent: 420 - - uid: 450 - components: - - type: Transform - pos: -1.5,2.5 - parent: 420 - - uid: 451 - components: - - type: Transform - pos: 2.5,10.5 - parent: 420 - - uid: 452 - components: - - type: Transform - pos: -1.5,10.5 - parent: 420 - proto: Bed entities: - uid: 285 @@ -2109,27 +2125,39 @@ entities: rot: 3.141592653589793 rad pos: 1.5,16.5 parent: 420 -- proto: ClosetBaseTardis +- proto: ClosetEmergencyFilledRandom + entities: + - uid: 556 + components: + - type: Transform + pos: -4.5,5.5 + parent: 420 + - uid: 557 + components: + - type: Transform + pos: 5.5,5.5 + parent: 420 +- proto: ClosetMaintenance entities: - uid: 297 components: - type: Transform - pos: -4.5,-16.5 + pos: 8.5,-16.5 parent: 2 - uid: 298 components: - type: Transform - pos: -0.5,-16.5 + pos: 4.5,-16.5 parent: 2 - uid: 299 components: - type: Transform - pos: 4.5,-16.5 + pos: -0.5,-16.5 parent: 2 - uid: 300 components: - type: Transform - pos: 8.5,-16.5 + pos: -4.5,-16.5 parent: 2 - uid: 302 components: @@ -2141,18 +2169,6 @@ entities: - type: Transform pos: -2.5,16.5 parent: 420 -- proto: ClosetEmergencyFilledRandom - entities: - - uid: 556 - components: - - type: Transform - pos: -4.5,5.5 - parent: 420 - - uid: 557 - components: - - type: Transform - pos: 5.5,5.5 - parent: 420 - proto: ClosetWallEmergencyFilledRandom entities: - uid: 558 @@ -3510,7 +3526,7 @@ entities: pos: 5.5,8.5 parent: 420 - type: Door - secondsUntilStateChange: -1305.0509 + secondsUntilStateChange: -1934.3147 state: Opening - proto: ShuttleWindow entities: diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml index 2bc7cf8d910..04293080c52 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml @@ -661,3 +661,17 @@ sprite: ADT/Clothing/Head/Hats/hood_paramedic.rsi #спрайты от prazat911 - type: Clothing sprite: ADT/Clothing/Head/Hats/hood_paramedic.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatTrader + name: hat + description: trader. + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - DroneUsable + - type: Sprite + sprite: ADT/Clothing/Head/Hats/trader.rsi #спрайты от prazat911 + - type: Clothing + sprite: ADT/Clothing/Head/Hats/trader.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 526f0e8be90..7791b939769 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -109,3 +109,22 @@ coefficients: Slash: 0.95 Heat: 0.90 + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatTrader + name: trader + description: trader. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi + - type: TemperatureProtection + coefficient: 0.9 + - type: Armor + modifiers: + coefficients: + Slash: 0.95 + Heat: 0.90 + diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml index e9119197cfd..9fea83f88e4 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml @@ -1275,3 +1275,14 @@ sprite: ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformTrader + name: trader jumpsuit + description: trader. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/trader.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/trader.rsi diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml index ef4fd776d0b..68948a65eed 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml @@ -10,22 +10,23 @@ description: ghost-role-information-trader-description requirements: - !type:OverallPlaytimeRequirement - time: 108000 # 30h overall + time: 162000 # 45h overall - type: GhostTakeoverAvailable - type: RandomHumanoidAppearance - type: Loadout prototypes: [ Trader ] + - type: entity parent: BasePDA id: TraderPDA name: trader PDA description: trader PDA components: + - type: Sprite + sprite: ADT/Objects/Misc/trader_pda.rsi - type: Pda id: TraderIDCard - state: pda-qm - - type: Icon - state: pda-qm + state: pda-tradertsf - type: entity parent: IDCardStandard @@ -34,9 +35,10 @@ description: TraderIDCard components: - type: Sprite + sprite: ADT/Objects/Misc/trader_id.rsi layers: - - state: orange - - state: idcargotechnician + - state: tsf + - state: idtrader_tsf - type: IdCard jobTitle: Торговец - type: Access @@ -79,14 +81,14 @@ - EncryptionKeyTrader - EncryptionKeyCommon - type: Sprite - sprite: Clothing/Ears/Headsets/cargo.rsi + sprite: ADT/Clothing/Ears/Headsets/trader.rsi - type: Clothing - sprite: Clothing/Ears/Headsets/cargo.rsi + sprite: ADT/Clothing/Ears/Headsets/trader.rsi - type: entity noSpawn: true - parent: ClothingBackpackCargoFilled - id: ClothingBackpackCargoTraderFilled + parent: ADTClothingBackpackDuffelDurathead + id: ClothingBackpackTraderFilled components: - type: StorageFill contents: @@ -94,6 +96,7 @@ - id: RubberStampTrader - id: AppraisalTool - id: SpaceCash500 + - id: ADTClothingOuterCoatTrader - type: entity name: Trader diff --git a/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml b/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml new file mode 100644 index 00000000000..d421adf0286 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml @@ -0,0 +1,9 @@ +- type: entity + id: ADTBannerTSF + parent: BannerBase + name: tsf banner + description: tsf banner. + components: + - type: Sprite + sprite: ADT/Structures/Decoration/tsf_banner.rsi + state: humanflag diff --git a/Resources/Prototypes/ADT/StartingGear/trader.yml b/Resources/Prototypes/ADT/StartingGear/trader.yml index 2c6b734f00f..7d09ac98ece 100644 --- a/Resources/Prototypes/ADT/StartingGear/trader.yml +++ b/Resources/Prototypes/ADT/StartingGear/trader.yml @@ -1,9 +1,9 @@ - type: startingGear id: Trader equipment: - head: ClothingHeadHatCargosoft - jumpsuit: ClothingUniformJumpsuitCargo - back: ClothingBackpackCargoTraderFilled + head: ADTClothingHeadHatTrader + jumpsuit: ADTClothingUniformTrader + back: ClothingBackpackTraderFilled shoes: ClothingShoesColorBlack id: TraderPDA ears: ClothingHeadsetTrader @@ -12,4 +12,4 @@ socks: ClothingUnderwearSocksNormal underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerClothingSkirt: ClothingUniformJumpskirtCargo + innerClothingSkirt: ADTClothingUniformTrader diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index e263b8a0515..30622e3abda 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -512,7 +512,7 @@ startAnnouncement: station-event-trader-spawn-announcement startAudio: path: /Audio/Announcements/attention.ogg - weight: 10 + weight: 15 minimumPlayers: 45 earliestStart: 30 maxOccurrences: 1 diff --git a/Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/equipped-EARS.png b/Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/equipped-EARS.png new file mode 100644 index 00000000000..dd0a988ab12 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/icon.png b/Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/icon.png new file mode 100644 index 00000000000..61716306f90 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/meta.json b/Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/meta.json new file mode 100644 index 00000000000..47344de7351 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EARS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..e4242dd4541 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/icon.png new file mode 100644 index 00000000000..d4366822c1e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/meta.json new file mode 100644 index 00000000000..529005ddbb9 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..3ea46d85d1d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/icon.png new file mode 100644 index 00000000000..0b0cb9dc469 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/inhand-left.png new file mode 100644 index 00000000000..ddc4ea03f88 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/inhand-right.png new file mode 100644 index 00000000000..040e2d33534 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/meta.json new file mode 100644 index 00000000000..5bc357c7d5e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..e36458797cc Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..f94902e682e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/icon.png new file mode 100644 index 00000000000..f3a13e404a2 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/inhand-left.png new file mode 100644 index 00000000000..fe01308f0fc Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/inhand-right.png new file mode 100644 index 00000000000..c51699f236c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/meta.json new file mode 100644 index 00000000000..814f1ba8edf --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Misc/trader_id.rsi/idtrader_tsf.png b/Resources/Textures/ADT/Objects/Misc/trader_id.rsi/idtrader_tsf.png new file mode 100644 index 00000000000..33059b3cc85 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/trader_id.rsi/idtrader_tsf.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/trader_id.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/trader_id.rsi/meta.json new file mode 100644 index 00000000000..2754d1c982c --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/trader_id.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "idtrader_tsf" + }, + { + "name": "tsf" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/trader_id.rsi/tsf.png b/Resources/Textures/ADT/Objects/Misc/trader_id.rsi/tsf.png new file mode 100644 index 00000000000..d7fce28cc2d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/trader_id.rsi/tsf.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/id_overlay.png b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/id_overlay.png new file mode 100644 index 00000000000..3f5d310e703 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/id_overlay.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/inhand-left.png new file mode 100644 index 00000000000..12b784f81e8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/inhand-right.png new file mode 100644 index 00000000000..6919215bcf5 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/light_overlay.png b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/light_overlay.png new file mode 100644 index 00000000000..286a6c32558 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/light_overlay.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/meta.json new file mode 100644 index 00000000000..9210864490c --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pda-tradertsf" + }, + { + "name": "id_overlay" + }, + { + "name": "light_overlay" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/pda-tradertsf.png b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/pda-tradertsf.png new file mode 100644 index 00000000000..aaca5c5a3e1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/pda-tradertsf.png differ diff --git a/Resources/Textures/ADT/Structures/Decoration/tsf_banner.rsi/humanflag.png b/Resources/Textures/ADT/Structures/Decoration/tsf_banner.rsi/humanflag.png new file mode 100644 index 00000000000..c77eff80775 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Decoration/tsf_banner.rsi/humanflag.png differ diff --git a/Resources/Textures/ADT/Structures/Decoration/tsf_banner.rsi/meta.json b/Resources/Textures/ADT/Structures/Decoration/tsf_banner.rsi/meta.json new file mode 100644 index 00000000000..2327a07e3ac --- /dev/null +++ b/Resources/Textures/ADT/Structures/Decoration/tsf_banner.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "ADT team", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "humanflag" + } + ] +}