From b20aa0240a1855ac4bc877a7a310524e422df93e Mon Sep 17 00:00:00 2001 From: Xelasto Date: Wed, 6 Mar 2024 19:02:23 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D0=B6=D0=B4=D0=B0=20?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B3=D0=BE=D0=B2=D1=86=D0=B5=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 6 + Resources/Locale/ru-RU/ADT/Trader/trader.ftl | 10 + Resources/Maps/traderpost.yml | 238 ++++++++++-------- .../ADT/Entities/Clothing/Head/Hats/hats.yml | 14 ++ .../Entities/Clothing/OuterClothing/coats.yml | 19 ++ .../Entities/Clothing/Uniforms/Jumpsuit.yml | 11 + .../ADT/Entities/Mobs/player/trader.yml | 23 +- .../Structures/Decorations/banners.yml | 9 + .../Prototypes/ADT/StartingGear/trader.yml | 8 +- Resources/Prototypes/GameRules/events.yml | 2 +- .../Headsets/trader.rsi/equipped-EARS.png | Bin 0 -> 325 bytes .../Ears/Headsets/trader.rsi/icon.png | Bin 0 -> 373 bytes .../Ears/Headsets/trader.rsi/meta.json | 18 ++ .../Head/Hats/trader.rsi/equipped-HELMET.png | Bin 0 -> 540 bytes .../Clothing/Head/Hats/trader.rsi/icon.png | Bin 0 -> 360 bytes .../Clothing/Head/Hats/trader.rsi/meta.json | 19 ++ .../bomber_tsf.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1197 bytes .../Coats/bomber_tsf.rsi/icon.png | Bin 0 -> 605 bytes .../Coats/bomber_tsf.rsi/inhand-left.png | Bin 0 -> 656 bytes .../Coats/bomber_tsf.rsi/inhand-right.png | Bin 0 -> 654 bytes .../Coats/bomber_tsf.rsi/meta.json | 26 ++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1094 bytes .../trader.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1435 bytes .../Uniforms/Jumpsuit/trader.rsi/icon.png | Bin 0 -> 502 bytes .../Jumpsuit/trader.rsi/inhand-left.png | Bin 0 -> 685 bytes .../Jumpsuit/trader.rsi/inhand-right.png | Bin 0 -> 714 bytes .../Uniforms/Jumpsuit/trader.rsi/meta.json | 30 +++ .../Misc/trader_id.rsi/idtrader_tsf.png | Bin 0 -> 227 bytes .../ADT/Objects/Misc/trader_id.rsi/meta.json | 18 ++ .../ADT/Objects/Misc/trader_id.rsi/tsf.png | Bin 0 -> 377 bytes .../Misc/trader_pda.rsi/id_overlay.png | Bin 0 -> 90 bytes .../Misc/trader_pda.rsi/inhand-left.png | Bin 0 -> 1212 bytes .../Misc/trader_pda.rsi/inhand-right.png | Bin 0 -> 1205 bytes .../Misc/trader_pda.rsi/light_overlay.png | Bin 0 -> 763 bytes .../ADT/Objects/Misc/trader_pda.rsi/meta.json | 29 +++ .../Misc/trader_pda.rsi/pda-tradertsf.png | Bin 0 -> 500 bytes .../Decoration/tsf_banner.rsi/humanflag.png | Bin 0 -> 672 bytes .../Decoration/tsf_banner.rsi/meta.json | 15 ++ 38 files changed, 370 insertions(+), 125 deletions(-) create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Decorations/banners.yml create mode 100644 Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/equipped-EARS.png create mode 100644 Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Misc/trader_id.rsi/idtrader_tsf.png create mode 100644 Resources/Textures/ADT/Objects/Misc/trader_id.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Misc/trader_id.rsi/tsf.png create mode 100644 Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/id_overlay.png create mode 100644 Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/light_overlay.png create mode 100644 Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Misc/trader_pda.rsi/pda-tradertsf.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/tsf_banner.rsi/humanflag.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/tsf_banner.rsi/meta.json 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..ab4db91ff25 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml @@ -10,22 +10,25 @@ 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 + state: pda-tradertsf - type: Icon - state: pda-qm + state: pda-tradertsf - type: entity parent: IDCardStandard @@ -34,9 +37,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 +83,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 +98,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 0000000000000000000000000000000000000000..dd0a988ab128d8a375f8a0285b4cc685d653af85 GIT binary patch literal 325 zcmV-L0lNN)P)Px#|4BqaRCr$PnZXf*Fc8FW4XG*xrHT}ks;I$f0nF^IW-Q)tx7G?ijAQd_Y<~Vj z02;740bha51-SPSoO8}G2G*LDe3uXNdVl8m`(D1kW!BxC_yeUu3Ls6GK3@aq4W;vG zK$GL&!-cUN92BZno=W77H zp>#eCNE4>d*8qA$>3kZnN_gd8{OYdcb4v!?{Rf{sz|+}F0G=)-Jud)K8;vX)(4bD* zsR5)m8d)@;L7lWy14wN&vS>hqI%%f{klJWu(SQbZ(oPK^wb96;0S)S;of<%Dqmktg XE|C~Powo8I00000NkvXXu0mjfD{6<} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..61716306f909bc1e06616b6e5c0774f557c91737 GIT binary patch literal 373 zcmV-*0gC>KP)Px$FG)l}R9Hu2WEfz;IKcKZj5=U61V%%Eq!5shkoeEX$H(yL(lRU-peP%Ha=|A)RR&IF3x@A^PrzxuPq*n41t8a}sj2;c z&ZQ3b2sYn~i;Mqg+u#mvzbC?5&wH#zFNe%#o!pDyv8Tk46vBo{f z0i;+?vI9UGa9Ki*@Auz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e4242dd454109d9bfcf5df7af5441fae987a6d3e GIT binary patch literal 540 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zuX(yShE&A8 zowe7CIZ&Wgy~BQL)6|2krVm2E zCrrktZd2C`F^MG$4_Fiu-v_3*WS3fcT;Sp{l5Kr zNu(xg#H-c5?jQd>bbMR;<%^DQYr@*~d2EnNED zJNfYa_UnU0cBVwCrAB(q6W_FLpZetK>|bqi8653xCV%aJ<$n6&<1bdO_9qJt6x^$r z{GajGg=u%^i!>}{{G!9wkjJprpXmbcg0G$oyBN3FaXOecTvKO!!FJ)73d3E7sQD}l zq#a&QW+-9Ks1?Ga*pubV`{&EMPqLlo0J@(!V#|DfMw3#v15xp^4iWzCS4(UZh0d|& z`+(e*Zqzd7&IEZKgZRT-TZH&ajt{Q+W5{@#&1-HC&3X zj{QzM&wl1rcIj2dHAb)AR=W$hKvyw_H8Raa~^L0bq19c)I$ztaD0e0strc^v3`I literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d4366822c1ef77c0eda6581f332f623b8a8cfa90 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TEDn4#?y*WRVR3T?6Ag<5KAg__+rL`lzRB8I8k;+VT5>oyEtRtRWU+eE-|TY3 zIrnyVEcnSHx*)pmd{D|(^K~{U6?LE09Nh)pGE6w{xl!hc#44);S1jM{U$V=Jd6%+- z-BH$zM+`}~`4vvjzq8}Whd(b__bl`&5jo)0Ai+K-%6_tA*y+Yyd=n;2`OR-6BEoxv z;l%Ov@8&UhcWOopq*{9D1}Z9O=6;BGbLP)+bgfiu?&;wPx(XGugsRCr$PT1`k5Q4~IpFc5>p5;Vy&6zxY)NW?`!NmdX^Sx``}YLO5@1}$2* z2r_76i;BR4g0irUWmr&w3j-h8kD_E*W}%o-A`~|94IH_S@4dNaoOv<4dpA1o-Z?+t z`MHmGz6hoGiln&zWB@Q3km3lK5=ij`Fip^ufV2c2T)k-RJAP&XaPdBu%6B_|bbFOm zUcPa`v7Vkcbn|JKIG~~zE;Syrw$|*TPa_{l1p&^l&RDt}U&~M^U%ze@O-)VP3RY%iQCHs(4ULaS3bV7Vs?tK5 zn4GltGBY!1dP5yOY(A$YTL*x>4d< z{w%GihPKt!Q2*Ul#-|03Z~?Q36GI zS+)Tx0Qq}PQf2FPy7BiXO)t%(irRxTHZVZloh`2N-7=t}y57nyE~f6byOi;JbWT45 zt^zPPI%$_6+pALw2@OPaRp+4;3ZT@P0eA*LSOB3cd&UM$$B1|!u>R=d?-dA;PhfpP=8p6fLmRA-B$yU2mpzE zk+HfNATdC4mi6;H-1XIGY0nV>fDCYUS!bgRIs@P=dH|LR0RG1c8~`<9+;E(qNunw_ z%O#lT9cchW86Yt>EN2Y>VTn{wcA5+b3fZv8H5m|=NCjo5$$+4c4U1fp0bz+$P%} z{Z$yw^K_UU#Yjr!3nT*om6O1H0dNv9k^bJ>E}Bk>GC<`5@GQ>B7f1#GPEG>G^WYGG zlOP?-ivdta(@wI2bSmQ&EC9fqgqOK#G_j(Rz#)M1pZj}hY&5Fvm-ayztJXh;p=vqk zGBUh6t-j~XMDPcgkMM0aCpZAmd~of7p>^oUi8(fgIxhFaK{pvr+75UDcWzy=*=x8K zC3HDa2B;i8Tsa_0IVm%4#{03a0)R{eNsC!y(yLGe02DjxoNoplI*K38Lx##pa9(?{ zY)qtg(E#i&E4Kb;3A9HC=J}9x091ZJGH-!+Ot3%!;Q2hKopW9<{TAl6B;x6H+NUF5 zR028z!*<315VnZPx%7fD1xR9Hvtm)|QxVHn4sK&LL~bN&Ew%_-X0)s+%Z1kT96hJg%h~&$MY}oY^4<5m-_QGf-sd^Z0C|24 zdG-e#Ku~kyks&3))FiDZ*JlJBMk`Wtg}P>H7;vXje`&ih2Z?i%iTY# zKxvM~N(fAY09e4L$$1C{!a@*SfQH%%>C|YbG`hZfk^xYIr#5b^z*X@l*m`Fq^T(i{ zTLx7C_VhQ=1k_bp!8VEJ^cXXKNR{N2l5oKmcqn?0f8QYB9QqY9*jnrT4I1a{|Dc z5(M=;t|@22Z*ilBW&_V0wcI|Xam&twYzbt$bnI757(jU`aT9h9DAz>Cu%-m)dm!>Z r;$HwnjC0WlmmrtTMc&Z?^aQ>DiwjRMr~-Yr00000NkvXXu0mjfXsZ#M literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ddc4ea03f88009e008c42111a06e898716c2f484 GIT binary patch literal 656 zcmV;B0&o3^P)Px%N=ZaPRCr$PTF)y)Q4~J1A<8s0h4DKYvKb3IWue3h8;N3r1v`=Q2Pl!Hm5nKq z4N6(r$;QH@WG3?aS4~Z$h>f1ktNWT>c=Jwg8u#AwHZyPLefOR3JKwo?aZVm+e&uP- zA6Ni(faVHt321Hr-UPV>xCAs;fJ;Dg1Mn%pCBP-1xdL1Qnj3&mfvl9ka7UXFIXJY| zw%__8{ z?+aIz8b}`35Eo)mgy`LiBi?Pio-Qb|he0&emBaDbJ+wAg!ui#c8JANQ5ntvjFrTdm z1}rWQj|ubpbL!J`7kDZF)_S<55mwfAp&{spi^rt(IWf`$(UTaY?+x~BrQ@*-#D&6T zf_IyJeBM(5L;%7G7&sDf%Dg>r#M^(%WdHa#0#E|U6(%bV$Q2pNdszUAYARva0V-va z!i60`QB5TbJ3ysuQn;`KD5|N1VF##`O$rxw07W&GFzf)8vPt2>4xp%}5{4b1QZ^}E z*Z~yPRKl@tTauoeGT;PFa=T+R=JK!4@(6&KF?Nq=30000Px%NJ&INRCr$Pn!8H_K@i3#*eD8yK*0Ej50pd%iG_{WSqXyL1W|~Mm8B?xe}Ev0 zofc}NpoooHDT0MyXJHyKLGcld5dtBCqK%wP;Eqe~&SGJY2|L>)*|2lpe)F5XV#foD z50B#e2R48SP}~770mT8}Ly${=OF(f4xC9gjfZqaK0$c)$JHRENH~{<>uq}buK)<$g zerfzy`kOj6tFu#DYbXrC<`zgjKfz-%0W&LGwtKZqw)_3s^5VR)NDnr*umtznEcr77 z_19EYK)_dPye%?tZyGfM}rUU(mCUEdU6=z*9kD64OBL+>oDubGSCMm&Pl&5 z(mDya5Cc)qd}$(3f9agl`9;2_WmCom$aa`|d?tW;hGgqw0%SW(Jw6jaJwvkfF#)n2 zrXHUOpq?Sw`j`OO4pWcM1W?bAY<*0CY=^1GX9B2aNVYyEK(@ow<1+!&GbCFd6Cmm^ zUYp}ur+atNxNff#A^09Ifs1h~+`v%PY z19r^^ZsRQSJRt+H3nLaC0_?-tSle{$z7P@Q_8K7r%$+3IJAk7c`iJby6*9o>EXjNx o8z9r&a)`|YltY$eYE+(pKYy~bL9Kw-e*gdg07*qoM6N<$f?)<9*Z=?k literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e36458797ccf30e3b7d5e7f7732848eafde5126f GIT binary patch literal 1094 zcmV-M1iAZ(P)Px(07*naRCr$PT1`k)Q4~It_T!AE=A?+mkPw}f zW>uRuEuvLXn`qH2gAjsNLPWICjWMK%Hm0UC_M^S{9-PPRH9Gg)@jd1-_ibk8&b{aR z&UeqfZ}FWN)%X*u@%+gOU@M@;6|hI3#tXn+g7yeVkHFxGtIpV)C;thz(YQ2zx%t4E z8vjV$eTTiN{JRvda`8kJ0PxPFx@|PNyUj}y;H)}- z$Hh4GeV(S)|Ipjwv{vkLyN~}>e4g)r3-GuUUrds3eE_PjBYrFBBvi?qo@CN#iq}zR zYqJ+-W?_kzi|aI*&x`XBFJJ=KZr`C)Dn+?mjvn8;YfL~Y#-*lx&bvMJlt?7JrG-L) zj(uCB=gVKj`G^-Vfz{O_H8jMDKTQcp1;}*tIM3SRgrsx1&#_c$zXLHY&lhQAc2b;= zXn_hozqm;8oja)b^B1+Xw75HBN{L)Z zZ3P6SY*gaf3W&;11;x`=Kv2p?C9bW2sO(fwJZ%L8rEFB<+6suuP6fr&RzOh7MkTJT zfT-+LP&{n~m?-OSQV7cxQn{9Ls7wr5aRmVQ%E<6P#;DpbVIrt>joOrup>Rf-f3aojR zi$nyG0Gs*r+#g_a4kbeH{ey(@RMHzDt^j|ZfJ(fQPAwAw)cydhH|BqW^!9}=!K%ve0k z0am#*mazb;Cl9YapZ^+4@|+-xkWB7%EqS$HKq`V*HMYV5bp1z+9yoB%1%#<~HDcKcsK#9hlasB0Fx9R`teUTYzoKM#UyNs9w*UYD M07*qoM6N<$g7+>AU;qFB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f94902e682ee9b6df5f2dec65ebafb1a65afb18a GIT binary patch literal 1435 zcmV;M1!Ve(P)Px)RY^oaRCr$Pnonp{R}{w2ph?NZkOZfZVCWEAFc^^_xUvY+f6zd?D1~DGtV$Qs z(nV`GS!dIBBNZ3os;zFsg@r6yT7=TBgd#;DZj>pJ&~zjTF%z0pUiqGWkK;8nZ_a&h zUY_LL&AiOKcfWIg=bU>VIj1Dse3Z8N`lSF+M8GyDP^7>%4}fA5EK=ZUO@SjXeGt(0 zYrlN!?MTyuZ=9SC=5O7Sx!FHu{_geY+2Oqt!N}Ml8Q#BNemFa2n$zL{t$*arx1&d| zUAZK_`fVEv;>X{5Rc3G01Q2lj<;nL-U!46uxO(}gaPeaYtAgt!9%%-|)rS)}xOgA^ zwg5n!3#2F(3L_v67#swYCWOuOp$9E2S`Vv!EC7TZM6~DiVzmJ}5^#SS>Cj3adK$iu zek=geXYOl{(*u*^FUWxd&SSE5|R{b@u&D}4<>M;NJ*nWd!KV_eGR}@za;=oAKt`nuXkTi2JPrLx^gKz9o*+EJH5U)PT!pukgWPG z0UYbu8;tBI$<_YKV-r)@1;DTasN>6ZnR^h(uWNT>)2tbwIDPjyAAOT?`n-p@2C&)t zfv@MAJ?HA{`+W7y0GQ+WI49-ujl7`fmPoGU|*#Y^p$tW@L<18e)x%0 zt5vDhYBF>F8<}5RmX*c>xm~ZD=CnZ4`cH(vr@qNpFG5a-++vZ!&gzXf(J`=?wuuy!=eJH2z%=jR1gm>#H)gaK|*K z1pxHV^*oF|=u#h_fb!9rnDtG@5&*+*Vd3x6(9oWMVVDH~Isg!;kHz~szytsx`1|gz zDCD#O`10tz4RZ)uBEU^S7l2O+ngF;daDRERw5xwG$T9_V3Z|iN0>B7h4$=VTU=|U8 z2uxGo1OUg-Y~O!j)M69T0Px+|%Fd1-gK6uV05D$>_P8bhUR&}x$-QandjUvdeBPcd z0OZXhS=&=YK-R?brdLEj-aL}EJw*g$O+0UUMFix{BU#&1M1T)*R&3HJe){OU&#-U6 zrxt0B02C)+0P24jEJU(jAdLmZ&7pe|P!Pe$q%NQy|hT^%(okc;<0;)wA zEZDR=r`cFt3q&ze_X~7-@m!RKplv|O9>tn=7jJ$Mat%N|9>q#@YGk!|Z3D{kD9N*D zz{ds?t<3-=5x02Cy_Zn{CnT{UF@V$Zuve&7>s)8ZW}vFo(Exe>sg$z^z|9anIqccl zDgd;>y7>{RR|F6M=;t8A+9^gh{<^W*);q|io(cLf~JxLa>p9KWkfbXqG pp!YGD)&lY{kJlcM2gB2{;eXd+AAOlbirfGI002ovPDHLkV1fkEwUPh; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f3a13e404a27fe63c10e472fce66d7ca6da382d1 GIT binary patch literal 502 zcmVPx$ut`KgR9Hvtls!m7Q547j5*2=giY}t?=mQiBX>kgIkXnQqq9w?wDQIhRc54fo znhIK?p`ay*AZT)lXwap2ptvY1`9Ve8I1i3Ig5aJIT;5skefOSs{=f5o_gxo89Ig@T z!vSy{a2#+P5IL~ES5UQb8I{sAVu{q?4&&!YJdW$*yr`yjaypY!E1PR5y_g^f68k+S z77W~9-lBMSs$Ew*kpZ}E65`GY%)UN!02U`vyBN7aUE9TJU*dw60}OChIJCY!Loh&g zeh$gxEK-ZB*vTIZA0QH4ROyW^6t6BoBX@0gfabhUW3Bq6)tpumSxgW#5&#DuLVhM; z3SDu^)dsM{GdV@4|1SUnk{m!W0J%VCfFbM-@ckg^{$Bv}5?@003yJ1Z`^5k=;jo(W zj3E;ABfGl~!!Tf)CT>oSP;0jF-uuRDy)OE!qU2?FRMn@0R;S%=7yW(@ZnpU`qFNaSW-5 zdppb8n>kRR^|+HNf6cOq9FE-b3J2BJD%eRK6q$7F&?&DE;t|nNoMB;NO&zUGy&6rq zQi9zX3t4zF7rC8a-WoBpRa>fg=dShx8#eoznV;Nge1FbP?}Vrm&%?XVe^zH*!1uwD zF_&?^v;)6mE{Gv~LF~g$#xI%+bQkD8C}z6FWM|%B$GSjw!i=b*OX=44O@1$W?DyYe zPS*AMV!78gDeE-m@BXta)c^kK=0paI9Vc5Ot?Vs+`jpkB-aUE$PQcr$#ZS(D|J~O9 zG9&wJ@5Xuiu0Q$ty?{aIl)#Rrm`cB6Yi{m1pz+Qs+Q=~d~7Y2LW!c6n;pEnV9PW`~z1vJCkW@7|R0JNwOX z{194Ixy|n$OYfyjmWSsXO@*d>+sQN`%&=t7D+ZIm%&J!mnWE0eSMxatPhGa0j~IzX zvJErb1-KbZ`xWFEw$GVf$uf~)LNSXHqr!6z7p8>Ui=S~EVKNY?;Okuf|D19MTf+=x y0bT|}cLgbiq&^1|hIh5=i&-8qR{VYck@54lg#i;24kiK9AA_f>pUXO@geCwACnECz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c51699f236c07fcb5d60f9176425298d342089e0 GIT binary patch literal 714 zcmV;*0yX`KP)Px%gh@m}RCr$Pn!8H_K@i3#g-RZ1)HD(yXrU1#*rXN2M@*<#NJ9{>0} z?jINcXMo2Ea0z%k0k{cr32+H`oB)@A#}j~00WJY90gn^l67YBe@G0O}0?GMx>m_>+ zuZ6o`zvFo3`jBkdIO!XS&RC=I1hmrKWCnxGtuDdM=_QOzPQv;AwmqkDoFW7#eJh(g z)@v>Y!jF^gmH^N+LcmNwf*3@MQ3l{vcT9b9U0yA55Mmo#<{V0Sso>d@5~w5~lGPjoV{? znxjecVr^C3jvZZeP7E%3fOw{8z7YcUD>u3w0gOi?)DI>?pqnuD_?!XMcSyHB&H&wnsmJFGpuR)8^>GI1 zCQLm(X8`pb(ydQA1G@E{fp!3;0Cej+1MSS?@2&vgAG+zCfqwze$=$n*0Mm2YW&5`O9N23dzTSldX6*zmAiM-=495F2B32H wE+fG79BBY3)a~87X>&5`y8<8+u-oSR0B7Q%P(Gy?z5oCK07*qoM6N<$g5kllUOOV0qw(rKB8J`nPkb3$jIcx&$2jSxUGWCmdy-#hZCE zLs3hbZwIr(!Tz-}2c8=wo#t5N%n&Vg;5kE*x5pw`ht(Mpr3W%NdfI>lPXz}9Lyd-m UVr_}88_=N)p00i_>zopr0Nd6}P5=M^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d7fce28cc2de0be8f81c2f1249832c735dc43ae6 GIT binary patch literal 377 zcmV-<0fzpGP)Px$Gf6~2R9Hu2WEfz;IKcKZj5=U61V%#uX9#eq+5V?y7X5bXFjl*;3W6;6ube|Q z`!}|yFp%s3Vb?qq2fW=q3By6?YOuN3#zYS+jLQ)?Ljc)ukma1p78vG#zk7lKS>3mL zr{HS1l*}+ZfGrg8IsjxK$RJ`J0J8DJ(M1db)^Tvl?}bHx*{inyWr*&;EP3%d;PKQ@ zM%nDu|0!_*%q1W*NDcvV900NiIa=rz0gJ7NU|=rE42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Ugc^Qd$DY`|O=@}(9`Vf_?N>Ymoih$`0 zY@ZR-I@~JI%|h56nwME(2QvUo7)cjW{8%{_m6YcfWru*{0yQ9UDuWsY2~?zX3dscE z2ms~+J1!f2c#g8;3V1a!44BQ1d%8G=R4~51Wysa+Aix^%RjS#ns@7AmXikXYa*vIU zjvFo=NB3d6 zxvSrsggJ7NU|=rE42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Ugc^Qd$DY`|O=@}(9`Vf_?N>Ymoih$`0 zY@ZR-I@~JI%|h56nwME(2QvUo7)cjW{8%{_m6YcfWru*{0yQ9UDuWsY2~?zX3dscE z2ms~+J1!f2c#g8;3V1a!44BOhc)B=-R4~51WzE%MAixmtRqEiW-^rWh(pMi%{t>I= zA}DCGz;1U+Qd?zk+N2}y4GfG-EF1y~4lu?BF^rET2-y(^lg$|-n5x{ zZp#kr`TX_$?&`Ytc7>=~;Ci8qJ3$HmDyj+@Urt!P)8hEY*U4x3dM+&dGskX4;rgEq z-@g3nFR%G|e7~`vTSn5;$ZP4oFuNTdEM&5s|3fD711nc7sL1ei^>bP0l+XkK=L>eG literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..286a6c32558c5afda2a6acf326230dd34fdc13a2 GIT binary patch literal 763 zcmV=f+5pjwRttMKC|^U0g2r{Lek--gBTxks?Kk z6e&_bFaV%$^9M9%odYhE{_Rr%*h|hafxZ9}?d-%r>G!QwH45Rt;teOfKKANZqu4m^ zwK`60l|r+3rLJdBgk$O%jJLn$S48F;OaUB#BSWvaR@1?{YsyPpbvB!#r6ijs3pKt3 ztsy+Wqv0hI6(<=P8Kb#pSIy7w;D79AuL&2#7>e4fD_I9Mq7p7oaWO(o|(=OeHBcJUXaE`^v5-wdzae z*^Y)xu8q73kypA$9`1fXy7qlZKHa88O_k1v!)T6i@*%_Oodo+}%=4%}9roTa+BbSu z)PO8`*MTg-U=Yi1PcxOro4Dc68ncJ3Fs9dWU=u&+<uuN|8V4XPap= t6Z}Px$u1Q2eR9Hu2WEfz;IKcKZj5=U61c(j+3p2C-Cr+IrT0OCen`i?E(gFWXP1Oi` z==AAZ*whg8AYKKgrfUCFlKtTZw_G+uv7|=#6qx_!%{zwApT9G3u(L6+vN1D=hzKz( zU$Kkfz=4Y(X}oq2ZYc7P9zA1dZCgqm2h5qfk)gD;gyGi1 zOBjw&lhws~MOOpk)*g69TX( z03})w03}?ir2+pm)Krd~8aK|`Mf)g#IRKXMKn{QLCCtSZ16@WHXRhhT$`mf(bnvQmrIR%jjm9 zHKUXPS6zUujHXImz`(%p-@!p2Y(6N6355W-R6KSCtR7ksQC1f~efA$`Eksy?vg(+y q`IM_5=t9b^z;D8+14ct&Gz0+B`wlQY%32oy0000ld)@9i6&};Glxg zrDGSDjxGg39E9THC-4Il+&fuN%uqBA7D^DL5NgeHxocy3mwRdbFFBISJ->V2E{TJJ zN~O{S4Akv*W3oAO03u`6?z@)p`_dM7tuR!aHvwM^8+<75Y5`O`y*VJBN4O!tiB;H` z0c?x+zvLoxu^gjoopdVmr@FcC4f7-I%uy@1P z1aAxwUWDzCG@?`gpb|AAgpcY0N&upEj0X4HbPVQ-1mIPIs#GdK3J{d;v5d#CtOAq) zFb{N(Xe8YUcnm zz(4?2j0_tC1VPxppUO|@LIASAW6^V?zhhOSDhjS4g82nQ-WqE${Z=CY0000 Date: Wed, 6 Mar 2024 19:20:09 +0300 Subject: [PATCH 2/2] Update trader.yml --- Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml index ab4db91ff25..68948a65eed 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml @@ -27,8 +27,6 @@ - type: Pda id: TraderIDCard state: pda-tradertsf - - type: Icon - state: pda-tradertsf - type: entity parent: IDCardStandard