Textures to make lamps mappable to East/West. (#9414)

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2022-07-07 13:47:05 -05:00 · 2022-07-07 13:47:05 -05:00 · ad46c4669a
parent 1856ea22ef
commit ad46c4669a
18 changed files with 42 additions and 7 deletions
--- a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
@ -10,7 +10,7 @@
  - type: InteractionOutline
  - type: Sprite
    sprite: Structures/Furniture/sink.rsi
-    state: sink
+    state: sink_stem
    netsync: false
  - type: SolutionContainerManager
    solutions:
@ -42,3 +42,28 @@
    sprite: Structures/Furniture/sink.rsi
    state: sink_wide
    netsync: false
+    
+#Stemless Sink
+
+- type: entity
+  name: sink
+  id: SinkStemless
+  parent: SinkEmpty
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/sink.rsi
+    state: sink
+    netsync: false    
+
+- type: entity
+  name: sink
+  id: SinkStemlessWater
+  parent: SinkStemless
+  suffix: Water
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: Water
+          Quantity: 500
--- a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png
+++ b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png
--- a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png
+++ b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png
--- a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
@ -8,10 +8,12 @@
  },
  "states": [
    {
-      "name": "lamp"
+        "name": "lamp",
+        "directions": 4
    },
    {
-      "name": "lamp-on"
+        "name": "lamp-on",
+        "directions": 4
    },
    {
      "name": "off-inhand-left",
--- a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen-on.png
+++ b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen-on.png
--- a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen.png
+++ b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/lampgreen.png
--- a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
@ -8,10 +8,12 @@
  },
  "states": [
    {
-      "name": "lampgreen"
+        "name": "lampgreen",
+        "directions": 4
    },
    {
-      "name": "lampgreen-on"
+        "name": "lampgreen-on",
+        "directions": 4
    },
    {
      "name": "off-inhand-left",
--- a/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp.png
+++ b/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp.png
--- a/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp_on.png
+++ b/Resources/Textures/Objects/Misc/Lights/lights.rsi/bananalamp_on.png
--- a/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
@ -8,10 +8,12 @@
  },
  "states": [
    {
-      "name": "bananalamp"
+        "name": "bananalamp",
+        "directions": 4
    },
    {
-      "name": "bananalamp_on"
+        "name": "bananalamp_on",
+        "directions": 4
    },
    {
      "name": "floodlight"
--- a/Resources/Textures/Structures/Furniture/sink.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/sink.rsi/meta.json
@ -14,6 +14,10 @@
        {
            "name": "sink_wide",
            "directions": 4
+        },
+        {
+            "name": "sink_stem",
+            "directions": 4
        }
    ]
 }
--- a/Resources/Textures/Structures/Furniture/sink.rsi/sink.png
+++ b/Resources/Textures/Structures/Furniture/sink.rsi/sink.png
--- a/Resources/Textures/Structures/Furniture/sink.rsi/sink_stem.png
+++ b/Resources/Textures/Structures/Furniture/sink.rsi/sink_stem.png
--- a/Resources/Textures/Structures/Furniture/sink.rsi/sink_wide.png
+++ b/Resources/Textures/Structures/Furniture/sink.rsi/sink_wide.png
--- a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png
+++ b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png
--- a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png
+++ b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png
--- a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png
+++ b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png
--- a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png
+++ b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png