From 5a0fe0d1cfeec9fe7af8928fdbcf4a0a7ea48546 Mon Sep 17 00:00:00 2001 From: Elst28 <129709997+Elst28@users.noreply.github.com> Date: Thu, 24 Aug 2023 21:54:18 +0300 Subject: [PATCH] Centcom intern (#230) * Uh1 * fixbaton --- .../ghost/roles/ghost-role-component.ftl | 4 ++ .../fills/backpacks/startergear/satchel.ftl | 5 +- .../entities/clothing/head/hats.ftl | 6 +++ .../entities/clothing/uniforms/jumpsuits.ftl | 3 ++ .../entities/mobs/player/humanoid.ftl | 6 +++ .../entities/objects/devices/pda.ftl | 3 ++ .../objects/misc/identification_cards.ftl | 3 ++ .../entities/objects/weapons/security.ftl | 3 ++ .../Fills/Backpacks/StarterGear/satchel.yml | 13 ++++++ .../Entities/Clothing/Head/hats.yml | 22 +++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 +++++ .../Entities/Mobs/Player/humanoid.yml | 44 ++++++++++++++++++ .../Entities/Objects/Devices/pda.yml | 20 ++++++++ .../Objects/Misc/identification_cards.yml | 17 +++++++ .../Entities/Objects/Weapons/security.yml | 29 ++++++++++++ .../Roles/Jobs/Fun/misc_startinggear.yml | 25 ++++++++++ .../equipped-HELMET-hamster.png | Bin 0 -> 761 bytes .../Hats/centcomcap.rsi/equipped-HELMET.png | Bin 0 -> 761 bytes .../Head/Hats/centcomcap.rsi/icon.png | Bin 0 -> 401 bytes .../Head/Hats/centcomcap.rsi/meta.json | 22 +++++++++ .../centcominterncap.rsi/equipped-HELMET.png | Bin 0 -> 584 bytes .../Head/Hats/centcominterncap.rsi/icon.png | Bin 0 -> 446 bytes .../Hats/centcominterncap.rsi/inhand-left.png | Bin 0 -> 486 bytes .../centcominterncap.rsi/inhand-right.png | Bin 0 -> 492 bytes .../Head/Hats/centcominterncap.rsi/meta.json | 26 +++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1051 bytes .../Jumpsuit/centcom_intern.rsi/icon.png | Bin 0 -> 490 bytes .../centcom_intern.rsi/inhand-left.png | Bin 0 -> 330 bytes .../centcom_intern.rsi/inhand-right.png | Bin 0 -> 334 bytes .../Jumpsuit/centcom_intern.rsi/meta.json | 26 +++++++++++ .../Weapons/Melee/baton.rsi/equipped-BELT.png | Bin 0 -> 195 bytes .../Objects/Weapons/Melee/baton.rsi/icon.png | Bin 0 -> 340 bytes .../Weapons/Melee/baton.rsi/inhand-left.png | Bin 0 -> 245 bytes .../Weapons/Melee/baton.rsi/inhand-right.png | Bin 0 -> 247 bytes .../Objects/Weapons/Melee/baton.rsi/meta.json | 26 +++++++++++ 35 files changed, 313 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/baton.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/baton.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/baton.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/baton.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/baton.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl index efdfe2d6bda688..b7556d3b5ad368 100644 --- a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl @@ -105,6 +105,10 @@ ghost-role-information-death-squad-name = Офицер эскадрона сме ghost-role-information-death-squad-description = Уничтожьте станцию, любыми доступными вам методами. ghost-role-information-centcom-official-name = Представитель ЦентКом ghost-role-information-centcom-official-description = Проинспектируйте станцию, запишите отзывы о работе глав отделов, прослушайте Капитана. +ghost-role-information-centcom-intern-name = Интерн ЦентКома +ghost-role-information-centcom-intern-description = Выполните положенную на вас задачу, и надейтесь что вас наконец-то покормят. +ghost-role-information-centcom-intern-leader-name = Старший Интерн ЦентКома +ghost-role-information-centcom-intern-leader-description = Управляйте интернами, чтобы те выполнили поставленную задачу, и не схватили себе еды. ghost-role-information-behonker-name = Бехонкер ghost-role-information-behonker-description = Вы - антагонист, сейте смерть и хонки тем, кто не следует за хонкоматерью. ghost-role-information-taxibot-name = ТаксиБот diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl index 53672094400b14..980067b6b50572 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl @@ -75,4 +75,7 @@ ent-ClothingBackpackSatchelDrone = { ent-ClothingBackpackSatchel } .suffix = { "" } ent-ClothingBackpackSatchelCentcomFilled = { ent-ClothingBackpackSatchelCentcom } .desc = { ent-ClothingBackpackSatchelCentcom.desc } - .suffix = { "" } \ No newline at end of file + .suffix = { "" } +ent-ClothingBackpackSatchelCentcomInternFilled = { ent-ClothingBackpackSatchelCentcom } + .desc = { ent-ClothingBackpackSatchelCentcom.desc } + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl index ebcc8d7f2eadf2..b8f306ea175d6d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl @@ -37,6 +37,12 @@ ent-ClothingHeadHatCardborg = шлем картонного борга ent-ClothingHeadHatCentcom = фирменная шапка Центком .desc = Хорошо быть императором. .suffix = { "" } +ent-ClothingHeadHatCentcomintern = кепка интерна ЦентКома + .desc = Престижкая кепка которая предназначена для тех кто заслужил поесть. + .suffix = { "" } +ent-ClothingHeadHatCentcomcap = фуражка ЦентКома + .desc = Хорошо быть адмиралом. + .suffix = { "" } ent-ClothingHeadHatChef = поварской колпак .desc = Это колпак, который повара используют чтобы волосы не попадали в еду. Судя по еде они не работают. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl index fbc69c6b59ac26..d5c41b7583f5d9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl @@ -34,6 +34,9 @@ ent-ClothingUniformJumpsuitCentcomOfficial = костюм офицера Цен ent-ClothingUniformJumpsuitCentcomOfficer = водолазка Центком .desc = Повседневная, но элегантная водолазка зеленого цвета, используемая офицерами Центком. От неё веет алоэ. .suffix = { "" } +ent-ClothingUniformJumpsuitCentcomIntern = комбинезон интерна ЦентКома + .desc = От него веет голодом. + .suffix = { "" } ent-ClothingUniformJumpsuitChef = униформа шеф-повара .desc = Без этого нельзя готовить. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl index c4fe3633e81fe0..5b8fb73e48a5e3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl @@ -37,6 +37,12 @@ ent-RandomHumanoidSpawnerDeathSquadOfficer = офицер эскадрона с ent-RandomHumanoidSpawnerCentcomOfficial = представитель ЦентКом .desc = { "" } .suffix = { "" } +ent-RandomHumanoidSpawnerCentcomIntern = интерн ЦентКома + .desc = { "" } + .suffix = { "" } +ent-RandomHumanoidSpawnerCentcomInternLeader = старший интерн ЦентКома + .desc = { "" } + .suffix = { "" } ent-RandomHumanoidSpawnerSyndicateAgent = Агент Синдиката .desc = { "" } .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl index 150d1542bb89a1..1872523eac0e30 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl @@ -97,6 +97,9 @@ ent-SecurityPDA = КПК офицера СБ ent-CentcomPDA = КПК Центком .desc = Светло-зелёный знак ходячей бюрократии. .suffix = { "" } +ent-CentcomInternPDA = КПК интерна ЦентКома + .desc = Очень вкусного цвета. + .suffix = { "" } ent-CentcomPDAFake = { ent-CentcomPDA } .suffix = Фальшивый .desc = { ent-CentcomPDA.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl index 5b4da2cfd5d5ef..6dd8ae84f2d00b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl @@ -106,6 +106,9 @@ ent-ERTLeaderIDCard = ID карта ОБР ent-CentcomIDCardSyndie = ID карта представителя ЦентКом .desc = { ent-IDCardStandard.desc } .suffix = Фальшивая +ent-CentcomInternIDCard = ID карта интерна ЦентКома + .desc = { ent-IDCardStandard.desc } + .suffix = { "" } ent-MusicianIDCard = ID карта музыканта .desc = { ent-IDCardStandard.desc } .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/security.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/security.ftl index 5414d812d699c8..6a7c8fb4e57dce 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/security.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/security.ftl @@ -7,6 +7,9 @@ ent-TelescopicBaton = телескопическая дубинка ent-Truncheon = дубинка с шипами .desc = Жёсткая дубинка со стальными шипами, предназначена для нанесения вреда. .suffix = { "" } +ent-Baton = дубинка + .desc = Обычная дубинка, с ней вы сможете вечно бить клоуна. + .suffix = { "" } ent-Flash = вспышка .desc = Сверхъяркая лампочка с кнопкой включения, вызывает оцепенение и кратковременную потерю зрения. Бесполезна, когда перегорает. .suffix = { "" } diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 4ff60fb81e6166..ea68592cb48cf9 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -70,6 +70,19 @@ - id: Paper amount: 4 +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelCentcom + id: ClothingBackpackSatchelCentcomInternFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: WeaponSniperMosin + - id: SpeedLoaderLightRifle + - id: MagazineBoxLightRifle + - id: Handcuffs + - type: entity noSpawn: true parent: ClothingBackpackSatchelEngineering diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index e945d25b9dfff5..367d82ac064a30 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -175,6 +175,28 @@ - type: Clothing sprite: Clothing/Head/Hats/centcom.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatCentcomcap + name: CentCom brand hat + description: "Good centcom cap" + components: + - type: Sprite + sprite: Clothing/Head/Hats/centcomcap.rsi + - type: Clothing + sprite: Clothing/Head/Hats/centcomcap.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatCentcomintern + name: CentCom brand hat + description: "It's bad to be an intern." + components: + - type: Sprite + sprite: Clothing/Head/Hats/centcominterncap.rsi + - type: Clothing + sprite: Clothing/Head/Hats/centcominterncap.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatChef diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 47ae13389ffabd..e35ed51e90a441 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -137,6 +137,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCentcomIntern + name: CentCom intern jumpsuit + description: It's a jumpsuit worn by CentCom's intern. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/centcom_intern.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/centcom_intern.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitChef diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 9319758ddfb9ad..3355913caf95f0 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -348,6 +348,50 @@ - type: Loadout prototypes: [ CentcomGear ] +## Central Command Interns + +- type: entity + id: RandomHumanoidSpawnerCentcomIntern + name: Centcom Intert + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: centcom + - type: RandomHumanoidSpawner + settings: CentcomIntern + +- type: randomHumanoidSettings + id: CentcomIntern + components: + - type: Loadout + prototypes: [ CentcomInternGear ] + - type: GhostRole + name: ghost-role-information-centcom-intern-name + description: ghost-role-information-centcom-intern-description + - type: GhostTakeoverAvailable + +- type: entity + id: RandomHumanoidSpawnerCentcomInternLeader + name: Centcom Intert Leader + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: centcom + - type: RandomHumanoidSpawner + settings: CentcomInternLeader + +- type: randomHumanoidSettings + id: CentcomInternLeader + components: + - type: Loadout + prototypes: [ CentcomInternLeaderGear ] + - type: GhostRole + name: ghost-role-information-centcom-intern-leader-name + description: ghost-role-information-centcom-intern-leader-description + - type: GhostTakeoverAvailable + ## Syndicate - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 2ecce9c0999b0e..45534e37fa1617 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -656,6 +656,26 @@ - type: Icon state: pda-centcom +- type: entity + parent: BasePDA + id: CentcomInternPDA + name: CentCom Intern PDA + description: Light green sign of walking bureaucracy. + components: + - type: Pda + id: CentcomInternIDCard + state: pda-centcom + penSlot: + startingItem: PenCentcom + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#00b62e" + - type: Icon + state: pda-centcom + - type: entity parent: CentcomPDA id: CentcomPDAFake diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index befc2a1db80fbf..957728fbce1b1d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -468,6 +468,23 @@ groups: - AllAccess +- type: entity + parent: IDCardStandard + id: CentcomInternIDCard + name: centcom intern ID card + components: + - type: Sprite + layers: + - state: centcom + - state: idpassenger + - type: Item + heldPrefix: blue + - type: IdCard + jobTitle: Centcom Intern + - type: Access + groups: + - AllAccess + - type: entity parent: IDCardStandard id: MusicianIDCard diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index bee7523361f58c..93d208036920ae 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -140,6 +140,35 @@ guides: - Security +- type: entity + name: baton + parent: BaseItem + id: Baton + description: A rigid, steel-studded baton, meant to harm. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/baton.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Blunt: 5 + bluntStaminaDamageFactor: 2.0 + - type: StaminaDamageOnHit + damage: 18 + - type: Item + size: 20 + - type: Clothing + sprite: Objects/Weapons/Melee/baton.rsi + quickEquip: false + slots: + - Belt + - type: DisarmMalus + malus: 0.225 + - type: Appearance + - type: StaticPrice + price: 100 + - type: entity name: flash parent: BaseItem diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index ee8363f812050b..89dc30045f186c 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -34,6 +34,31 @@ satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled +#CentCom Interns +- type: startingGear + id: CentcomInternGear + equipment: + jumpsuit: ClothingUniformJumpsuitCentcomIntern + back: ClothingBackpackSatchelCentcomInternFilled + eyes: ClothingEyesGlassesSunglasses + ears: ClothingHeadsetAltCentCom + shoes: ClothingShoesColorBlack + id: CentcomInternPDA + belt: Baton + +- type: startingGear + id: CentcomInternLeaderGear + equipment: + head: ClothingHeadHatCentcomintern + jumpsuit: ClothingUniformJumpsuitCentcomIntern + back: ClothingBackpackSatchelCentcomInternFilled + eyes: ClothingEyesGlassesSunglasses + ears: ClothingHeadsetAltCentCom + outerClothing: ClothingOuterArmorBasicSlim + shoes: ClothingShoesColorBlack + id: CentcomInternPDA + belt: Stunbaton + #Deathsquad Outfit - type: startingGear id: DeathSquadGear diff --git a/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..a4df2e2232fc20a79ada5cce6fab9b13baaf243a GIT binary patch literal 761 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V1) zPZ!6KiaBp*ozE6_6gj?M)Sqq929eC7z{Kw9OV)Yu>%LG`2wbuJUegcu4)tWws_)M| zTjE^zbhdw4z#$hEm@l<@`lTti77)+&j|e66W7ObUK0O`K$Kt4@nzzwj{3*P7j9hgv0Cgx&25f;yS&_* zBUf_dMAr*^yWg^&Y09rQYvK69&9%SIKQEJ$zJJ*9a{qnC+r1e*X78o;r!&reFU`z; zMc;Pn*~drssOCf_)DyJtnDq{~8-h$F-**kGK2(v@(CETz54$?%%CrHd^Pq z0#>zcu?$>w@H5vAJG=hh7TL#oT0S&gsCvN^*vqi=bG7CC;97?p8CpRL?)>S$>6)^6 zV#Dq@LI1oOv-hX3I_TG|T3#gHBf{*vmD53Z>TQ*pn?1o%e=Zy;44B(+`Wff)^$og{ zHq>(EbY`*r(<@o7dckt{;}z?ElsKM|3jdx_>kw5w^$$OmV89ka8^k|IU(8idTR-_U RH!v+Tc)I$ztaD0e0subPR^$Kx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..a4df2e2232fc20a79ada5cce6fab9b13baaf243a GIT binary patch literal 761 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V1) zPZ!6KiaBp*ozE6_6gj?M)Sqq929eC7z{Kw9OV)Yu>%LG`2wbuJUegcu4)tWws_)M| zTjE^zbhdw4z#$hEm@l<@`lTti77)+&j|e66W7ObUK0O`K$Kt4@nzzwj{3*P7j9hgv0Cgx&25f;yS&_* zBUf_dMAr*^yWg^&Y09rQYvK69&9%SIKQEJ$zJJ*9a{qnC+r1e*X78o;r!&reFU`z; zMc;Pn*~drssOCf_)DyJtnDq{~8-h$F-**kGK2(v@(CETz54$?%%CrHd^Pq z0#>zcu?$>w@H5vAJG=hh7TL#oT0S&gsCvN^*vqi=bG7CC;97?p8CpRL?)>S$>6)^6 zV#Dq@LI1oOv-hX3I_TG|T3#gHBf{*vmD53Z>TQ*pn?1o%e=Zy;44B(+`Wff)^$og{ zHq>(EbY`*r(<@o7dckt{;}z?ElsKM|3jdx_>kw5w^$$OmV89ka8^k|IU(8idTR-_U RH!v+Tc)I$ztaD0e0subPR^$Kx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0c89175d4bd148ae44c4fc745fe103d385106c0e GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq~K4 z)5S5QVoq|RM1sMqhCucntAs0zDb@#4y=f6MKHB8zOp`A@7o;*xr@|IS}X&u(}qk;qoJA?08NS#rmwalvNM(hV<4u1WnZ!vM|XHVmt z_jPPv_S$#Ndj5R5am6$*prPAB@jAjADn8DN4&t;ucLK6VqNu1>X literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/meta.json new file mode 100644 index 00000000000000..8d15d156307709 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/63029", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..f95b479d459d4803f9503faa5de2f29974aeac15 GIT binary patch literal 584 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnP zPZ!6KiaBp**?T($N*tRn?et*2OpD8Or3;?j1vy-^q?ni6IYdvEKd^MIXVjcO3{A=R z7c6w_$_d(F?~(N?U}b^huAgzc#bsp9eXWwc_uahWOUHA|e-_`h_N?bW6X|u};nS5L z19n{9pmyg(xk^Km@=1nWN7elDHXU1F*EC(}&Y5trgw}kOeF8jeXAPS+q%S}Cw&wWs z1O9Q_j~}qKdHi^tVXaR>kj#wr?K>4~j_>1XeU+YLvZ~JRi9pC>AjzK-TtvR zSSm4`5oAp0<6tOuVVI%JbU;Rs;aLZRfjbL|)Bz*;xbpf2>FNTNgmm-Fi1RD${7b7A zg{`hqQl5Km#?Oo0wgLGKTjy`T{_EB0$0FNAxn@3Ox%xc$y5MFXKk4YLETf+{m4Ib|fgTe~DWM4ft?c~q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8a7676b10c55e374a02774676b7f3b20fc4d8663 GIT binary patch literal 446 zcmV;v0YUzWP)v zo%jH@egG3QtV|sdLSkwp*osoaKyijj5y5wsBLY(8t0GX5Z%EGPi|^UKJEaPLEDpc{ zIDpLt2oA#x-|=m<_3Ho_ymb_sVYV&=8=yPr(XMBc2%aw=w6Rso?RV$bED#m|2J!nT z>3+Wr@1rH@JENL;Yb<3E(Nj<3}2Mo>!QcQi2>y2u}COw{!r^__XO4 z0#=U$($kwbw4op67OJ<({HW+HV)9;@q>^8g> ofPsLLWV8PV9DoCG0RIBu6C*p4;Ms}ZtN;K207*qoM6N<$f+sP!h5!Hn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..33c4c42473dc61555e3404759e41d25e8554085d GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU|j3z;uumf=j|=qyh9EGtPkAZ z^r@LI*w7NBAjo?1>o?7&6O1)2bB?-yU^NhlUQ+Dq-X2iI%+)P)^p*&pprhiy$k`L8 zem7OnO+Mxy7yU`k!36^T`=0;C;5jKq#@qbVoqMWV|1b908?@@(Lq>*mp8i8$JLrvryR!r?QmhXPZby14LCSliC#i)~jaG)pV%QyL- z4kv%D%9~~PAkd^-;Ea(=@$#^}FL&G9-M$pTurN&Ru7>fAr@Y4(b1sXP|CqtVAn_(< ziFE2d{rC2-&imi`a`(`$T~a$a+oERH>`Ob!8o%Fq@0{FMx%o|N?O4|xG;6r_jxqKi z!xHHU$503bB?#EHEo|DH*(Livg_NFmym%^bxA%J8j%R1zNxleS_<3qW^8x00;olp! z@h>WV&*J}G=E%%`i_eLhQ|`@Va9VrjQ*Ou2*8->au`?80VxIG*;ehj70V_k+zTfQg zj@^zwzPOwrn_Y2L{^FN+f)}h>wA>+mnM1ThLkaUGG{TN?5C5XIJ-6*v0^^Ut)78&q Iol`;+05(e3+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e462534d84553d4386d1b04a3e229895f61a29d7 GIT binary patch literal 492 zcmVF36$O{-PWayT;Q{6=R2o{2)G~5oU zf7%)~Ci*3Kev6Xm^>~O0_yr&$A|fIpBBE%Xr3wRdFh(<>oLu`05?!NnkwCxCvWgu9rR{h_^l2ApfR@) zO_g3BUL~`g|L>R9H7hm05r$#%o0*tEJ3jnLKd)OIPGvX==E=YJDsYT46p%;iIpA8b z0O>r&TX?q?&crIea z%gObZm>VS1)|bzFIQC{+5y39yk1+(!K#4TC14Xw$1?n0000-Yy4*3&E8q} zW{n(&7l0gx7l0gx7l0gx7l0gxkpSC|o5A2iue5A#8{kW>nevMSc=Y^f(C_qU=b(+L zN*clN{O*$`ogBTfCIt8~A_j0VFy}of|H=aFzT6LPG=I@nt4%+;qgVutJjecSYd?7V z>{ad}Fh5Y+YtXc}5$|D6G>JYZ+C zUBZ8@0QfQ_IPKlkk|j0j$^*mWwXi}q!u2o+%14A{{An=ZU-<}t9A}NFnHmJhY z{!yMt@?QlhzvwZjKYH|}_5Hk)U&g;|U&`-)2}(Z9=PSAoEMk6>vIiUd;tJp((%0=H zZ+?*gxBqOa@#pJLYTT?=>HOj%+N(x;1G0xwe@wMoH7dU!rN%b=J`{haxB@DbiW)g_ z0778>^74{wVtu`=M(`y0^?eD9Zh}Y_YM+Py9*=)hrCz5Zf#ku9gfSux7C{P;03hZo z4e~FayQTXNS^?%**RP5VAX(B91^=D;yzB z#IbC5bl>M+j?n zy+Muv$tN2m*szrz1@RGJ#gksV3aDGmLq$(sk0rVYBa%QAaq_OebI=abdIgFEs^R3w z+>+0H$&$SSMIz0jmm-&%od+T-zwCV3A$|(zO$s=FX;yWSKn&a?2uObrWv+n#DFV2& z!mvMJ4pamOQbdnHvOgdzr$_+!^GOSO@@^3Oa;5Q@Yy&aq{R!oZ#cG$@WMXR!ZY)G# zJDU3i;13pIlW`1alwfXvEpurM;v>KT(5xwf$&2;~!;27rpY3{+3bph+i&ZJ5Sn zB!J$iP*h()8n`hdj>!PVk3p2ZNmEi@K*B@(&3Y3|VI)A2=iPP;{+%E>4le*Xj=yhp VWW~#koe=;4002ovPDHLkV1mVX;Y9!d literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5613a0aac97fa7268c241719a7c355c00961b626 GIT binary patch literal 490 zcmV-^?h12{Zu#Jx_J4o+%tWl|((fA83*yYp)!5N&|^MJrzM-)Os9qnG<}3IWSL z_UqMFd~`(ias z{|(v&(V-0y7Z9Wep*;d5$NY)>6hak}r~5u>YasxtKsCwXBrD{0t3tfjp%h|iBVY(v z+;~`wgYN|UEW8Zyk*b2rOP)vJXq4=E$zIk44ofy`glX(f`=mz+NxB}^d z0tSXQhVS1Q7~&WhwlS<*#}FMI?da$zAt4bQ9Nf{-!C=L};K{&{!ytK$lNYFgza+>n znBhMPc-lK}8Bl72r;B4qMC;qB2l-kQcwBTdm3O`PU;nO2j_3838>??mkC-ezW6EWp zU;&ncvlo_}xwmy9#~ilrt+)MG6z6WT@k;PCRh(-$ef8qAti0>B z7w+f<6#sr_9TgRM;Nm5NgI6zAu)BL}GxkSIJVL-Pt Nc)I$ztaD0e0s!v|gcbk* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d6a070f7960e1493d9587a536dd81d7ed807c18e GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`=mz+NxB}^d z0tSXQhVS1Q7~&WhwlS<*#}FMI?da$zAt4bQ9Nf{-!C=L};K{&{!ytK$lNYFgza+>n znBhMPc-lK}8Bl7Ar;B4qMC;qB7rB}ZcwBRLCWgNL_rG}hs~IPR$~JHBmD%8AyK~Er zg5{c?lb+nyNM6}m{5t#5oyi-WX0#|ttY6K2G33hQ%j{P|-@bC1lC1cQH{97ZPw9+c zj`$68$Jm1+mY#esw6K%%e#hqJ-|8)^2^2MRfqf<+rV7VF!x164NsU%9IK+|J9jK2eefmah&- zE1Md1nkDCo*n!VVkJ6s)*4{9cVVN{gArSm~^si26-qoVsxLS#ot6qw^&1~qK-*T1F nM%OssWzSwFSr&u43=GZt;+#dSALd+20_pK|^>bP0l+XkKn%+c| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/baton.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/baton.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f539e840275af071e8a55907917f430d2adce683 GIT binary patch literal 340 zcmV-a0jvIrP)Px$4oO5oR9J=Wmn{#1P#A@eCTBGmyp2uTyHOc||6fQHxeO0=~_eBnyNzXQCGfZO%k35YwCqUV!CY*9FUi0}zod ziXvJb6o81VQVPZxG))sF2RzRJ5!t$~VT^&+I$G`(faO~2Smy&y4esUKzVG`aFR{s+ zNXjPzNXr3-GaxAk93FvE$^yW3ZE-pr#XsRbvfb}qe%Z$0^&Z%+HXx$pA)H`w>HxF+ m7bFdEx|}6)xFK-}zs?PH{MrGE5Eu;r0000JlcH%@9>K_)OnoW5(UR8%4+`10N1 z&AL0PzumihrcLpzPWAihX&-d=wzXIv k;{MHC@mSpiq|M?f>--Jnv%6%gcY+M?boFyt=akR{00=T*LI3~& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/baton.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/baton.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fb85cf51b17f43f7ebdb14e520a321754b72b23f GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|HhQ`^hE&XX zd+VU!VFM1Az;Xw{5=YK2_xUXgPpU|&Pm^i