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 1057a8db20c7e1..d07921a30409d1 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 @@ -85,9 +85,9 @@ ent-AdminPDA = КПК админа ent-CentcomPDAFake = { ent-CentcomPDA } .suffix = Фальшивый .desc = { ent-CentcomPDA.desc } -ent-DeathsquadPDA = { ent-CentcomPDA } - .suffix = Эскадрон смерти - .desc = { ent-CentcomPDA.desc } +ent-DeathsquadPDA = КПК эскадрона смерти + .suffix = Оперативник эскадрона смерти + .desc = Пахнет мёртвой станцией. ent-MusicianPDA = КПК музыканта .desc = Он наполняет вас вдохновением. ent-VisitorMusicianPDA = { ent-MusicianPDA } diff --git a/Resources/Locale/ru-RU/ss220/clothing/Eyes/hud.ftl b/Resources/Locale/ru-RU/ss220/clothing/Eyes/hud.ftl index 27253af446639e..214de95652e85c 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Eyes/hud.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Eyes/hud.ftl @@ -1,3 +1,3 @@ ent-ClothingEyesHudOmniversal = омни визор .desc = Секретная разработка для очень секретных личностей. - .suffix = Сек-мед-хим + .suffix = Shitspawn, Сек-мед-хим-термал diff --git a/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl b/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl index 4b7f14b7c8db63..7bb5a2da98be72 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl @@ -4,4 +4,8 @@ ent-ClothingHandsGlovesNanotrasenDiplomat = белые перчатки Цент .desc = Пара высококачественных белых плотных перчаток, украшенных золотым шитьём, которые выдаются дипломату Nanotrasen. ent-ClothingHandsGlovesJanitorJR = черные резиновые перчатки .suffix = JR, За время в игре - .desc = Уборочные перчатки с дополнительным защитным покрытием. Они видели столь много... + .desc = Уборочные перчатки с дополнительным защитным покрытием. Они видели столь много... + +ent-ClothingHandsGlovesDQ = боевые перчатки Эскадрона Смерти + .suffix = Эскадрон Смерти, dq + .desc = Силовые перчатки, значительно усиливающие силу удара. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl b/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl new file mode 100644 index 00000000000000..a9a9ac2a7b75ef --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/Head/hardsuits.ftl @@ -0,0 +1,6 @@ +ent-ClothingHeadHelmetHardsuitDeathsquadCommander = шлем командира Эскадрона Смерти + .suffix = Эскадрон Смерти, dq + .desc = Шлем от костюм командира Эскадрона Смерти. +ent-ClothingHeadHelmetHardsuitDeathsquadAlpha = шлем специалиста Эскадрона Смерти + .suffix = Эскадрон Смерти, dq + .desc = Шлем от костюм специалиста Эскадрона Смерти. diff --git a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl new file mode 100644 index 00000000000000..94408072f47df3 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl @@ -0,0 +1,6 @@ +ent-ClothingOuterHardsuitDeathsquadCommander = скафандр командира Эскадрона Смерти + .suffix = Эскадрон Смерти, dq + .desc = Высокотехнологичный скафандр, предназначенный для командира отряда. +ent-ClothingOuterHardsuitDeathsquadAlpha = скафандр специалиста Эскадрона Смерти + .suffix = Эскадрон Смерти, dq + .desc = Высокотехнологичный скафандр, предназначенный для специалистов отряда. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl b/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl new file mode 100644 index 00000000000000..6a52891b2b7952 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl @@ -0,0 +1,3 @@ +ent-ClothingShoesBootsMagDQ = магнитные ботинки Эскадрона Смерти + .suffix = Эскадрон Смерти, dq + .desc = Самые современные магнитные ботинки в незабываемых цветах. diff --git a/Resources/Locale/ru-RU/ss220/job/job-description.ftl b/Resources/Locale/ru-RU/ss220/job/job-description.ftl index 42e607dd6289f3..8aa88b1836ac56 100644 --- a/Resources/Locale/ru-RU/ss220/job/job-description.ftl +++ b/Resources/Locale/ru-RU/ss220/job/job-description.ftl @@ -6,3 +6,4 @@ job-description-senior-service = Сервисный администратор job-description-magistrate = Магистрат обязан быть гарантом корпоративного закона, координировать юридический отдел. job-description-prisoner = Заключённый космической станции... Что может быть лучше? job-description-blueshield = Ваша главная цель - защитить глав станции. Помните, вы не офицер СБ. +job-description-deathsquad = Член эскадрона смерти. Уничтожьте всё живое! diff --git a/Resources/Locale/ru-RU/ss220/job/job-name.ftl b/Resources/Locale/ru-RU/ss220/job/job-name.ftl index abaa1ad08902f5..62fc256583b30e 100644 --- a/Resources/Locale/ru-RU/ss220/job/job-name.ftl +++ b/Resources/Locale/ru-RU/ss220/job/job-name.ftl @@ -13,3 +13,7 @@ job-name-ert-chaplain = священник ОБР job-name-nt-admiral = адмирал NanoTrasen job-name-nt-politician = дипломат NanoTrasen job-name-ussp = СССП + +job-name-dq-operative = оперативник Эскадрона Смерти +job-name-dq-commander = командир Эскадрона Смерти +job-name-dq-specialist = специалист Эскадрона Смерти diff --git a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl new file mode 100644 index 00000000000000..295128917475e0 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl @@ -0,0 +1,6 @@ +ent-ClothingBackpackDeathSquadOperativeFilled = { ent-ClothingBackpackDeathSquadFilled } + .desc = { ent-ClothingBackpackDeathSquadFilled.desc } + .suffix = Оперативник, Эскадрон Смерти, dq +ent-ClothingBackpackDeathSquadSpecialistFilled = { ent-ClothingBackpackDeathSquadFilled } + .desc = { ent-ClothingBackpackDeathSquadFilled.desc } + .suffix = Специалист, Эскадрон Смерти, dq diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl new file mode 100644 index 00000000000000..ededf42e18b3f5 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl @@ -0,0 +1,9 @@ +ent-MobHumanDeathSquadLeader = командир Эскадрона Смерти + .suffix = Роль ЭС, Эскадрон Смерти, dq + .desc = Командир элитного отряда Эскадрона Смерти. Руководите жизнью тех, кто будет обеспечивать аннигиляцию всех живых существ. +ent-MobHumanDeathSquadHealer = специалист Эскадрона Смерти + .suffix = Роль ЭС, Эскадрон Смерти, dq + .desc = Специалист элитного отряда Эскадрона Смерти. Поддерживайте жизнь тех, кто будет обеспечивать аннигиляцию всех живых существ. +ent-MobHumanDeathSquadOperative = оперативник Эскадрона Смерти + .suffix = Роль ЭС, Эскадрон Смерти, dq + .desc = Оперативник элитного отряда Эскадрона Смерти. Обеспечьте аннигиляцию всех живых существ. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/pda.ftl new file mode 100644 index 00000000000000..b60e8c9c8650ab --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/pda.ftl @@ -0,0 +1,6 @@ +ent-DeathsquadHealerPDA = { ent-DeathsquadPDA } + .suffix = Специалист эскадрона смерти + .desc = { ent-DeathsquadPDA.desc } +ent-DeathsquadCommanderPDA = { ent-DeathsquadPDA } + .suffix = Командир эскадрона смерти + .desc = { ent-DeathsquadPDA.desc } diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl new file mode 100644 index 00000000000000..5f5b3a7788a7fb --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl @@ -0,0 +1,3 @@ +ent-EmergencyMedipenDQ = божественный медипен + .suffix = Эскадрон Смерти, dq + .desc = Экстренный медипен, который в кратчайшие сроки ставит на ноги даже при самых тяжелых травмах. Из-за дороговизны производства применяется только элитными отрядами. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl new file mode 100644 index 00000000000000..3ec288c491b846 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl @@ -0,0 +1,10 @@ +ent-WeaponPulseRifle2 = пульсовая винтовка + .suffix = Винтовка, Эскадрон Смерти, dq + .desc = Энергетическая винтовка тяжелого типа, способна аннигилировать любые структуры. +ent-WeaponPulseShotgun = пульсовый дробовик + .suffix = Дробовик, Эскадрон Смерти, dq + .desc = Энергетическая дробовик с новейшей технологией лечения. + +firemode-name-kill = режия для убийства +firemode-name-destroy = режим для УНИЧТОЖЕНИЯ +firemode-name-heal = режим для лечения diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl new file mode 100644 index 00000000000000..110ec41b564a73 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl @@ -0,0 +1,3 @@ +ent-WeaponRifleSP = SP-91-RC + .suffix = Пистолет-пулемёт, Эскадрон Смерти, dq + .desc = Крупный пистолет-пулемет использующий патроны калибра .45 магнум. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl new file mode 100644 index 00000000000000..70aee6f39d2760 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl @@ -0,0 +1,3 @@ +ent-WeaponTurretDeathSquad = турель + .suffix = Турель, Эскадрон Смерти, dq + .desc = Турель с системой автоматического огня. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl index cfeb52ee6a2108..89586c878f132a 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/melee/swords.ftl @@ -2,3 +2,7 @@ ent-JianSword = цзянь .desc = Древний церемониальный меч. ent-OfficerCutlass = офицерский кортик .desc = Богато украшенное наградное оружие, что является символом офицера флота Человечества. + +ent-Chainsword = цепной меч + .suffix = Эскадрон Смерти, dq + .desc = Технологии и ультранасилие в одном флаконе! diff --git a/Resources/Locale/ru-RU/ss220/reagents/meta/medicine.ftl b/Resources/Locale/ru-RU/ss220/reagents/meta/medicine.ftl index 741e402542b2ba..b42c7cd8039098 100644 --- a/Resources/Locale/ru-RU/ss220/reagents/meta/medicine.ftl +++ b/Resources/Locale/ru-RU/ss220/reagents/meta/medicine.ftl @@ -11,4 +11,7 @@ reagent-name-harai = харай reagent-desc-harai = Тёмно-фиолетовая паста, созданная для борьбы с феромонным штормом у арахнидов. Впервые была получена из пещерного растения на Ширре-1 reagent-name-nicotizine = Никотизин -reagent-desc-nicotizine = Низкоконцентрированная форма барозина смешанного с никотином, менее вредна для здоровья, согревает тело и предотвраящает повреждения от давления, используется в сигаретах. \ No newline at end of file +reagent-desc-nicotizine = Низкоконцентрированная форма барозина смешанного с никотином, менее вредна для здоровья, согревает тело и предотвраящает повреждения от давления, используется в сигаретах. + +reagent-name-holymolywater = эссенция святой воды +reagent-desc-holymolywater = Концентрированная святая вода, лечащая все болезни и даже смерть. diff --git a/Resources/Locale/ru-RU/ss220/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/ss220/reagents/meta/physical-desc.ftl index 40599a144804a6..50fea4ac9e7c5d 100644 --- a/Resources/Locale/ru-RU/ss220/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/ss220/reagents/meta/physical-desc.ftl @@ -1 +1,3 @@ reagent-physical-desc-piquant = пряное + +reagent-physical-desc-holymoly = невозможное diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 6d45a3ea54f212..f4ddf749475203 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -994,16 +994,35 @@ - type: Armor modifiers: coefficients: - Blunt: 0.1 #best armor in the game - Slash: 0.1 - Piercing: 0.1 - Heat: 0.1 + #SS220-Deathsquad-Update-Begin + Blunt: 0.3 + Slash: 0.3 + Piercing: 0.2 + Heat: 0.3 Radiation: 0.1 Stamina: 0.1 Caustic: 0.1 + #SS220-Deathsquad-Update-End - type: ClothingSpeedModifier walkModifier: 1.0 - sprintModifier: 1.0 + sprintModifier: 1.2 #SS220-Deathsquad-Update + #SS220-Deathsquad-Update-Begin + - type: GasTank + outputPressure: 101.3 + air: + volume: 20 + moles: + - 10.451303391 # 22% oxygen + - 11.600075659 # 78% nitrogen + # 32.051379050 total = ~60 min + temperature: 293.15 + tankLowPressure: 30.0 + - type: PointLight + color: SkyBlue + radius: 1.5 + energy: 0.3 + netsync: false + #SS220-Deathsquad-Update-End - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 813c1ec76bbbb2..b9824c95257524 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -16,20 +16,22 @@ ## Death Squad -- type: entity - id: RandomHumanoidSpawnerDeathSquad - name: Death Squad Agent - suffix: ERTRole, Death Squad - components: - - type: Sprite - sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi - state: icon - - type: RandomMetadata - nameSegments: - - NamesFirstMilitaryLeader - - NamesLastMilitary - - type: RandomHumanoidSpawner - settings: DeathSquad +#SS220-Deathsquad-Update-Begin #Outdated spawner, use new ones +#- type: entity +# id: RandomHumanoidSpawnerDeathSquad +# name: Death Squad Agent +# suffix: ERTRole, Death Squad +# components: +# - type: Sprite +# sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi +# state: icon +# - type: RandomMetadata +# nameSegments: +# - NamesFirstMilitaryLeader +# - NamesLastMilitary +# - type: RandomHumanoidSpawner +# settings: DeathSquad +#SS220-Deathsquad-Update-End - type: randomHumanoidSettings id: DeathSquad diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 8477ad9b30aba7..c7d52a15632e08 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1277,7 +1277,7 @@ suffix: Death Squad components: - type: Pda - id: CentcomIDCardDeathsquad + id: CentcomIDCardDeathsquadOperative #SS220-DeathSquad Update state: pda-deathsquad #SS220 PDA-Resprite - type: PdaBorderColor #SS220 PDA-Resprite borderColor: "#212129" #SS220 PDA-Resprite diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml index 744bb9c7244ede..261635f529472c 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml @@ -1,16 +1,16 @@ - type: job id: DeathSquad - name: job-name-deathsquad + name: job-name-dq-operative #SS220-DeathSquad Update description: job-description-deathsquad playTimeTracker: JobDeathSquad setPreference: false - startingGear: DeathSquadGear - icon: "JobIconNanotrasen" + startingGear: DeathSquadOperativeGear #SS220-DeathSquad Update + icon: "JobIconDeathsquadOperative" #SS220-DeathSquad Update supervisors: job-supervisors-centcom canBeAntag: false accessGroups: - AllAccess - access: +# access: #SS220-DeathSquad Update - CentralCommand departmentsToIgnoreInTitles: # SS220 Round End Titles - Command # SS220 Round End Titles diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml b/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml index 4ec7264788ea9d..13d769e5392c8f 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml @@ -90,3 +90,51 @@ - id: Soap - id: CrowbarRed - id: AdvMopItem + +- type: entity + parent: ClothingBackpackERTSecurity + id: ClothingBackpackDeathSquadOperativeFilled + name: death squad backpack + description: Holds the kit of CentComm's most feared agents. + components: + - type: Sprite + sprite: Corvax/Back/Backpacks/deathsquad-backpack.rsi + - type: Storage + grid: + - 0,0,8,6 + - type: StorageFill + contents: + - id: WeaponPulseRifle2 + - id: WeaponPulsePistol + - id: WeaponRevolverMateba + - id: SpeedLoaderMagnumAP + - id: SpeedLoaderMagnumAP + - id: ToolDebug + - id: WelderExperimental + - id: PinpointerNuclear + - id: EmergencyMedipenDQ + amount: 2 + +- type: entity + parent: ClothingBackpackERTSecurity + id: ClothingBackpackDeathSquadSpecialistFilled + name: death squad backpack + description: Holds the kit of CentComm's most feared agents. + components: + - type: Sprite + sprite: Corvax/Back/Backpacks/deathsquad-backpack.rsi + - type: Storage + grid: + - 0,0,8,6 + - type: StorageFill + contents: + - id: WeaponPulseRifle2 + - id: WeaponPulsePistol + - id: WeaponRevolverMateba + - id: SpeedLoaderMagnumAP + - id: SpeedLoaderMagnumAP + - id: ToolDebug + - id: WelderExperimental + - id: PinpointerNuclear + - id: EmergencyMedipenDQ + amount: 6 diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml new file mode 100644 index 00000000000000..cad89bf75f8b73 --- /dev/null +++ b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml @@ -0,0 +1,51 @@ +- type: entity + id: LockerDeathsquadOperativeFilled + suffix: Filled + parent: LockerDeathsquad + components: + - type: StorageFill + contents: + - id: FlashlightSeclite + - id: ClothingEyesHudOmniversal + - id: ClothingMaskGasDeathSquad + - id: ClothingHandsGlovesDQ + - id: ClothingShoesBootsMagDQ + - id: ClothingHeadsetAltCentComm + - id: ClothingBackpackDeathSquadOperativeFilled + +- type: entity + id: LockerDeathsquadCommanderFilled + suffix: Filled + parent: LockerDeathsquadCommander + components: + - type: StorageFill + contents: + - id: FlashlightSeclite + - id: ClothingEyesHudOmniversal + - id: ClothingMaskGasDeathSquad + - id: ClothingHandsGlovesDQ + - id: ClothingShoesBootsMagDQ + - id: ClothingHeadsetAltCentComm + - id: WeaponRifleSP + - id: Chainsword + - id: ClothingOuterHardsuitDeathsquadCommander + - id: ClothingBackpackDeathSquadOperativeFilled + - id: MagazineMagnumSubMachineGunSP-91-RC + amount: 2 + +- type: entity + id: LockerDeathsquadSpecialistFilled + suffix: Filled + parent: LockerDeathsquadSpecialist + components: + - type: StorageFill + contents: + - id: FlashlightSeclite + - id: ClothingEyesHudOmniversal + - id: ClothingMaskGasDeathSquad + - id: ClothingHandsGlovesDQ + - id: ClothingShoesBootsMagDQ + - id: ClothingHeadsetAltCentComm + - id: WeaponPulseShotgun + - id: ClothingOuterHardsuitDeathsquadAlpha + - id: ClothingBackpackDeathSquadSpecialistFilled diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/SS220/Entities/Clothing/Eyes/hud.yml index dfb4fff549cb43..b7b0afc6aed918 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Eyes/hud.yml @@ -29,8 +29,9 @@ id: ClothingEyesHudOmniversal name: omniversal hud description: A secret development for very secretive individuals. - suffix: Sec-med-chem + suffix: Shitspawn, Sec-med-chem-termal components: + - type: ThermalVisionClothing - type: Sprite sprite: SS220/Clothing/Eyes/omni_hud.rsi - type: Clothing diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml b/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml index c4fb7c3cc4a58e..830a3f02eceb0b 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml @@ -67,3 +67,24 @@ sprite: SS220/Clothing/Hands/Gloves/janitor_jr.rsi - type: Clothing sprite: SS220/Clothing/Hands/Gloves/janitor_jr.rsi + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesDQ + name: DQ combat gloves + description: Power gloves that multiply the mechanical force of impact. + components: + - type: Insulated + - type: Sprite + sprite: SS220/Clothing/Hands/Gloves/dq_gloves.rsi + - type: Clothing + sprite: SS220/Clothing/Hands/Gloves/dq_gloves.rsi + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Blunt: 45 + animation: WeaponArcFist + - type: Fiber + fiberMaterial: fibers-insulative + - type: FingerprintMask diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml index ef86b7ea1fcf62..cee155dabf9f76 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml @@ -50,6 +50,60 @@ Slash: 0.8 Piercing: 0.8 +# Death Squad Commander Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitDeathsquadCommander + name: the helmet of the commander of the DQ + description: The helmet from the Death Squad commander's costume. + components: + - type: BreathMask + - type: Sprite + sprite: SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi + - type: PointLight + color: cyan + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.80 + Heat: 0.80 + Radiation: 0.80 + Caustic: 0.95 + +# Death Squad Alpha Hardsuit +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitDeathsquadAlpha + name: the helmet of the specialist of the DQ + description: The helmet from the Death Squad specialist's costume. + components: + - type: BreathMask + - type: Sprite + sprite: SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi + - type: PointLight + color: cyan + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.80 + Heat: 0.80 + Radiation: 0.80 + Caustic: 0.95 + #SuperMatter operator's Hardsuit - type: entity parent: ClothingHeadHardsuitWithLightBase diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml index 0b4e93997fe103..174a4e23f1a032 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml @@ -64,7 +64,108 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSecurityPilot +# Death Squad Commander Hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitDeathsquadCommander + name: the hardsuit of the DQ commander + description: A high-tech hardsuit designed for the squad commander. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + heatingCoefficient: 0.001 + coolingCoefficient: 0.001 + - type: Armor + modifiers: + coefficients: + Blunt: 0.2 + Slash: 0.2 + Piercing: 0.2 + Heat: 0.2 + Radiation: 0.1 + Stamina: 0.1 + Caustic: 0.1 + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1.1 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitDeathsquadCommander + - type: GasTank + outputPressure: 101.3 + air: + volume: 20 + moles: + - 10.451303391 # 22% oxygen + - 11.600075659 # 78% nitrogen + # 32.051379050 total = ~60 min + temperature: 293.15 + tankLowPressure: 30.0 + - type: PointLight + color: SkyBlue + radius: 1.5 + energy: 0.3 + netsync: false + +# Death Squad Alpha Hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitDeathsquadAlpha + name: the hardsuit of the DQ specialist + description: A high-tech hardsuit designed for the squad specialist. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + heatingCoefficient: 0.001 + coolingCoefficient: 0.001 + - type: ExplosionResistance + damageCoefficient: 0.4 + - type: Armor + modifiers: + coefficients: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.3 + Heat: 0.3 + Radiation: 0.1 + Stamina: 0.1 + Caustic: 0.1 + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1.4 + - type: HeldSpeedModifier + - type: GasTank + outputPressure: 101.3 + air: + volume: 20 + moles: + - 10.451303391 # 22% oxygen + - 11.600075659 # 78% nitrogen + # 32.051379050 total = ~60 min + temperature: 293.15 + tankLowPressure: 30.0 + - type: PointLight + color: SkyBlue + radius: 1.5 + energy: 0.3 + netsync: false + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitDeathsquadAlpha + #SuperMatter operator's Hardsuit + - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitSuperMatterOperator @@ -106,3 +207,4 @@ Male: MaleEngineer Female: FemaleEngineer Unsexed: MaleEngineer + diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml index 7617bef509e3f6..6d34113fe47ddb 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml @@ -66,3 +66,40 @@ sprite: SS220/Clothing/Shoes/Boots/janitor_jr.rsi - type: Clothing sprite: SS220/Clothing/Shoes/Boots/janitor_jr.rsi + +# Эскадрон Смерти +- type: entity + parent: ClothingShoesBootsMagBase + id: ClothingShoesBootsMagDQ + name: Death Squad Magnetic Boots + description: The most modern magnetic shoes in recognizable colors. + components: + - type: InputMover + toParent: true + - type: MovementSpeedModifier + weightlessAcceleration: 1.2 + weightlessFriction: 0.5 + weightlessModifier: 1.5 + - type: CanMoveInAir + - type: Sprite + sprite: SS220/Clothing/Shoes/Boots/dq_magboots.rsi + state: icon + - type: Clothing + sprite: SS220/Clothing/Shoes/Boots/dq_magboots.rsi + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1 + - type: GasTank + outputPressure: 42.6 + air: + volume: 5 + temperature: 293.15 + moles: + - 1.153853429 # oxygen + - 1.153853429 # nitrogen + - type: UserInterface + interfaces: + enum.SharedGasTankUiKey.Key: + type: GasTankBoundUserInterface + - type: Jetpack + moleUsage: 0.00085 diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml new file mode 100644 index 00000000000000..249b0491fb6c60 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Mobs/Player/humanoid.yml @@ -0,0 +1,215 @@ +## Death Squad + +- type: randomHumanoidSettings + id: DeathSquadLeaderRandom + speciesBlacklist: [ Felinid, Diona, Arachnid, Dwarf, Moth, Vox, Reptilian, Skeleton, SlimePerson, Vulpkanin, Tajaran] + parent: EventHumanoidMindShielded + randomizeName: false + components: + - type: GhostRole + allowMovement: true + allowSpeech: true + makeSentient: true + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Command + time: 36000 + name: Командир Эскадрона Смерти + description: "Командир элитного отряда зачистки НаноТрейзен - Эскадрона Смерти. Приготовьтесь к массированному наступлению на станцию. Ваша задача, как тяжеловооружённого оперативника, - уничтожить всё живое на своём пути. И никаких свидетелей." + - type: GhostTakeoverAvailable + - type: ZombieImmune + - type: MobThresholds + thresholds: + 0: Alive + 170: Critical + 220: Dead + - type: Stamina + critThreshold: 200 + decay: 6 + cooldown: 1 + - type: SlowOnDamage + speedModifierThresholds: + 80: 0.9 + 140: 0.7 + 160: 0.5 + - type: Loadout + prototypes: [ DeathSquadLeaderGear ] + - type: AutoImplant + implants: + - DeathAcidifierImplant + - FreedomImplant + - MindShieldImplant + - type: NpcFactionMember + factions: + - DeathSquad + - type: StatusEffects + allowed: + - Stun + - KnockedDown + - SlowedDown + - Stutter + - Electrocution + - SlurredSpeech + - RatvarianLanguage + - PressureImmunity + - StaminaModifier + - type: Thirst + startingThirst: 2500 # spawn with Okay thirst state + thresholds: + OverHydrated: 3500 + Okay: 2500 + Thirsty: 1500 + Parched: 1000 + Dead: 0 + baseDecayRate: 0.0001 + - type: Hunger + currentHunger: 2500 # spawn with Okay hunger state + thresholds: + Overfed: 3500 + Okay: 2500 + Peckish: 1500 + Starving: 1000 + Dead: 0 + baseDecayRate: 0.0001 + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 170 + damage: + groups: + Brute: -1 + Burn: -1 + Toxin: -1 + Airloss: -0.5 + +- type: randomHumanoidSettings + id: DeathSquadHealerRandom + parent: DeathSquadLeaderRandom + components: + - type: GhostRole + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 54000 + - !type:DepartmentTimeRequirement + department: Medical + time: 36000 + name: Специалист Эскадрона Смерти + description: "Специалист элитного отряда зачистки НаноТрейзен - Эскадрона Смерти. Приготовьтесь к массированному наступлению на станцию. Ваша задача, как тяжеловооружённого оперативника, - уничтожить всё живое на своём пути. И никаких свидетелей." + - type: Loadout + prototypes: [ DeathSquadHealerGear ] + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 170 + damage: + groups: + Brute: -0.8 + Burn: -0.8 + Toxin: -0.8 + Airloss: -0.4 + +- type: randomHumanoidSettings + id: DeathSquadOperativeRandom + parent: DeathSquadLeaderRandom + components: + - type: GhostRole + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 54000 + name: Оперативник Эскадрона Смерти + description: "Оперативник элитного отряда зачистки НаноТрейзен - Эскадрона Смерти. Приготовьтесь к массированному наступлению на станцию. Ваша задача, как тяжеловооружённого оперативника, - уничтожить всё живое на своём пути. И никаких свидетелей." + - type: Loadout + prototypes: [ DeathSquadOperativeGear ] + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 150 + damage: + groups: + Brute: -0.6 + Burn: -0.6 + Toxin: -0.6 + Airloss: -0.3 + +- type: entity + name: commander of the Death Squadron + parent: RandomHumanoidSpawnerERTLeader + id: MobHumanDeathSquadLeader + suffix: Death Squad + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi + state: icon + - type: RandomHumanoidAppearance + randomizeName: false + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary + - type: RandomHumanoidSpawner + settings: DeathSquadLeaderRandom + +- type: entity + name: specialist of the Death Squadron + parent: RandomHumanoidSpawnerERTLeader + id: MobHumanDeathSquadHealer + suffix: Death Squad + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi + state: icon + - type: RandomHumanoidAppearance + randomizeName: false + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary + - type: RandomHumanoidSpawner + settings: DeathSquadHealerRandom + +- type: entity + parent: RandomHumanoidSpawnerERTLeader + id: MobHumanDeathSquadOperative + name: operative of the Death Squadron + suffix: Death Squad + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi + state: icon + - type: RandomHumanoidAppearance + randomizeName: false + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary + - type: RandomHumanoidSpawner + settings: DeathSquadOperativeRandom + +- type: startingGear + id: DeathSquadLeaderGear + equipment: + jumpsuit: ClothingUniformJumpsuitDeathSquad + id: DeathsquadCommanderPDA + pocket1: EnergySword + pocket2: EnergyShield + +- type: startingGear + id: DeathSquadHealerGear + equipment: + jumpsuit: ClothingUniformJumpsuitDeathSquad + id: DeathsquadHealerPDA + pocket1: EnergySword + pocket2: EnergyShield + +- type: startingGear + id: DeathSquadOperativeGear + equipment: + jumpsuit: ClothingUniformJumpsuitDeathSquad + id: DeathsquadPDA + pocket1: EnergySword + pocket2: EnergyShield diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml index b7fbabc62745e8..898a9eb11a517e 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml @@ -55,7 +55,6 @@ visible: false #SS220 PDA-Resprite-End - type: Icon state: pda-seniorservice - - type: entity parent: BasePDA id: MagistratePDA @@ -86,6 +85,24 @@ sprite: Objects/Devices/pda.rsi state: pda-magistrate +- type: entity + parent: DeathsquadPDA + id: DeathsquadCommanderPDA + suffix: Death Squad Commander + components: + - type: Pda + id: CentcomIDCardDeathsquadCommander + state: pda-deathsquad + +- type: entity + parent: DeathsquadPDA + id: DeathsquadHealerPDA + suffix: Death Squad Healer + components: + - type: Pda + id: CentcomIDCardDeathsquadHealer + state: pda-deathsquad + - type: entity parent: BasePDA id: AltRnDDirPDA diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml index 109f55dfab2d30..4f4ec7bea1adc8 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml @@ -159,3 +159,52 @@ - state: idprisoner - type: PresetIdCard job: Prisoner + +# Deathsquad +- type: entity + parent: IDCardStandard + id: CentcomIDCardDeathsquadOperative + name: ID карта оперативника Эскадрона Смерти + description: Карта, необходимая для доступа в различные области станции. + components: + - type: Sprite + layers: + - state: deathsquad + - type: Item + heldPrefix: blue + - type: IdCard + jobTitle: job-name-dq-operative + - type: Access + groups: + - AllAccess + tags: + - CentralCommandDeathSquad + - CentralCommand + - type: PresetIdCard + job: DeathSquad + +- type: entity + parent: CentcomIDCardDeathsquadOperative + id: CentcomIDCardDeathsquadCommander + name: ID карта командира Эскадрона Смерти + components: + - type: Sprite + layers: + - state: deathsquad + - type: IdCard + jobTitle: job-name-dq-commander + - type: PresetIdCard + job: DeathsquadCommander + +- type: entity + parent: CentcomIDCardDeathsquadOperative + id: CentcomIDCardDeathsquadHealer + name: ID карта специалиста Эскадрона Смерти + components: + - type: Sprite + layers: + - state: deathsquad + - type: IdCard + jobTitle: job-name-dq-specialist + - type: PresetIdCard + job: DeathsquadHealer diff --git a/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml new file mode 100644 index 00000000000000..751c4f33f7106c --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/hypospray.yml @@ -0,0 +1,29 @@ +- type: entity + parent: ChemicalMedipen + id: EmergencyMedipenDQ + name: holymoly medicine + description: Emergency medipen, which puts you back on your feet in the shortest possible time, even with the most severe injuries. Due to the high cost and difficulty of production, it is used only by the most elite units. + suffix: Shitspawn, Death Squad + components: + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: HolyMolyWater + Quantity: 20 + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: holypen_empty + - type: Hypospray + solutionName: pen + transferAmount: 95 + - type: Sprite + sprite: SS220/Objects/Specific/Medical/medipen.rsi + netsync: false + layers: + - state: holypen + map: [ "enum.SolutionContainerLayers.Fill" ] + - type: Tag + tags: [] diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml new file mode 100644 index 00000000000000..99d966949a4c5b --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -0,0 +1,18 @@ +- type: entity + id: MagazineMagnumSubMachineGunSP-91-RC + name: "SP-91-RC magazine (.45 magnum)" + parent: BaseMagazineMagnumSubMachineGun + components: + - type: Tag + tags: + - MagazineMagnumSubMachineGunSP-91-RC + - type: BallisticAmmoProvider + proto: CartridgeMagnum + capacity: 110 + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-2 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml new file mode 100644 index 00000000000000..20eb6c0e9dc286 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -0,0 +1,72 @@ +# Новые прототипы пишите выше +# Death Squad +- type: entity + name: pulse rifle + parent: BaseWeaponBattery + id: WeaponPulseRifle2 + description: A heavy-duty energy rifle capable of annihilating any structures. + suffix: Винтовка, Death Squad + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi + - type: Gun + fireRate: 2.5 + - type: Battery + maxCharge: 400 + startingCharge: 400 + - type: HitscanBatteryAmmoProvider + proto: Pulsekill + fireCost: 1 + - type: BatteryWeaponFireModes + fireModes: + - proto: Pulsekill + name: firemode-name-kill + fireCost: 1 + - proto: PulseDESTROY + name: firemode-name-destroy + fireCost: 5 + soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + +- type: entity + name: pulse shotgun + parent: BaseWeaponBattery + id: WeaponPulseShotgun + description: An energy shotgun with the latest treatment technology. + suffix: Death Squad + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/pulse_shotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: SS220/Objects/Weapons/Guns/pulse_shotgun.rsi + - type: Battery + maxCharge: 400 + startingCharge: 400 + - type: ProjectileBatteryAmmoProvider + proto: BulletLaserDestroy + fireCost: 10 + - type: BatteryWeaponFireModes + fireModes: + - proto: BulletLaserDestroy + name: firemode-name-kill + fireCost: 10 + soundGunshot: /Audio/Weapons/Guns/Gunshots/taser2.ogg + magState: mag + - proto: BulletLaserHeal + name: firemode-name-heal + fireCost: 17.5 + soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + magState: heal-mag diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml index 1a0b1851a46cc9..32d5eeccabeb86 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml @@ -16,3 +16,39 @@ - type: Tag tags: - HideContextMenu + +# Death Squad +- type: hitscan + id: Pulsekill + damage: + types: + Heat: 30 + Structural: 200 + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_blue + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_blue + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_blue + hitscanSpread: + spread: 20 + count: 5 + +- type: hitscan + id: PulseDESTROY + damage: + types: + Heat: 100 + Structural: 2000 + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_u_laser + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: u_laser + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_u_laser diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index f2c9203dce9b57..e7a52c0a0f7e8b 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -171,3 +171,66 @@ radius: 3.5 color: blue energy: 0.5 + +# Death Squad +- type: entity + name: laser bolt + id: BulletLaserDestroy + parent: BulletLaser + categories: [ HideSpawnMenu ] + components: + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 44 + Structural: 800 + - type: ProjectileSpread + proto: BulletLaser + count: 5 + spread: 15 + +- type: entity + name: laser bolt + id: BulletLaserHeal + parent: BulletLaser + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi + layers: + - state: greenlaser + - type: Projectile + impactEffect: BulletImpactEffectGreenDisabler + damage: + types: + Blunt: -10 + Slash: -12 + Piercing: -20 + Heat: -14 + Radiation: 4 + Poison: -8 + Asphyxiation: -50 + - type: ProjectileSpread + proto: BulletLaserHeal + count: 3 + spread: 10 + +- type: entity + id: BulletImpactEffectGreenDisabler + categories: [ HideSpawnMenu ] + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + state: impact_laser_greyscale + color: green + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml new file mode 100644 index 00000000000000..ce1d1947a857b2 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -0,0 +1,42 @@ +- type: entity + parent: BaseWeaponSubMachineGun + id: WeaponRifleSP + name: SP-91-RC + description: A large submachine gun using caliber cartridges .45 magnum. + suffix: Death Squad + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/sp-91.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + fireRate: 7 + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineMagnumSubMachineGunSP-91-RC + priority: 2 + whitelist: + tags: + - MagazineMagnumSubMachineGunSP-91-RC + gun_chamber: + name: Chamber + startingItem: CartridgeMagnum + priority: 1 + whitelist: + tags: + - CartridgeMagnum + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml index 1ea58d9ebdd544..a2ca0595baaf66 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/turrets.yml @@ -119,3 +119,17 @@ - type: NpcFactionMember factions: - SimpleHostile + +- type: entity + parent: BaseWeaponTurret + id: WeaponTurretDeathSquad + name: turret + description: A turret with an automatic fire system. + suffix: DS, Death Squad, Эскадрон Смерти + components: + - type: NpcFactionMember + factions: + - DeathSquad + - type: Gun + fireRate: 6 + soundGunshot: /Audio/Weapons/Guns/Gunshots/minigun.ogg diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml index dbb923f0e12aed..5e78b0d98ea591 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml @@ -47,7 +47,7 @@ description: A graceful and elegant weapon that is the perfect choice for those who prefer a sophisticated style during combat. suffix: 27 piercing components: - - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita + - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita sound: path: /Audio/SS220/Effects/Drop/cane_blade.ogg params: @@ -106,3 +106,48 @@ - type: Tag tags: - OfficerCutlass + +# Цепная меч-пила +- type: entity + parent: BaseItem + id: Chainsword #todo Хуйня, переделать. + name: chainsword + description: Technology and ultra-violence in one bottle! + suffix: Death Squad + components: + - type: EmitSoundOnLand + sound: + path: /Audio/SS220/Effects/Drop/chainsaw.ogg ##new sound_drop effect, add MIXnikita + params: + volume: 2 + - type: Sharp + - type: Sprite + sprite: SS220/Objects/Weapons/Melee/chainsword.rsi + state: icon + - type: MeleeWeapon + autoAttack: true + wideAnimationRotation: -135 + attackRate: 4 + damage: + types: + Slash: 30 + Blunt: 20 + Structural: 170 + soundHit: + path: /Audio/Weapons/chainsaw.ogg + params: + volume: -3 + - type: Item + size: Small + sprite: SS220/Objects/Weapons/Melee/chainsword.rsi + - type: Appearance + - type: DisarmMalus + malus: 0 + - type: Reflect + #todo + # - type: Clothing + # sprite: SS220/Objects/Weapons/Melee/chainsword.rsi + # quickEquip: false + # slots: + # - Back + # - suitStorage diff --git a/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/locker.yml b/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/locker.yml index d4d4a149741336..1cddaec1595e30 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/locker.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/locker.yml @@ -118,6 +118,26 @@ - type: AccessReader access: [ [ "CentralCommandDeathSquad" ] ] +- type: entity + id: LockerDeathsquadCommander + parent: LockerDeathsquad + name: шкаф командира Эскадрона Смерти + components: + - type: EntityStorageVisuals + stateBaseClosed: deathsquad + stateDoorOpen: medsteel_open + stateDoorClosed: deathsquadcommander_door + +- type: entity + id: LockerDeathsquadSpecialist + parent: LockerDeathsquad + name: шкаф специалиста Эскадрона Смерти + components: + - type: EntityStorageVisuals + stateBaseClosed: deathsquad + stateDoorOpen: medsteel_open + stateDoorClosed: deathsquadspecialist_door + #Командование - type: entity id: LockerBlueshield diff --git a/Resources/Prototypes/SS220/Flavors/flavors.yml b/Resources/Prototypes/SS220/Flavors/flavors.yml index 34995c6757be16..3124dda068adae 100644 --- a/Resources/Prototypes/SS220/Flavors/flavors.yml +++ b/Resources/Prototypes/SS220/Flavors/flavors.yml @@ -41,4 +41,9 @@ - type: flavor id: french75 flavorType: Complex - description: терпко-сладко \ No newline at end of file + description: терпко-сладко + +- type: flavor + id: HolyMoly + flavorType: Base + description: божественно diff --git a/Resources/Prototypes/SS220/Reagents/medicine.yml b/Resources/Prototypes/SS220/Reagents/medicine.yml index 5e65a66e30c247..6618953d89542a 100644 --- a/Resources/Prototypes/SS220/Reagents/medicine.yml +++ b/Resources/Prototypes/SS220/Reagents/medicine.yml @@ -160,6 +160,25 @@ types: Poison: 0.5 +- type: reagent + id: HolyMolyWater + name: reagent-name-holymolywater + group: Medicine + desc: reagent-desc-holymolywater + physicalDesc: reagent-physical-desc-holymoly + flavor: HolyMoly + color: "#e8e8e8" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Brute: -10 + Burn: -10 + Airloss: -10 + Toxin: -10 + - type: reagent id: Nicotizine name: reagent-name-nicotizine @@ -195,4 +214,4 @@ min: 30 - !type:GenericStatusEffect key: PressureImmunity - component: PressureImmunity \ No newline at end of file + component: PressureImmunity diff --git a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml new file mode 100644 index 00000000000000..4de64b6b98212b --- /dev/null +++ b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/deathsquad.yml @@ -0,0 +1,29 @@ +- type: job + id: DeathsquadCommander + name: job-name-dq-commander + description: job-description-deathsquad + playTimeTracker: JobDeathSquadCommander + setPreference: false + startingGear: DeathSquadLeaderGear + icon: "JobIconDeathsquadCommander" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess +# access: #SS220-DeathSquad Update + - CentralCommand + +- type: job + id: DeathsquadHealer + name: job-name-dq-specialist + description: job-description-deathsquad + playTimeTracker: JobDeathSquadHealer + setPreference: false + startingGear: DeathSquadHealerGear + icon: "JobIconDeathsquadHealer" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess +# access: #SS220-DeathSquad Update + - CentralCommand diff --git a/Resources/Prototypes/SS220/Roles/play_time_trackers.yml b/Resources/Prototypes/SS220/Roles/play_time_trackers.yml index bdcd96bf27ddcc..e0b6c525cb4571 100644 --- a/Resources/Prototypes/SS220/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/SS220/Roles/play_time_trackers.yml @@ -55,3 +55,10 @@ - type: playTimeTracker id: AntagInitialInfected + +# Centcom +- type: playTimeTracker + id: JobDeathSquadCommander + +- type: playTimeTracker + id: JobDeathSquadHealer diff --git a/Resources/Prototypes/SS220/StatusIcons/centcom.yml b/Resources/Prototypes/SS220/StatusIcons/centcom.yml new file mode 100644 index 00000000000000..437614fd2f9c3f --- /dev/null +++ b/Resources/Prototypes/SS220/StatusIcons/centcom.yml @@ -0,0 +1,23 @@ +- type: jobIcon + parent: JobIcon + id: JobIconDeathsquadOperative + icon: + sprite: /Textures/SS220/Interface/Misc/job_icons.rsi + state: deathsquad + jobName: job-name-dq-operative + +- type: jobIcon + parent: JobIcon + id: JobIconDeathsquadCommander + icon: + sprite: /Textures/SS220/Interface/Misc/job_icons.rsi + state: deathsquadleader + jobName: job-name-dq-commander + +- type: jobIcon + parent: JobIcon + id: JobIconDeathsquadHealer + icon: + sprite: /Textures/SS220/Interface/Misc/job_icons.rsi + state: deathsquadalpha + jobName: job-name-dq-specialist diff --git a/Resources/Prototypes/SS220/ai_factions.yml b/Resources/Prototypes/SS220/ai_factions.yml index b339f2c499a738..3d7f6e58b90343 100644 --- a/Resources/Prototypes/SS220/ai_factions.yml +++ b/Resources/Prototypes/SS220/ai_factions.yml @@ -55,3 +55,18 @@ - Revolutionary # ss220 spider queen end + +# Death Squad +- type: npcFaction + id: DeathSquad + hostile: + - NanoTrasen + - Syndicate + - Xeno + - Passive + - PetsNT + - Mouse + - Zombie + - Revolutionary + - SpiderQueen + - SimpleHostile diff --git a/Resources/Prototypes/SS220/tags.yml b/Resources/Prototypes/SS220/tags.yml index 5ac6a6e22e0ae7..f2a277c8f66328 100644 --- a/Resources/Prototypes/SS220/tags.yml +++ b/Resources/Prototypes/SS220/tags.yml @@ -111,6 +111,10 @@ - type: Tag id: EscapePod +# SP-91-RC +- type: Tag + id: MagazineMagnumSubMachineGunSP-91-RC + # SS220 to put lighter in a cigarette pack - type: Tag id: Lighter diff --git a/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/equipped-HAND.png b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/equipped-HAND.png new file mode 100644 index 00000000000000..fa917d3ca78179 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/icon.png b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/icon.png new file mode 100644 index 00000000000000..8f9ff237a27adc Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/inhand-left.png new file mode 100644 index 00000000000000..596bb37945a05b Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/inhand-right.png new file mode 100644 index 00000000000000..351ef4c892f170 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/meta.json b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/meta.json new file mode 100644 index 00000000000000..8eb869acb39f8e --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/b9c06b16579dc828ac4d6f603995e083075725b2", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon-flash.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon-flash.png new file mode 100644 index 00000000000000..a4cc77a73cba0e Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon-flash.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon.png new file mode 100644 index 00000000000000..ceaf7bc5bbe67c Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/meta.json new file mode 100644 index 00000000000000..e6f9ac24a63388 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:IAmRasputin#5242, modified by ewerall (Discord) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000000..224d3ced418923 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-inhand-left.png new file mode 100644 index 00000000000000..c14f709fe95f94 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-inhand-right.png new file mode 100644 index 00000000000000..fe136ce5072674 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000000..10d2b8d612551f Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-inhand-left.png new file mode 100644 index 00000000000000..7dea651261b622 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-inhand-right.png new file mode 100644 index 00000000000000..105dfe1d722337 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/icon-flash.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/icon-flash.png new file mode 100644 index 00000000000000..a4cc77a73cba0e Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/icon-flash.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/icon.png new file mode 100644 index 00000000000000..100a9d4d56eb5a Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/meta.json new file mode 100644 index 00000000000000..e6f9ac24a63388 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:IAmRasputin#5242, modified by ewerall (Discord) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000000..56c44a1ae6c5fe Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-inhand-left.png new file mode 100644 index 00000000000000..c14f709fe95f94 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-inhand-right.png new file mode 100644 index 00000000000000..fe136ce5072674 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000000..0b181c9e5a6162 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-inhand-left.png new file mode 100644 index 00000000000000..7dea651261b622 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-inhand-right.png new file mode 100644 index 00000000000000..105dfe1d722337 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000000..a7bfa2708bfd8e Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/icon.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/icon.png new file mode 100644 index 00000000000000..0ca06d292fe6ff Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/inhand-left.png new file mode 100644 index 00000000000000..ade4a82935f45c Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/inhand-right.png new file mode 100644 index 00000000000000..aef371c7d4ce35 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json new file mode 100644 index 00000000000000..5ed317bbc27707 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:IAmRasputin#5242, modified by ewerall (Discord) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000000..e6a61b49c0da07 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/icon.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/icon.png new file mode 100644 index 00000000000000..9e0b99d0a3f669 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/inhand-left.png new file mode 100644 index 00000000000000..ade4a82935f45c Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/inhand-right.png new file mode 100644 index 00000000000000..aef371c7d4ce35 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/meta.json new file mode 100644 index 00000000000000..5ed317bbc27707 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:IAmRasputin#5242, modified by ewerall (Discord) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/equipped-FEET.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/equipped-FEET.png new file mode 100644 index 00000000000000..bbf64522b70e66 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/icon-on.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/icon-on.png new file mode 100644 index 00000000000000..4b050445f92d03 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/icon-on.png differ diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/icon.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/icon.png new file mode 100644 index 00000000000000..ba86a70f148484 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/inhand-left.png new file mode 100644 index 00000000000000..dad553c703b3ab Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/inhand-right.png new file mode 100644 index 00000000000000..96e6191883f128 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/meta.json b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/meta.json new file mode 100644 index 00000000000000..83e862c89c1a5d --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. equipped-FEET-vox & on-equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi, and equipped-FEET-vox state modified to fix inconsistencies, color edited by Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "on-equipped-FEET", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-equipped-FEET.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-equipped-FEET.png new file mode 100644 index 00000000000000..b6a846b2f03253 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-inhand-left.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-inhand-left.png new file mode 100644 index 00000000000000..b9569dd67e966d Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-inhand-right.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-inhand-right.png new file mode 100644 index 00000000000000..8ff71c6a72a216 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquad.png b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquad.png new file mode 100644 index 00000000000000..893b22a43e1d69 Binary files /dev/null and b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquad.png differ diff --git a/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquadalpha.png b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquadalpha.png new file mode 100644 index 00000000000000..d5c165b462f7db Binary files /dev/null and b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquadalpha.png differ diff --git a/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquadleader.png b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquadleader.png new file mode 100644 index 00000000000000..0500f17f4266ff Binary files /dev/null and b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/deathsquadleader.png differ diff --git a/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/meta.json index 3dee15cec11780..1a66daad029bef 100644 --- a/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/SS220/Interface/Misc/job_icons.rsi/meta.json @@ -1,8 +1,7 @@ { "version": 1, "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "SecurityPilot Made by Surani, mindslave Made by ell_good (Discord) For SS220, magistrate sprited by Estkemran (GIthub) for SS220", - + "copyright": "SecurityPilot Made by Surani, mindslave Made by ell_good (Discord) For SS220, magistrate sprited by Estkemran (GIthub) for SS220, deathsquad state sprited by Estkemran (Github) for SS220", "size": { "x": 8, "y": 8 @@ -19,6 +18,15 @@ }, { "name": "slave" + }, + { + "name": "deathsquad" + }, + { + "name": "deathsquadalpha" + }, + { + "name": "deathsquadleader" } ] } diff --git a/Resources/Textures/SS220/Interface/deathsquad.png b/Resources/Textures/SS220/Interface/deathsquad.png new file mode 100644 index 00000000000000..7f03a7ba03fe75 Binary files /dev/null and b/Resources/Textures/SS220/Interface/deathsquad.png differ diff --git a/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/holypen.png b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/holypen.png new file mode 100644 index 00000000000000..471d68d69e5310 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/holypen.png differ diff --git a/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/holypen_empty.png b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/holypen_empty.png new file mode 100644 index 00000000000000..03902795317dc5 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/holypen_empty.png differ diff --git a/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/medipen-inhand-left.png b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/medipen-inhand-left.png new file mode 100644 index 00000000000000..993468f79b25b2 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/medipen-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png new file mode 100644 index 00000000000000..9b62a31f1f8ab1 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/meta.json new file mode 100644 index 00000000000000..994e6c814aab52 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "tgstation at 986af32e22a88dae14fd147d812a5a4d27c1bc30 | stimpen sprites made by PuroSlavKing (Github) for Space Station 14. Nearly all resprited by joshepvodka. holypen sprited by Estkemran (Github) dor SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "holypen" + }, + { + "name": "holypen_empty" + }, + { + "name": "medipen-inhand-left" + }, + { + "name": "medipen-inhand-right" + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/base.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/base.png new file mode 100644 index 00000000000000..070e38fcddf018 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/base.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-1.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-1.png new file mode 100644 index 00000000000000..e59b58c967dd11 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-1.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-2.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-2.png new file mode 100644 index 00000000000000..e59b58c967dd11 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/mag-2.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/meta.json new file mode 100644 index 00000000000000..a41ae941873c9e --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/greenlaser.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/greenlaser.png new file mode 100644 index 00000000000000..6685dfe18a92d5 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/greenlaser.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/meta.json index 1affa7a29c7edb..113374cf00fd71 100644 --- a/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/meta.json +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/726dc54d7f2bc99be1e0fe49d1b705fa71cc18b1/icons/obj/weapons/guns/projectiles.dmi", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/726dc54d7f2bc99be1e0fe49d1b705fa71cc18b1/icons/obj/weapons/guns/projectiles.dmi, greenlaser sprited by Estkemran (Github) for ss220", "size": { "x": 32, "y": 32 @@ -20,6 +20,9 @@ }, { "name": "redlaser" + }, + { + "name": "greenlaser" } ] } diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/base.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/base.png new file mode 100644 index 00000000000000..455b737f175624 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/base.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000000..bc9de55b7e3995 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000000..5ac3c6c8c48cf3 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-1.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-1.png new file mode 100644 index 00000000000000..1ec414aa7089e2 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-1.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-2.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-2.png new file mode 100644 index 00000000000000..95edd605639813 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-2.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-3.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-3.png new file mode 100644 index 00000000000000..9ae33de4465ede Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-3.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-4.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-4.png new file mode 100644 index 00000000000000..d7b0e74adb1d4d Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/heal-mag-unshaded-4.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/icon.png new file mode 100644 index 00000000000000..65097d929c5276 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-left.png new file mode 100644 index 00000000000000..440e5edff51397 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-right.png new file mode 100644 index 00000000000000..f23c6c207e113e Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-1.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-1.png new file mode 100644 index 00000000000000..1ec414aa7089e2 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-2.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-2.png new file mode 100644 index 00000000000000..95edd605639813 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-3.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-3.png new file mode 100644 index 00000000000000..9ae33de4465ede Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-4.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-4.png new file mode 100644 index 00000000000000..d7b0e74adb1d4d Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/meta.json new file mode 100644 index 00000000000000..206c42b4b27c94 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2 backpack sprite by Peptide (copy of pulse rifle), backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, modified by Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "heal-mag-unshaded-1" + }, + { + "name": "heal-mag-unshaded-2" + }, + { + "name": "heal-mag-unshaded-3" + }, + { + "name": "heal-mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/wielded-inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000000..b9df7a2cb2de40 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/wielded-inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000000..644db232d2e284 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/pulse_shotgun.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/base.png b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/base.png new file mode 100644 index 00000000000000..85f7346c6502af Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/base.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/bolt-open.png b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/bolt-open.png new file mode 100644 index 00000000000000..85f7346c6502af Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/bolt-open.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/equipped-BACKPACK.png b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000000..a8d5c3fe3d5f7d Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/icon.png new file mode 100644 index 00000000000000..364b0c1b83c8b2 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/inhand-left.png new file mode 100644 index 00000000000000..4866de177b12f6 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/inhand-right.png new file mode 100644 index 00000000000000..2e5045a35dd219 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/mag-0.png b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/mag-0.png new file mode 100644 index 00000000000000..c5160807f5bcb1 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/mag-0.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/meta.json new file mode 100644 index 00000000000000..12a95021c631aa --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/icon.png new file mode 100644 index 00000000000000..9c056be91770ac Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/inhand-left.png new file mode 100644 index 00000000000000..463b7b1768f09b Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/inhand-right.png new file mode 100644 index 00000000000000..063cdae262ff8a Binary files /dev/null and b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/meta.json new file mode 100644 index 00000000000000..df5a68564ea94c --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi/meta.json @@ -0,0 +1,64 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/weapons/sword.dmi, inhand-left & inhand-right sprited by Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/SS220/Structures/Storage/closet.rsi/deathsquadcommander_door.png b/Resources/Textures/SS220/Structures/Storage/closet.rsi/deathsquadcommander_door.png new file mode 100644 index 00000000000000..e4cc6800a2e66b Binary files /dev/null and b/Resources/Textures/SS220/Structures/Storage/closet.rsi/deathsquadcommander_door.png differ diff --git a/Resources/Textures/SS220/Structures/Storage/closet.rsi/deathsquadspecialist_door.png b/Resources/Textures/SS220/Structures/Storage/closet.rsi/deathsquadspecialist_door.png new file mode 100644 index 00000000000000..4f4b21abfa5fb1 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Storage/closet.rsi/deathsquadspecialist_door.png differ diff --git a/Resources/Textures/SS220/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/SS220/Structures/Storage/closet.rsi/meta.json index d9802fe3275b65..e22c3b42d2b206 100644 --- a/Resources/Textures/SS220/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/SS220/Structures/Storage/closet.rsi/meta.json @@ -271,6 +271,12 @@ { "name": "deathsquad_door" }, + { + "name": "deathsquadcommander_door" + }, + { + "name": "deathsquadspecialist_door" + }, { "name": "detective_wardrobe_door" },