diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index f90933585deb..5d73ecf86375 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -22,7 +22,7 @@ - SimpleHostile - type: Sprite drawdepth: SmallMobs - sprite: Mobs/Animals/regalrat.rsi + sprite: SS220/Mobs/Animals/regalrat.rsi #SS20 XMAS layers: - map: ["enum.DamageStateVisualLayers.Base"] state: regalrat @@ -197,7 +197,7 @@ - SimpleHostile - type: Sprite drawdepth: SmallMobs - sprite: Mobs/Animals/rat.rsi + sprite: SS220/Mobs/Animals/rat.rsi #SS220 XMAS layers: - map: ["enum.DamageStateVisualLayers.Base", "movement"] state: rat diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index d97c205bb2d8..afa8ac7228ed 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -421,7 +421,7 @@ - type: StationAiVision - type: InteractionOutline - type: Sprite - sprite: Mobs/Silicon/station_ai.rsi + sprite: SS220/Mobs/Silicon/station_ai.rsi #SS220 XMAS layers: - state: base - state: ai_empty @@ -468,7 +468,7 @@ containerId: station_ai_mind_slot job: StationAi - type: Sprite - sprite: Mobs/Silicon/station_ai.rsi + sprite: SS220/Mobs/Silicon/station_ai.rsi #SS220 XMAS layers: - state: base - state: ai @@ -533,7 +533,7 @@ - type: Visibility layer: 2 - type: Sprite - sprite: Mobs/Silicon/station_ai.rsi + sprite: SS220/Mobs/Silicon/station_ai.rsi #SS220 XMAS layers: - state: ai_camera shader: unshaded diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 4bf55be52bd9..10d559a0fda4 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -21,7 +21,7 @@ type: StationMapBoundUserInterface requireInputValidation: false - type: Sprite - sprite: Objects/Fun/pai.rsi + sprite: SS220/Objects/Fun/pai.rsi #SS220 XMAS layers: - state: pai-base - state: pai-off-overlay @@ -87,7 +87,7 @@ description: Your Syndicate pal who's fun to be with! components: - type: Sprite - sprite: Objects/Fun/pai.rsi + sprite: SS220/Objects/Fun/pai.rsi #SS220 XMAS layers: - state: pai-base - state: syndicate-pai-off-overlay @@ -129,7 +129,7 @@ description: It's a potato. You forced it to be sentient, you monster. components: - type: Sprite - sprite: Objects/Fun/pai.rsi + sprite: SS220/Objects/Fun/pai.rsi #SS220 XMAS layers: - state: potato-base - state: potato-off-overlay diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index e534fd7b5fd4..590328b8f6bb 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -835,6 +835,7 @@ name: loadout-group-chief-engineer-head minLimit: 0 loadouts: + - ChiefEngineerHeadXmas #SS220 XMAS - ChiefEngineerHead - ChiefEngineerBeret - BeretCE #SS220-CEBeret @@ -908,6 +909,7 @@ id: StationEngineerHead name: loadout-group-station-engineer-head loadouts: + - StationEngineerHardhatYellowXmas #SS220 XMAS - StationEngineerHardhatYellow - StationEngineerHardhatOrange - StationEngineerHardhatRed @@ -1220,6 +1222,7 @@ name: loadout-group-security-head minLimit: 0 loadouts: + - SecurityHelmetXmas #SS220 XMAS - SecurityHelmet - SecurityBeret - SecurityHat diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardhats.yml index f9f06fd86728..6e3ff888a089 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardhats.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardhats.yml @@ -11,6 +11,39 @@ - type: Clothing sprite: SS220/Clothing/Head/Hardhats/violet.rsi +- type: entity + parent: ClothingHeadHatHardhatBase + id: ClothingHeadHatHardhatWhiteXmas + name: новогодняя белая каска + description: Новогоднее настроение на вашей голове и защита в одном! + components: + - type: Sprite + sprite: SS220/Clothing/Head/Hardhats/white_xmas.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardhats/white_xmas.rsi + +- type: entity + parent: ClothingHeadHatHardhatBase + id: ClothingHeadHatHardhatYellowXmas + name: новогодняя жёлтая каска + description: Новогоднее настроение на вашей голове и защита в одном! + components: + - type: Sprite + sprite: SS220/Clothing/Head/Hardhats/yellow_xmas.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardhats/yellow_xmas.rsi + +- type: entity + parent: ClothingHeadHatHardhatBase + id: ClothingHeadHatHardhatVioletXmas + name: новогодняя фиолетовая каска + description: Новогоднее настроение на вашей голове и защита в одном! + components: + - type: Sprite + sprite: SS220/Clothing/Head/Hardhats/violet_xmas.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardhats/violet_xmas.rsi + # Уборщик - type: entity diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/helmets.yml index 22845dc0e7d1..fcb0d39854f3 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/helmets.yml @@ -12,6 +12,25 @@ - type: Clothing sprite: SS220/Clothing/Head/Helmets/opscore.rsi +- type: entity + parent: [ClothingHeadHelmetBase] + id: ClothingHeadHelmetBasicXmas + name: новогодний шлем + description: Новогоднее настроение на вашей голове и защита в одном! + components: + - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita + sound: + path: /Audio/SS220/Effects/Drop/clothing_head_helmedeva.ogg + params: + volume: 2 + - type: Sprite + sprite: SS220/Clothing/Head/Helmets/security_xmas.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Helmets/security_xmas.rsi + - type: Tag + tags: + - Kangaroo #SS220-ghost-roles + #Military Police Helmet #by MIXnikita for SS200 - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/SS220/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/SS220/Entities/Objects/Fun/pai.yml index abaf5689ddb8..511778c76be9 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Fun/pai.yml @@ -16,7 +16,7 @@ type: StationMapBoundUserInterface requireInputValidation: false - type: Sprite - sprite: Objects/Fun/pai.rsi + sprite: SS220/Objects/Fun/pai.rsi #XMAS layers: - state: pai-base - state: pai-off-overlay diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml index bf73c41c42c5..86507fc5a2f8 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -67,6 +67,11 @@ equipment: head: ClothingHeadBandSalvage +- type: loadout + id: ClothingHeadHatHardhatVioletXmas + equipment: + head: ClothingHeadHatHardhatVioletXmas + - type: loadout id: ClothingHeadHatHardhatViolet equipment: diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/chief_engineer.yml index ac5e73cca1ab..b80d8d602a96 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -78,3 +78,7 @@ equipment: head: ClothingHeadHatBeretCE +- type: loadout + id: ChiefEngineerHeadXmas + equipment: + head: ClothingHeadHatHardhatWhiteXmas \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/station_engineer.yml index 0c3195438ab0..766ff74bd3f1 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Engineering/station_engineer.yml @@ -8,6 +8,12 @@ role: JobStationEngineer time: 108000 # 30 hrs +# Head +- type: loadout + id: StationEngineerHardhatYellowXmas + equipment: + head: ClothingHeadHatHardhatYellowXmas + # Glasses - type: loadout id: GlassesEngineer diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_officer.yml index 54552b007807..b458fbf57bd7 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_officer.yml @@ -87,6 +87,11 @@ jumpsuit: ClothingUniformJumpsuitVaas # Head +- type: loadout + id: SecurityHelmetXmas + equipment: + head: ClothingHeadHelmetBasicXmas + - type: loadout id: HatCowboyBlack equipment: diff --git a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml index 18a1f5b2e270..346ecf3290c6 100644 --- a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml @@ -260,6 +260,7 @@ name: loadout-group-security-pilot-head minLimit: 0 loadouts: + - SecurityHelmetXmas - SecurityHelmet - SecurityBeret - SecurityHat @@ -576,6 +577,7 @@ loadouts: - ClothingHeadHatSalvage - ClothingHeadBandSalvage + - ClothingHeadHatHardhatVioletXmas - ClothingHeadHatHardhatViolet - ClothingHeadBeretSalvageSpecialist # Утилизатор (Конец) diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/icon.png new file mode 100644 index 000000000000..cdbf4ef8e939 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/light-icon.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/light-icon.png new file mode 100644 index 000000000000..d063eb38b4a7 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/light-icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/meta.json new file mode 100644 index 000000000000..0581cb13eb83 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "sprited by dinazewwr (Discord) for SS220 XMAS resprite by vimenant2", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "light-icon" + }, + { + "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/Hardhats/violet_xmas.rsi/off-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/off-equipped-HELMET.png new file mode 100644 index 000000000000..df340267550c Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/off-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/off-inhand-left.png new file mode 100644 index 000000000000..14d2f479712c Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/off-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/off-inhand-right.png new file mode 100644 index 000000000000..56b1f49f410b Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/on-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/on-equipped-HELMET.png new file mode 100644 index 000000000000..aecd8bd0bb58 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/on-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/on-inhand-left.png new file mode 100644 index 000000000000..3048d5ed10c4 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/on-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/on-inhand-right.png new file mode 100644 index 000000000000..8b7fee324d89 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet_xmas.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/icon.png new file mode 100644 index 000000000000..8e802d593278 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/light-icon.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/light-icon.png new file mode 100644 index 000000000000..d063eb38b4a7 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/light-icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/meta.json new file mode 100644 index 000000000000..56d9789a6733 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.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 XMAS resprite by vimenant2 (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "light-icon" + }, + { + "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/Hardhats/white_xmas.rsi/off-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/off-equipped-HELMET.png new file mode 100644 index 000000000000..5fd5f7840ad0 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/off-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/off-inhand-left.png new file mode 100644 index 000000000000..d84f3452a4a7 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/off-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/off-inhand-right.png new file mode 100644 index 000000000000..edbeb03ff6c8 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/on-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/on-equipped-HELMET.png new file mode 100644 index 000000000000..5b2e1f33710c Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/on-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/on-inhand-left.png new file mode 100644 index 000000000000..aee909ae3e18 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/on-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/on-inhand-right.png new file mode 100644 index 000000000000..a05f43b3dec1 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/white_xmas.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/icon.png new file mode 100644 index 000000000000..3f199c3d4bca Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/light-icon.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/light-icon.png new file mode 100644 index 000000000000..d063eb38b4a7 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/light-icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/meta.json new file mode 100644 index 000000000000..56d9789a6733 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.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 XMAS resprite by vimenant2 (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "light-icon" + }, + { + "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/Hardhats/yellow_xmas.rsi/off-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/off-equipped-HELMET.png new file mode 100644 index 000000000000..f7f9b00f1aed Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/off-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/off-inhand-left.png new file mode 100644 index 000000000000..521c1c584501 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/off-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/off-inhand-right.png new file mode 100644 index 000000000000..2426dc1e9b72 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/on-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/on-equipped-HELMET.png new file mode 100644 index 000000000000..b81a9af6da91 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/on-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/on-inhand-left.png new file mode 100644 index 000000000000..ec944ef43e1b Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/on-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/on-inhand-right.png new file mode 100644 index 000000000000..74a1d685dfd3 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hardhats/yellow_xmas.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/equipped-HELMET-kangaroo.png b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/equipped-HELMET-kangaroo.png new file mode 100644 index 000000000000..93e287e6c0e2 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/equipped-HELMET-kangaroo.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/equipped-HELMET-vox.png b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/equipped-HELMET-vox.png new file mode 100644 index 000000000000..520a5fcb8df9 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..9e4acc4207c2 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/icon.png new file mode 100644 index 000000000000..9b0826cbc983 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/inhand-left.png new file mode 100644 index 000000000000..a1d077de0b46 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/inhand-right.png new file mode 100644 index 000000000000..11ff56e577de Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/meta.json new file mode 100644 index 000000000000..139bbee75a25 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Helmets/security_xmas.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand taken at commit https://github.com/tgstation/tgstation/commit/d1582bf1b41a0e24fd7a18124c6ff46b86b393f9 and modified by github:Morb0, equipped-HELMET-kangaroo is a modified version by github:TheArturZh, Vox state made by DieselMohawk for use in SS14, XMAS resprite by vimenant2", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-kangaroo", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Mobs/Animals/rat.rsi/dead.png b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/dead.png new file mode 100644 index 000000000000..5988b9b4b465 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/dead.png differ diff --git a/Resources/Textures/SS220/Mobs/Animals/rat.rsi/eyes-moving.png b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/eyes-moving.png new file mode 100644 index 000000000000..34020dad686d Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/eyes-moving.png differ diff --git a/Resources/Textures/SS220/Mobs/Animals/rat.rsi/eyes.png b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/eyes.png new file mode 100644 index 000000000000..716195bc43c5 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/eyes.png differ diff --git a/Resources/Textures/SS220/Mobs/Animals/rat.rsi/icon.png b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/icon.png new file mode 100644 index 000000000000..732b1e6b7641 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Mobs/Animals/rat.rsi/meta.json b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/meta.json new file mode 100644 index 000000000000..9b91943110ef --- /dev/null +++ b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/meta.json @@ -0,0 +1,80 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298 eyes added by jamessimo XMAS resprited by vimenant2(discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "rat", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + }, + { + "name": "rat-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "eyes-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "dead" + }, + { + "name": "splat" + } + ] +} diff --git a/Resources/Textures/SS220/Mobs/Animals/rat.rsi/rat-moving.png b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/rat-moving.png new file mode 100644 index 000000000000..648a25983a0c Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/rat-moving.png differ diff --git a/Resources/Textures/SS220/Mobs/Animals/rat.rsi/rat.png b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/rat.png new file mode 100644 index 000000000000..81881ac62a81 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/rat.png differ diff --git a/Resources/Textures/SS220/Mobs/Animals/rat.rsi/splat.png b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/splat.png new file mode 100644 index 000000000000..dda60bcb810d Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/rat.rsi/splat.png differ diff --git a/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/critical.png b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/critical.png new file mode 100644 index 000000000000..e24c9f54d51e Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/critical.png differ diff --git a/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/dead.png b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/dead.png new file mode 100644 index 000000000000..8decaf8ac425 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/dead.png differ diff --git a/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/eyes.png b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/eyes.png new file mode 100644 index 000000000000..8b841a049914 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/eyes.png differ diff --git a/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/icon.png b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/icon.png new file mode 100644 index 000000000000..a82cba8a27d8 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/meta.json b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/meta.json new file mode 100644 index 000000000000..1764c143615e --- /dev/null +++ b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b Changed by Alekshhh + eyes added by jamessimo XMAS resprite by vimenant2 (discord)", + "states": [ + { + "name": "critical" + }, + { + "name": "dead" + }, + { + "name": "icon" + }, + { + "name": "regalrat", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/regalrat.png b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/regalrat.png new file mode 100644 index 000000000000..87521414c7f0 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Animals/regalrat.rsi/regalrat.png differ diff --git a/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai.png b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai.png new file mode 100644 index 000000000000..420a07c1f966 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai.png differ diff --git a/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai_camera.png b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai_camera.png new file mode 100644 index 000000000000..fd5e2ece28d8 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai_camera.png differ diff --git a/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai_dead.png b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai_dead.png new file mode 100644 index 000000000000..eb74655e027f Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai_dead.png differ diff --git a/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai_empty.png b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai_empty.png new file mode 100644 index 000000000000..40e8ac521618 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/ai_empty.png differ diff --git a/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/base.png b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/base.png new file mode 100644 index 000000000000..b0852b432bc9 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/base.png differ diff --git a/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/default.png b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/default.png new file mode 100644 index 000000000000..d52aceaf5b13 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/default.png differ diff --git a/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/meta.json b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/meta.json new file mode 100644 index 000000000000..c8d174c57bfc --- /dev/null +++ b/Resources/Textures/SS220/Mobs/Silicon/station_ai.rsi/meta.json @@ -0,0 +1,61 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2a19963297f91efb452dbb5c1d4eb28a14776b0a/icons/mob/silicon/ai.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ai", + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.1 + ] + ] + }, + { + "name": "ai_camera", + "delays": [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "ai_dead" + }, + { + "name": "ai_empty", + "delays": [ + [ + 0.7, + 0.7 + ] + ] + }, + { + "name": "default", + "directions": 4 + }, + { + "name": "base" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/icon-pai-off.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/icon-pai-off.png new file mode 100644 index 000000000000..3be3b8bdad42 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/icon-pai-off.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/icon-potato-off.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/icon-potato-off.png new file mode 100644 index 000000000000..806d02d6f3d4 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/icon-potato-off.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/meta.json b/Resources/Textures/SS220/Objects/Fun/pai.rsi/meta.json new file mode 100644 index 000000000000..f819450aa88d --- /dev/null +++ b/Resources/Textures/SS220/Objects/Fun/pai.rsi/meta.json @@ -0,0 +1,77 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9ddb8cf084e292571d4e9c79745db25befbd82fe. pai-searching-overlay heavily modified. Syndicate variants by fedKotikeD, and potato by Doru991", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-pai-off" + }, + { + "name": "pai-base" + }, + { + "name": "potato-base" + }, + { + "name": "pai-off-overlay" + }, + { + "name": "pai-on-overlay", + "delays": [ + [ + 0.8, + 0.8 + ] + ] + }, + { + "name": "pai-searching-overlay", + "delays": [ + [ + 0.8, + 0.8 + ] + ] + }, + { + "name": "syndicate-icon-pai-off" + }, + { + "name": "syndicate-pai-off-overlay" + }, + { + "name": "syndicate-pai-on-overlay", + "delays": [ + [ + 0.8, + 0.8 + ] + ] + }, + { + "name": "syndicate-pai-searching-overlay", + "delays": [ + [ + 0.8, + 0.8 + ] + ] + }, + { + "name": "icon-potato-off" + }, + { + "name": "potato-off-overlay" + }, + { + "name": "potato-on-overlay" + }, + { + "name": "potato-searching-overlay" + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-base.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-base.png new file mode 100644 index 000000000000..9efd205c322f Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-base.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-off-overlay.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-off-overlay.png new file mode 100644 index 000000000000..e376b2543562 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-off-overlay.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-on-overlay.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-on-overlay.png new file mode 100644 index 000000000000..dd43760c15a1 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-on-overlay.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-searching-overlay.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-searching-overlay.png new file mode 100644 index 000000000000..94eb011c70e6 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/pai-searching-overlay.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-base.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-base.png new file mode 100644 index 000000000000..b6e594430cd2 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-base.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-off-overlay.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-off-overlay.png new file mode 100644 index 000000000000..0d3f73515881 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-off-overlay.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-on-overlay.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-on-overlay.png new file mode 100644 index 000000000000..9926823662aa Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-on-overlay.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-searching-overlay.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-searching-overlay.png new file mode 100644 index 000000000000..5d8d7cde30c3 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/potato-searching-overlay.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-icon-pai-off.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-icon-pai-off.png new file mode 100644 index 000000000000..94ad95236b7d Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-icon-pai-off.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-pai-off-overlay.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-pai-off-overlay.png new file mode 100644 index 000000000000..58e7c1817a2a Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-pai-off-overlay.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-pai-on-overlay.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-pai-on-overlay.png new file mode 100644 index 000000000000..43aa812a4f02 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-pai-on-overlay.png differ diff --git a/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-pai-searching-overlay.png b/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-pai-searching-overlay.png new file mode 100644 index 000000000000..5d2dc53b0ef4 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Fun/pai.rsi/syndicate-pai-searching-overlay.png differ