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 00000000000000..a4df2e2232fc20 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/equipped-HELMET-hamster.png differ 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 00000000000000..a4df2e2232fc20 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/equipped-HELMET.png differ 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 00000000000000..0c89175d4bd148 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/icon.png differ 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 00000000000000..f95b479d459d48 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/equipped-HELMET.png differ 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 00000000000000..8a7676b10c55e3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/icon.png differ 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 00000000000000..33c4c42473dc61 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/inhand-left.png differ 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 00000000000000..e462534d84553d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/meta.json new file mode 100644 index 00000000000000..9c7570b188ba55 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/centcominterncap.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/63029", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000000..ddadcc4df2a14a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/equipped-INNERCLOTHING.png differ 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 00000000000000..5613a0aac97fa7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/inhand-left.png new file mode 100644 index 00000000000000..8dd6b26c18f5fe Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/inhand-left.png differ 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 00000000000000..d6a070f7960e14 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/meta.json new file mode 100644 index 00000000000000..aac6d1ff9a489b --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_intern.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/63029", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/baton.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/baton.rsi/equipped-BELT.png new file mode 100644 index 00000000000000..aef34e1a821675 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baton.rsi/equipped-BELT.png differ 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 00000000000000..f539e840275af0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baton.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baton.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/baton.rsi/inhand-left.png new file mode 100644 index 00000000000000..ba09062e02872e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baton.rsi/inhand-left.png differ 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 00000000000000..fb85cf51b17f43 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baton.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baton.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/baton.rsi/meta.json new file mode 100644 index 00000000000000..dabc70fa711a1b --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/baton.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +}