diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 6ec796b5b0..8df1323877 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -17,6 +17,7 @@ - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack - id: ClothingOuterCoatWarden + - id: ClothingOuterWinterWarden - id: RubberStampWarden - type: entity diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index 50af199883..4775bc8fc1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -6,6 +6,7 @@ ClothingHeadHatTophat: 2 ClothingEyesGlassesBeer: 2 ClothingHeadsetService: 2 + ClothingOuterWinterBar: 2 ClothingUniformJumpsuitBartender: 2 ClothingUniformJumpskirtBartender: 2 ClothingUniformJumpsuitBartenderPurple: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index aaee016f5f..3be0c226fc 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -3,6 +3,8 @@ name: AutoDrobe spriteName: theater startingInventory: + ClothingOuterWinterClown: 1 + ClothingOuterWinterMime: 1 ClothingMaskJoy: 2 ClothingHeadHatCardborg: 2 ClothingOuterCardborg: 2 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 2f367e6f57..74aa6830ba 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -26,6 +26,16 @@ - type: Clothing sprite: Clothing/OuterClothing/WinterCoats/coatatmos.rsi +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterWinterBar + name: bartender winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coatbar.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coatbar.rsi + - type: entity parent: ClothingOuterWinterCoat id: ClothingOuterWinterCap @@ -86,6 +96,16 @@ - type: Clothing sprite: Clothing/OuterClothing/WinterCoats/coatcmo.rsi +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterWinterClown + name: clown winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coatclown.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coatclown.rsi + - type: entity parent: ClothingOuterWinterCoat id: ClothingOuterWinterEngi @@ -156,6 +176,16 @@ - type: Clothing sprite: Clothing/OuterClothing/WinterCoats/coatmed.rsi +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterWinterMime + name: mime winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coatmime.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coatmime.rsi + - type: entity parent: ClothingOuterWinterCoat id: ClothingOuterWinterMiner @@ -235,3 +265,21 @@ sprite: Clothing/OuterClothing/WinterCoats/coatviro.rsi - type: Clothing sprite: Clothing/OuterClothing/WinterCoats/coatviro.rsi + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterWinterWarden + name: warden's armored winter coat + description: A sturdy, utilitarian winter coat designed to protect a warden from any brig-bound threats and hypothermic events. + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.6 #slightly less bulletproof than wardens normal coat + Heat: 0.75 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..5ef2c082a1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/icon.png new file mode 100644 index 0000000000..9c1810330b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-left.png new file mode 100644 index 0000000000..8dc12dea19 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-right.png new file mode 100644 index 0000000000..a5633c3eea Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json new file mode 100644 index 0000000000..7863947d1c --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "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 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..2a8767b214 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/icon.png new file mode 100644 index 0000000000..d69cad4462 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/inhand-left.png new file mode 100644 index 0000000000..a34eafaae9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/inhand-right.png new file mode 100644 index 0000000000..e0b57b4317 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json new file mode 100644 index 0000000000..7863947d1c --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "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 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..74bb92031c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png new file mode 100644 index 0000000000..c3e059dfd1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png new file mode 100644 index 0000000000..27db7d78b0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png new file mode 100644 index 0000000000..855b726b35 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json new file mode 100644 index 0000000000..7863947d1c --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "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 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..28cf03f49c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png new file mode 100644 index 0000000000..eaf984f437 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png new file mode 100644 index 0000000000..df033631e9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png new file mode 100644 index 0000000000..77baaca885 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json new file mode 100644 index 0000000000..7863947d1c --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "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