Adds stair entities (with new sprites,) nukes stair decals (#20279)

* nukes stair decals, adds entity stairs

* FUCK. my furniture

* fix deprecated sprites

diff --git a/Resources/Prototypes/Decals/stairs.yml b/Resources/Prototypes/Decals/stairs.yml
index db40e6f6e913269dc24eb049c13563a6117d5529..a4c1ac7ae8e2f481583aa0071053b920d96491d0 100644 (file)
--- a/Resources/Prototypes/Decals/stairs.yml
+++ b/Resources/Prototypes/Decals/stairs.yml
@@ -1,195 +1,170 @@
+#TODO: Remove all of these when possible, apparently decals aren't possible to just remove right now without causing mapper issues.
+#Please do not make any of these into the new entity stairs unless you want to make new sprites for them.
+
 - type: decal
   id: StairsMaterialE
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: material_e
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsMaterialN
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: material_n
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsMaterialS
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: material_s
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsMaterialW
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: material_w
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsE
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_e
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsN
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_n
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsS
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_s
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsW
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_w
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsLE
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_l_e
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsLN
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_l_n
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsLS
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_l_s
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsLW
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_l_w
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsME
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_m_e
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsMN
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_m_n
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsMS
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_m_s
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsMW
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_m_w
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsRE
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_r_e
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsRN
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_r_n
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsRS
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_r_s
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsRW
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stairs_r_w
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsStoneE
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stone_e
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsStoneN
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stone_n
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsStoneS
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stone_s
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsStoneW
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: stone_w
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsWoodE
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: wood_e
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsWoodN
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: wood_n
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsWoodS
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: wood_s
+    sprite: deprecated.rsi
+    state: deprecated
 
 - type: decal
   id: StairsWoodW
-  tags: ["station", "stairs"]
   sprite:
-    sprite: Decals/stairs.rsi
-    state: wood_w
+    sprite: deprecated.rsi
+    state: deprecated
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Structures/stairs.yml b/Resources/Prototypes/Entities/Structures/stairs.yml
new file mode 100644 (file)
index 0000000..f2e1ae6
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/stairs.yml
@@ -0,0 +1,46 @@
+- type: entity
+  id: Stairs
+  name: stairs
+  description: The greatest invention since rocket-propelled grenades.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: Sprite
+    sprite: Structures/stairs.rsi
+    state: stairs
+    drawdepth: FloorTiles
+  - type: Transform
+    anchored: true
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 500
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  id: StairStage
+  parent: Stairs
+  suffix: stage
+  components:
+  - type: Sprite
+    sprite: Structures/stairs.rsi
+    state: stairs_stage
+    drawdepth: FloorTiles
\ No newline at end of file

diff --git a/Resources/Textures/Decals/stairs.rsi/material_e.png b/Resources/Textures/Decals/stairs.rsi/material_e.png
deleted file mode 100644 (file)
index 26a4446..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/material_e.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/material_n.png b/Resources/Textures/Decals/stairs.rsi/material_n.png
deleted file mode 100644 (file)
index a7bcbec..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/material_n.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/material_s.png b/Resources/Textures/Decals/stairs.rsi/material_s.png
deleted file mode 100644 (file)
index 6e6fc84..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/material_s.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/material_w.png b/Resources/Textures/Decals/stairs.rsi/material_w.png
deleted file mode 100644 (file)
index 06bc06e..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/material_w.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/meta.json b/Resources/Textures/Decals/stairs.rsi/meta.json
deleted file mode 100644 (file)
index ad134bd..0000000
--- a/Resources/Textures/Decals/stairs.rsi/meta.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/2ddbdca1b7fb5cb85cbdcd566a489cbc4794edcf/icons/obj/stairs.dmi and https://github.com/tgstation/tgstation/blob/b2dda940c5abb74d1a53d21c371788edffd0db5b/icons/turf/floors.dmi",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "material_e"
-        },
-        {
-            "name": "material_n"
-        },
-        {
-            "name": "material_s"
-        },
-        {
-            "name": "material_w"
-        },
-        {
-            "name": "stairs_e"
-        },
-        {
-            "name": "stairs_n"
-        },
-        {
-            "name": "stairs_s"
-        },
-        {
-            "name": "stairs_w"
-        },
-        {
-            "name": "stairs_l_e"
-        },
-        {
-            "name": "stairs_l_n"
-        },
-        {
-            "name": "stairs_l_s"
-        },
-        {
-            "name": "stairs_l_w"
-        },
-        {
-            "name": "stairs_m_e"
-        },
-        {
-            "name": "stairs_m_n"
-        },
-        {
-            "name": "stairs_m_s"
-        },
-        {
-            "name": "stairs_m_w"
-        },
-        {
-            "name": "stairs_r_e"
-        },
-        {
-            "name": "stairs_r_n"
-        },
-        {
-            "name": "stairs_r_s"
-        },
-        {
-            "name": "stairs_r_w"
-        },
-        {
-            "name": "stone_e"
-        },
-        {
-            "name": "stone_n"
-        },
-        {
-            "name": "stone_s"
-        },
-        {
-            "name": "stone_w"
-        },
-        {
-            "name": "wood_e"
-        },
-        {
-            "name": "wood_n"
-        },
-        {
-            "name": "wood_s"
-        },
-        {
-            "name": "wood_w"
-        }
-    ]
-}

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_e.png b/Resources/Textures/Decals/stairs.rsi/stairs_e.png
deleted file mode 100644 (file)
index e92ee5c..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_e.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_l_e.png b/Resources/Textures/Decals/stairs.rsi/stairs_l_e.png
deleted file mode 100644 (file)
index 528f496..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_l_e.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_l_n.png b/Resources/Textures/Decals/stairs.rsi/stairs_l_n.png
deleted file mode 100644 (file)
index 7842aa8..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_l_n.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_l_s.png b/Resources/Textures/Decals/stairs.rsi/stairs_l_s.png
deleted file mode 100644 (file)
index 1cbc824..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_l_s.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_l_w.png b/Resources/Textures/Decals/stairs.rsi/stairs_l_w.png
deleted file mode 100644 (file)
index 320b683..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_l_w.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_m_e.png b/Resources/Textures/Decals/stairs.rsi/stairs_m_e.png
deleted file mode 100644 (file)
index 5c20ba1..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_m_e.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_m_n.png b/Resources/Textures/Decals/stairs.rsi/stairs_m_n.png
deleted file mode 100644 (file)
index de07f2d..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_m_n.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_m_s.png b/Resources/Textures/Decals/stairs.rsi/stairs_m_s.png
deleted file mode 100644 (file)
index 3ae8f70..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_m_s.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_m_w.png b/Resources/Textures/Decals/stairs.rsi/stairs_m_w.png
deleted file mode 100644 (file)
index ff77d64..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_m_w.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_n.png b/Resources/Textures/Decals/stairs.rsi/stairs_n.png
deleted file mode 100644 (file)
index e6c1cb8..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_n.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_r_e.png b/Resources/Textures/Decals/stairs.rsi/stairs_r_e.png
deleted file mode 100644 (file)
index 3aaccb9..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_r_e.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_r_n.png b/Resources/Textures/Decals/stairs.rsi/stairs_r_n.png
deleted file mode 100644 (file)
index 53ff270..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_r_n.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_r_s.png b/Resources/Textures/Decals/stairs.rsi/stairs_r_s.png
deleted file mode 100644 (file)
index 4a7a63d..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_r_s.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_r_w.png b/Resources/Textures/Decals/stairs.rsi/stairs_r_w.png
deleted file mode 100644 (file)
index 542fcdc..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_r_w.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_s.png b/Resources/Textures/Decals/stairs.rsi/stairs_s.png
deleted file mode 100644 (file)
index 1223846..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_s.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stairs_w.png b/Resources/Textures/Decals/stairs.rsi/stairs_w.png
deleted file mode 100644 (file)
index 9b6e711..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stairs_w.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stone_e.png b/Resources/Textures/Decals/stairs.rsi/stone_e.png
deleted file mode 100644 (file)
index c9f78b2..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stone_e.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stone_n.png b/Resources/Textures/Decals/stairs.rsi/stone_n.png
deleted file mode 100644 (file)
index 7ac935d..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stone_n.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stone_s.png b/Resources/Textures/Decals/stairs.rsi/stone_s.png
deleted file mode 100644 (file)
index 3046e9e..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stone_s.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/stone_w.png b/Resources/Textures/Decals/stairs.rsi/stone_w.png
deleted file mode 100644 (file)
index 8cac12a..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/stone_w.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/wood_e.png b/Resources/Textures/Decals/stairs.rsi/wood_e.png
deleted file mode 100644 (file)
index f3d6329..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/wood_e.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/wood_n.png b/Resources/Textures/Decals/stairs.rsi/wood_n.png
deleted file mode 100644 (file)
index bcfb046..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/wood_n.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/wood_s.png b/Resources/Textures/Decals/stairs.rsi/wood_s.png
deleted file mode 100644 (file)
index db2f46e..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/wood_s.png and /dev/null differ

diff --git a/Resources/Textures/Decals/stairs.rsi/wood_w.png b/Resources/Textures/Decals/stairs.rsi/wood_w.png
deleted file mode 100644 (file)
index 7f017f5..0000000
Binary files a/Resources/Textures/Decals/stairs.rsi/wood_w.png and /dev/null differ

diff --git a/Resources/Textures/Structures/stairs.rsi/meta.json b/Resources/Textures/Structures/stairs.rsi/meta.json
new file mode 100644 (file)
index 0000000..6a0f0ee
--- /dev/null
+++ b/Resources/Textures/Structures/stairs.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+               {
+                       "name": "stairs",
+                       "directions": 4
+               },
+        {
+            "name": "stairs_stage"
+        }
+    ]
+}

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

diff --git a/Resources/Textures/Structures/stairs.rsi/stairs_stage.png b/Resources/Textures/Structures/stairs.rsi/stairs_stage.png
new file mode 100644 (file)
index 0000000..90d2c76
Binary files /dev/null and b/Resources/Textures/Structures/stairs.rsi/stairs_stage.png differ

diff --git a/Resources/Textures/deprecated.rsi/deprecated.png b/Resources/Textures/deprecated.rsi/deprecated.png
new file mode 100644 (file)
index 0000000..3a336c1
Binary files /dev/null and b/Resources/Textures/deprecated.rsi/deprecated.png differ

diff --git a/Resources/Textures/deprecated.rsi/meta.json b/Resources/Textures/deprecated.rsi/meta.json
new file mode 100644 (file)
index 0000000..74f824a
--- /dev/null
+++ b/Resources/Textures/deprecated.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Made by Flareguy for Space Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "deprecated"
+        }
+    ]
+}
\ No newline at end of file