diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index c7c7521934..c35bc66387 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -18,3 +18,5 @@ ClothingHeadHatWitch1: 1 ClothingHeadHelmetCult: 1 ClothingHeadsetService: 2 + ClothingOuterPlagueSuit: 1 + ClothingMaskPlague: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index ee61cfcc17..40b91b6f74 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -199,7 +199,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatPlaguedoctor - name: plague doctor mask + name: plague doctor hat description: These were once used by plague doctors. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index ded3f0dea6..6e43f650b2 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -93,3 +93,18 @@ - type: AddAccentClothing accent: ReplacementAccent replacement: mumble + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskPlague + name: plague doctor mask + description: A bad omen + components: + - type: Sprite + sprite: Clothing/Mask/plaguedoctormask.rsi + - type: Clothing + sprite: Clothing/Mask/plaguedoctormask.rsi + - type: BreathMask + - type: IngestionBlocker + - type: DiseaseProtection + protection: 0.1 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 41f9d4d924..cc6730671c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -198,3 +198,14 @@ sprite: Clothing/OuterClothing/Misc/skubbody.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/skubbody.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterPlagueSuit + name: plague doctor suit + description: A bad omen + components: + - type: Sprite + sprite: Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK.png new file mode 100644 index 0000000000..dc2fc97139 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/icon.png b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/icon.png new file mode 100644 index 0000000000..289a4fd9ac Binary files /dev/null and b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/inhand-left.png new file mode 100644 index 0000000000..9d290b3415 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/inhand-right.png new file mode 100644 index 0000000000..1ade37bc80 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json new file mode 100644 index 0000000000..93af52132f --- /dev/null +++ b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..02055a7c39 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/icon.png new file mode 100644 index 0000000000..9790f4ea5d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/inhand-left.png new file mode 100644 index 0000000000..4e2c3d2960 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/inhand-right.png new file mode 100644 index 0000000000..9dc9d29f18 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json new file mode 100644 index 0000000000..d05cbe5af9 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file