Janitorial Bomb Suit (#22244)

* add

* add cargo purchase

* fix

* it works

* do not map

diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl
index 4eba21b79bf673fe76522a4561b9ac9b1d406b6f..2bed24a4ef6cdafb1965e72722bd600a38a279fa 100644 (file)
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl
@@ -33,3 +33,6 @@ ent-CrateJanitorBiosuit = Janitor bio suit crate
 
 ent-CrateServiceTheatre = Theatrical performances crate
     .desc = Contains a moth cloak, maid uniform, clown and mime attributes, and other performance charms.
+
+ent-CrateJanitorExplosive = Janitorial bomb suit crate
+    .desc = Supplies a bomb suit for cleaning up any explosive compounds, buy one today!

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index f010f1ef2f81cdac54e93baedccf94388bde146c..ab9e1c32351255308875e4a206651048ade6c2d1 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -146,4 +146,14 @@
   product: PetCarrier
   cost: 500
   category: Service
-  group: market
\ No newline at end of file
+  group: market
+
+- type: cargoProduct
+  id: JanitorExplosive
+  icon:
+    sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
+    state: icon
+  product: CrateJanitorExplosive
+  cost: 1000
+  category: Service
+  group: market

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 8c358923f20ece7a283feb02c2788bec30b2eb32..df789208e729c8ba000f2a66b6db579afea57039 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -242,3 +242,14 @@
           prob: 0.1
         - id: ShardGlassPlasma
           prob: 0.1
+
+- type: entity
+  id: CrateJanitorExplosive
+  parent: ClosetJanitorBomb
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterSuitJanitorBomb
+        amount: 1
+      - id: ClothingHeadHelmetJanitorBombSuit
+        amount: 1

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index e86c09de2ae632f19c6528daf261a1cd8bf5524a..512525dfb716da5311a5fa7e1efc9eb5bd791db2 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -124,3 +124,13 @@
         prob: 0.5
       - id: NettleSeeds
         prob: 0.7
+
+- type: entity
+  id: ClosetJanitorBombFilled
+  parent: ClosetJanitorBomb
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadHelmetJanitorBombSuit
+      - id: ClothingOuterSuitJanitorBomb

diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index a87f713ffaffd1c64446d5dab68b47788e158950..48aa43fa55d26aaa9329fdef2f9cb8edf497ee1c 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -111,6 +111,22 @@
         Slash: 0.95
         Piercing: 0.95
 
+#Janitorial Bombsuit Helmet
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHelmetJanitorBombSuit
+  name: janitorial bombsuit helmet
+  description: A heavy helmet designed to withstand explosions formed from reactions between chemicals.
+  suffix: DO NOT MAP
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
+  - type: IngestionBlocker
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
+
 #Cult Helmet
 - type: entity
   parent: ClothingHeadBase

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 57d100fd9a44ae248658e4b8c0f3fc20d3d10485..94f1d584eb1399be801233bbd82832c483add055 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -23,6 +23,28 @@
     - Hardsuit
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingOuterBaseLarge
+  id: ClothingOuterSuitJanitorBomb
+  name: janitorial bomb suit
+  description: A heavy helmet designed to withstand explosions formed from reactions between chemicals.
+  suffix: DO NOT MAP
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
+  - type: ExplosionResistance
+    damageCoefficient: 0.15
+  - type: GroupExamine
+  - type: Tag
+    tags:
+    - Hardsuit
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingOuterBaseLarge
   id: ClothingOuterSuitFire

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
index c8136546eed5132397e11ebf51a7fad80bf61437..d734d61832184cde70dfa8c1bcc4809b0aad8c1a 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
@@ -63,6 +63,20 @@
     stateDoorOpen: bomb_open
     stateDoorClosed: bomb_door
 
+# Janitorial bomb suit closet
+- type: entity
+  id: ClosetJanitorBomb
+  name: janitorial bomb suit closet
+  parent: ClosetBase
+  description: It's a storage unit for janitorial explosion-protective suits.
+  suffix: DO NOT MAP
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: janitor_bomb
+    stateDoorOpen: janitor_bomb_open
+    stateDoorClosed: janitor_bomb_door
+
 # Biohazard
 
 # Base level 3 bio hazard closet

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

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

diff --git a/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..dcf6038
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..2a58318
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/meta.json
new file mode 100644 (file)
index 0000000..2b96cd0
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1, edited by Ubaser",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

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

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

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

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

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/meta.json
new file mode 100644 (file)
index 0000000..c216244
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7, edited by Ubaser",
+  "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/Structures/Storage/closet.rsi/janitor_bomb.png b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb.png
new file mode 100644 (file)
index 0000000..a25fb4a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb.png differ

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_door.png b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_door.png
new file mode 100644 (file)
index 0000000..f90fd31
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_door.png differ

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_open.png b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_open.png
new file mode 100644 (file)
index 0000000..2e0e6f7
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_open.png differ

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
index 3f2a1ae2444845f01b3ab1bcf4ece991e84a0077..80c3273c6c715575c904d47d4e312fc1549be86e 100644 (file)
--- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
@@ -106,6 +106,15 @@
     {
       "name": "bomb_open"
     },
+    {
+      "name": "janitor_bomb"
+    },
+    {
+      "name": "janitor_bomb_door"
+    },
+    {
+      "name": "janitor_bomb_open"
+    },
     {
       "name": "cabinet"
     },