Craftable Clown Hardsuit (#15317)

* clownhardsuit

* clothing construction catagory

diff --git a/Resources/Audio/Effects/Emotes/attributions.yml b/Resources/Audio/Effects/Emotes/attributions.yml
index 575ad3ccae412de2d6cd83c9bc38a1c28b0b0408..899aff2acd0474658d6a1098e4543b18399fa743 100644 (file)
--- a/Resources/Audio/Effects/Emotes/attributions.yml
+++ b/Resources/Audio/Effects/Emotes/attributions.yml
@@ -13,3 +13,8 @@
   license: "CC-BY-4.0"
   copyright: "Finger Snaps Pack by Snapper4298. Converted from WAV to OGG and downmixed to 1 channel."
   source: "https://freesound.org/people/Snapper4298/packs/11176/"
+- files:
+    - parp1.ogg
+  license: "CC-BY-4.0"
+  copyright: "Made by TV_LING. Converted from WAV to OGG and downmixed to 1 channel."
+  source: "https://freesound.org/people/TV_LING/sounds/523467/"

diff --git a/Resources/Audio/Effects/Emotes/parp1.ogg b/Resources/Audio/Effects/Emotes/parp1.ogg
new file mode 100644 (file)
index 0000000..a3756ae
Binary files /dev/null and b/Resources/Audio/Effects/Emotes/parp1.ogg differ

diff --git a/Resources/Locale/en-US/construction/construction-categories.ftl b/Resources/Locale/en-US/construction/construction-categories.ftl
index 8eeec00e68af952b8d229421a278279323599998..cb31edad85de5cecb3c634fe544ad30fa75f62f8 100644 (file)
--- a/Resources/Locale/en-US/construction/construction-categories.ftl
+++ b/Resources/Locale/en-US/construction/construction-categories.ftl
@@ -9,3 +9,4 @@ construction-category-weapons = Weapons
 construction-category-tiles = Tiles
 construction-category-utilities = Utilities
 construction-category-misc = Misc
+construction-category-clothing = Clothing

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index e40bcdddcc9889fedbea1e59b6a6818312c9123a..0ae03d3f354052d5c08278eb24f385c7a58729a6 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -575,3 +575,23 @@
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
   - type: PointLight
     color: "#cbadff"
+
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSecurity
+  id: ClothingHeadHelmetHardsuitClown
+  noSpawn: true
+  name: clown hardsuit helmet
+  description: A clown hardsuit helmet.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/clown.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/clown.rsi
+    equipSound: /Audio/Mecha/mechmove03.ogg
+    unequipSound: /Audio/Effects/Emotes/parp1.ogg
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95

diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 17029b4d96d2809649d109728be53aecc0a71b23..92a42e8636498a669e273418c1b26e9bc588bca6 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -30,6 +30,9 @@
   - type: Clothing
     sprite: Clothing/Head/Helmets/cosmonaut.rsi
   - type: IngestionBlocker
+  - type: Tag
+    tags:
+    - HelmetEVA
 
 - type: entity
   parent: ClothingHeadBase
@@ -61,6 +64,9 @@
   - type: Clothing
     sprite: Clothing/Head/Helmets/eva.rsi
   - type: IngestionBlocker
+  - type: Tag
+    tags:
+    - HelmetEVA
 
 - type: entity
   parent: ClothingHeadBase
@@ -157,6 +163,9 @@
   - type: Clothing
     sprite: Clothing/Head/Helmets/syndicate.rsi
   - type: IngestionBlocker
+  - type: Tag
+    tags:
+    - HelmetEVA
 
 - type: entity
   parent: ClothingHeadBase

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index aa7cf91ae721b02b29a9e59eb918bafaefa99006..95f09f3cf55c21c0ee5f466089cbcd6e2e80cc09 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -172,7 +172,7 @@
 
 - type: entity
   parent: ClothingOuterEVASuitBase
-  id:  ClothingOuterHardsuitEVA
+  id: ClothingOuterHardsuitEVA
   name: EVA suit
   description: A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies.
   components:
@@ -180,6 +180,9 @@
     sprite: Clothing/OuterClothing/Hardsuits/eva.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Hardsuits/eva.rsi
+  - type: Tag
+    tags:
+    - HardsuitEVA
 
 # Moved to hardsuits because this is where EVA capable suits are apparently.
 # Same stats as normal EVA suit.
@@ -193,6 +196,9 @@
     sprite: Clothing/OuterClothing/Suits/syndicate.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/syndicate.rsi
+  - type: Tag
+    tags:
+    - HardsuitEVA
 
 - type: entity
   parent: ClothingOuterEVASuitBase
@@ -204,6 +210,9 @@
     sprite: Clothing/OuterClothing/Hardsuits/evaprisoner.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Hardsuits/evaprisoner.rsi
+  - type: Tag
+    tags:
+    - HardsuitEVA
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -803,3 +812,33 @@
     damageCoefficient: 0.7
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitPirateEVA
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitClown
+  name: clown hardsuit
+  description: A custom made clown hardsuit.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/clown.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/clown.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.525
+    lowPressureMultiplier: 10000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
+  - type: Construction
+    graph: ClownHardsuit
+    node: clownHardsuit
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitClown
+  - type: ClothingSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.9

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index fb8fa2f4aa350887fa0c5abcb423dc83b32ff9f2..36629afab4e14ed97417f7cbb2e147697d40b657 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -882,3 +882,6 @@
       collection: ClownRecorder
   - type: UseDelay
     delay: 30.0
+  - type: Tag
+    tags:
+    - ClownRecorder

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml
new file mode 100644 (file)
index 0000000..bd07b4c
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml
@@ -0,0 +1,49 @@
+- type: constructionGraph
+  id: ClownHardsuit
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: clownHardsuit
+          steps:
+            - material: Cloth
+              amount: 5
+              doAfter: 1
+            - tag: HardsuitEVA
+              name: EVA suit
+              icon:
+                sprite: Clothing/OuterClothing/Hardsuits/eva.rsi
+                state: icon
+              doAfter: 1
+            - tag: HelmetEVA
+              name: EVA helmet
+              icon:
+                sprite: Clothing/Head/Helmets/eva.rsi
+                state: icon
+              doAfter: 1
+            - tag: CrayonPurple
+              name: purple crayon
+              icon:
+                sprite: Objects/Fun/crayons.rsi
+                state: purple
+              doAfter: 1
+            - tag: CrayonRed
+              name: red crayon
+              icon:
+                sprite: Objects/Fun/crayons.rsi
+                state: red
+              doAfter: 1
+            - tag: CrayonYellow
+              name: yellow crayon
+              icon:
+                sprite: Objects/Fun/crayons.rsi
+                state: yellow
+              doAfter: 1
+            - tag: ClownRecorder
+              name: clown recorder
+              icon:
+                sprite: Objects/Fun/clownrecorder.rsi
+                state: icon
+              doAfter: 1
+    - node: clownHardsuit
+      entity: ClothingOuterHardsuitClown

diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml
new file mode 100644 (file)
index 0000000..796ab78
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/clothing.yml
@@ -0,0 +1,10 @@
+- type: construction
+  name: clown hardsuit
+  id: ClownHardsuit
+  graph: ClownHardsuit
+  startNode: start
+  targetNode: clownHardsuit
+  category: construction-category-clothing
+  description: A modified hardsuit fit for a clown.
+  icon: { sprite: Clothing/OuterClothing/Hardsuits/clown.rsi, state: icon }
+  objectType: Item

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 8b4550abc111e6da3badea72efca5f3d309e870e..10b18809854ab9830f6fcbab4cced134d16d6394 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -125,6 +125,15 @@
 - type: Tag
   id: CigPack
 
+- type: Tag
+  id: HardsuitEVA
+
+- type: Tag
+  id: HelmetEVA
+
+- type: Tag
+  id: ClownRecorder
+
 - type: Tag
   id: ClownRubberStamp
 

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon-flash.png
new file mode 100644 (file)
index 0000000..aadf947
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon-flash.png differ

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon.png
new file mode 100644 (file)
index 0000000..3c63606
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json
new file mode 100644 (file)
index 0000000..5a77b01
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..fb51ee1
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..6db97b2
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING.png
new file mode 100644 (file)
index 0000000..2873bc4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/icon.png
new file mode 100644 (file)
index 0000000..a72a1da
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..176a262
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..edd08b6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json
new file mode 100644 (file)
index 0000000..a9fe29a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}