]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds janitorial service lights (#22732)
authorRiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Tue, 19 Dec 2023 04:21:12 +0000 (23:21 -0500)
committerGitHub <noreply@github.com>
Tue, 19 Dec 2023 04:21:12 +0000 (21:21 -0700)
* Adds service light visuals and meta.json

* Added the rest of the needed service light sprites

* Adds service light and service light bulb entity prototypes

* Changes entity descriptions

* Removes sprites temporarily

* Adds back the sprites and modifies rotation sprites

Resources/Prototypes/Entities/Objects/Power/lights.yml
Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/service_light.rsi/broken.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/service_light.rsi/burned.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/service_light.rsi/empty.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/service_light.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/service_light.rsi/off.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/service_light.rsi/on.png [new file with mode: 0644]

index 361ee1e8082c5dd2d9bd6980e7e8f321ce7aef91..e399c662626c325458c468f9f742781fb43e3a24 100644 (file)
     startingState: Broken
     bulb: Bulb
 
+- type: entity
+  parent: BaseLightbulb
+  name: service light bulb
+  id: ServiceLightBulb
+  description: A low-brightness green lightbulb used in janitorial service lights.
+  components:
+  - type: LightBulb
+    bulb: Bulb
+    color: "#CCFF60"
+    lightEnergy: 1.0
+    lightRadius: 2
+    lightSoftness: 3
+
 - type: entity
   parent: BaseLightTube
   name: fluorescent light tube
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
new file mode 100644 (file)
index 0000000..80b92b9
--- /dev/null
@@ -0,0 +1,25 @@
+- type: entity
+  parent: Poweredlight
+  id: JanitorServiceLight
+  name: janitorial service light
+  description: A wall-mounted janitorial sign. If the light is blinking, a janitor's service is required.
+  components:
+  - type: Sprite
+    sprite: Structures/Wallmounts/service_light.rsi
+    drawdepth: WallMountedItems
+    layers:
+    - state: off
+      map: ["enum.PoweredLightLayers.Base"]
+    state: off
+  - type: PointLight
+    radius: 1
+    energy: 1
+    softness: 1
+    enabled: false
+  - type: PoweredLight
+    bulb: Bulb
+    on: false
+    hasLampOnSpawn: ServiceLightBulb
+    damage:
+      types:
+        Heat: 5
diff --git a/Resources/Textures/Structures/Wallmounts/service_light.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/service_light.rsi/broken.png
new file mode 100644 (file)
index 0000000..ea789b2
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/service_light.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/service_light.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/service_light.rsi/burned.png
new file mode 100644 (file)
index 0000000..c7eeb48
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/service_light.rsi/burned.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/service_light.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/service_light.rsi/empty.png
new file mode 100644 (file)
index 0000000..bcdc0ee
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/service_light.rsi/empty.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/service_light.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/service_light.rsi/meta.json
new file mode 100644 (file)
index 0000000..cf91d5d
--- /dev/null
@@ -0,0 +1,49 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "On, off, broken, burned, empty sprites by RiceMar1244",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "broken",
+            "directions": 4
+        },
+        {
+            "name": "burned",
+            "directions": 4
+        },
+        {
+            "name": "empty",
+            "directions": 4
+        },
+        {
+            "name": "off",
+            "directions": 4
+        },
+        {
+            "name": "on",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.5
+                ],
+                [
+                    0.1,
+                    0.5
+                ],
+                [
+                    0.1,
+                    0.5
+                ],
+                [
+                    0.1,
+                    0.5
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Wallmounts/service_light.rsi/off.png b/Resources/Textures/Structures/Wallmounts/service_light.rsi/off.png
new file mode 100644 (file)
index 0000000..d54b01d
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/service_light.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/service_light.rsi/on.png b/Resources/Textures/Structures/Wallmounts/service_light.rsi/on.png
new file mode 100644 (file)
index 0000000..3e52be4
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/service_light.rsi/on.png differ