From d7afa3387b5d66b2c9513cb90890932491ae34db Mon Sep 17 00:00:00 2001
From: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Date: Mon, 18 Dec 2023 23:21:12 -0500
Subject: [PATCH] Adds janitorial service lights (#22732)

* 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
---
 .../Entities/Objects/Power/lights.yml         |  13 +++++
 .../Structures/Wallmounts/service_light.yml   |  25 +++++++++
 .../Wallmounts/service_light.rsi/broken.png   | Bin 0 -> 783 bytes
 .../Wallmounts/service_light.rsi/burned.png   | Bin 0 -> 794 bytes
 .../Wallmounts/service_light.rsi/empty.png    | Bin 0 -> 701 bytes
 .../Wallmounts/service_light.rsi/meta.json    |  49 ++++++++++++++++++
 .../Wallmounts/service_light.rsi/off.png      | Bin 0 -> 765 bytes
 .../Wallmounts/service_light.rsi/on.png       | Bin 0 -> 1173 bytes
 8 files changed, 87 insertions(+)
 create mode 100644 Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
 create mode 100644 Resources/Textures/Structures/Wallmounts/service_light.rsi/broken.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/service_light.rsi/burned.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/service_light.rsi/empty.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/service_light.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Wallmounts/service_light.rsi/off.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/service_light.rsi/on.png

diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index 361ee1e8082c5d..e399c662626c32 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -136,6 +136,19 @@
     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
index 00000000000000..80b92b94fdb9b6
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
@@ -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
index 0000000000000000000000000000000000000000..ea789b219153b36e17f19c7d0ac67ac850413a8d
GIT binary patch
literal 783
zcmV+q1MvKbP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008kNkl<Zc%1E;
zKX2MV7{(umfDl<2fFYHb*nt5F$QQ^LC=yXcv!q*xHu)Is*d^U6HIb5~9V+n!3P=o1
zcP2~8U^=j1A^zw(z+H{8&6xoH)AuKxFy>_6J$LrK@53pOAYUjlnR-tAe)y$4_Zqw4
zP^MBW9tQxVGa0Fi_BCzu7VVh>nM&PGTZvXj0Dz-J0zbZg!%-q(SpXnf9iiK4D;Jk1
zIDcEl#pTKFdhkr71Ta&ppW*KIM!No+mmhpN{Q(yOBzxJV?@l62T5)k4jYT$W+J2B0
zfSo?AoZ}*xg-A7~;@Hol54aHE&ll(SrBMW4*YBMNHhc&0&hpP!ug|yFqCF!$LZxzr
zxmgCgown~sACQa#I6+$934$O9f*=TjAe;z9#s<u@Q8)Evvr$*spx5lemEOn@@e&zV
z+6{pd0C4Y0JK=i)uJ5lHuxzvf&LWuWI^k;pc;^9YQ`XLvR+`7s_wcm<lkrR(^M9u7
zFp4n9snYlGtpLW+H?vJw+P86l)w=I?8I*|yd>aRhN2^o*QI((C1VIo4Awj-SWTkS2
zIRzeJq*Si3e4)rh955Nr@agM27L7#$v9Vzt=0Gadm_lhDi!gc8nx7Y;a5NSX`+34L
z8`7DKC_F(*_OeL!vLdP!GawA3ZiSsmGSqbd1_7$?=et2CtvFJR=}P(;lpP;t?rv{T
ztDo8aeh4g*jNal*20#-?8}g1I?+oFdft?8A9k4Br&5t;_M?!#Yd2D{g&OJIXSNI<=
z_H)S*3Zn??+#@AlD6$vX?9%hjE7$6080vbU_Wg1AzDB2I@KIHrJ;5-{hM}%o7S75`
zFbvyYIekqNg`Ga3uW1<MR19*eSlTTg0V6?u1lCb1SJ-$o`WFcrr$rbs=Qp1}{sgdi
z1dLMyfS4}4gaMxGOvbaNKU{<#;8nxC;QIcGaX-N8wh#nC5ClPZ#$V?SK|mbwY2p9?
N002ovPDHLkV1k>5V#)vj

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..c7eeb48e1b89f83a6a5dd157cc504135a689c4d8
GIT binary patch
literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008vNkl<Zc%1E<
zJ#X4j6oy|%Nn}2T4B#P^$imPK7$PM|StI5QNT7<gf1yLSF74JKf1y%`q{`G*s)V{$
z0wjjCJ4-Ev!E|7V9Tbq<!CcqhToWL+dmhOGn=9M*)$#SY?>z|Mpj58tJne$`_48VI
z=sDKGHcz8nQ3L?wC5h{#BSl&MjyB8|PosXXE9_J!0Dw$7jc;E*Ba=>hZUC@TouJ?A
z3MZ!rI5|B)?d<9LdhkHF1aMMsG;wu#v9Mhxn_A}d8--hdy+OgYA0)!GBbwhc*%Z{<
zyCrXL{csDQ*M_cROa!M8xz^0KALU5k9+?l1j`h4Gna?@H+WC5;302cDQWW%i-AIo5
zPL>)2Sf|<Nv*#~XcSjp0bOi7arwHK60~m37zY_#O5ClOG1VIE5iy0eW%tphs=bep)
znhicS>u{x)GDIE|9#=XHu@eB`ccpoVtN?G`ztq_VxQ*5z5u9y<h^zokEB(($_i*Ls
zN(=3M?(0NW0OxuFTbc61D#ExZb6+R20x-N5RaWUrM>Y@edhdsQ4f5myk<A0{C+?8H
zk@-WLAP9mW79*6(6@6C}%{m_S_70hB3h!Qjh-{9q3J#Bs_4~=>Umn0Rt|(V?gu$6e
z<ytcc?R_&%o_37mwnQi?ooCoG$F}id);dW>Vr2?&{`ONML*CCMQ8f*KB?79ijB3zn
zM?|hQb4@?vQt{#B>hc2hM$`BAZD1ZMgZU8&KpV(gq9@LkA<Q%I6TzGgugYVKB0=tv
zDZr{cwy5Ig9&I@r{0~_BX>){<D8eH5NGO#n`jbMz_Pn#kajg7g_*J$tR87N;EC+jn
zNr(nj(>ynZYY<FA`72|jDCVZuh8QUd#zh(9qHMm}Js$xpaeV|9;hqdx!Xk;V6(+!#
z`2G0)8^Amh94U&q@US;1K(7rwS7MTYbDhELW#^pztLqy0y3u>u7|iP+2!bF8f*=6=
Y1x8gpG4FDFfB*mh07*qoM6N<$g7!9RfB*mh

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..bcdc0ee0ff716a615d49e130c292a0743eec9b52
GIT binary patch
literal 701
zcmV;u0z&<XP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007nNkl<Zc%1E;
zv2NNx7{~ucX=Irt19(U!CU#(mNO*!g0TQSpeTF<pA0k5{Wom~?JOQoMq3zCODH%)$
z7AzEyu7h)~jm`NC4!twqPdXvYak~5a^WArUp8*M4?GBTvC*t?7pT@pzyagvRl}=3)
z08qDWsYYj>w|kEcjPzaU-FDd7w1KK+;ql=f{lPG`-op1WZ@QR#3hub$IIP?4DtY$-
zpt8%K`hy`JAMT~<syuighX7~OM(n#tgw@2{uU7{|S^#$aoVdnC*c75RTJPVp10gNI
zpF8n<85JR`u1f4Q2k^o2&kr{ri|f&Wk)EI~F0WXgW$?%MZ%R*ooLsT0)A~*j1VIo4
zK@bEXLW><65bQ?t)R*0j>f>DCZCvS{43Ymy)w1yQ%V$(AE4AcBI{|=vu5=dK2(W3i
zibTj`%4#D(n$fz=l{Uub((P&^z`Nd3_<K}@dDE3{S7`wp$4OoKigcxw%>&Zb{k+Sd
zOfH~o9`LeEhWwK&AKC;#5CoBp(Q0?tscCBSHn%7)F0a_ja``V0Q2j7dUN#e{+Gq`9
zd>*FBt4VM@6rfCl=fpC{aqtnIb+UuRO4&@XD7Kj-3*QG2iGbd1a2j+qF;N?>6WdQ+
z=Lpf6M&MO|x@`l~*DE%FF;I_0kIpAUxM#3Ugm61tl*gtbBKIg1peT<`RkpcDmCXvr
zKy;ijN2rV<WVuI1tKDJm8;#iW&MWr^Lo9q>t8;%Gey&lp3_iK8*b^*6G%S2SwQv%X
zU>T0Ta%P?v7IyuNndf2NbTMzb;nJS^2t?8K5y&F38H$F*F;M{!3k?8axbRXoqVF4y
j-VY!Mf*=TjI9mP!1mG&$W^r=M00000NkvXXu0mjfbCp8v

literal 0
HcmV?d00001

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
index 00000000000000..cf91d5d1a5289f
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/service_light.rsi/meta.json
@@ -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
index 0000000000000000000000000000000000000000..d54b01d159505f362f614420848178478165ca0a
GIT binary patch
literal 765
zcmV<Z0s{SsP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008SNkl<Zc%1E<
zF>l&H6vzKg1G31H0X(D<6FV?OBIFD31&Rc!XqI&A()44r{Q&LOA(7IhtyGCGP(Wfx
zyE9n|gXzG6g@DQ(;I78T=4_0y-S?9$8*?&ue?8y5_wFG<fMTg^h_rL#*UtxO*Jtd5
zW06K_Sq1>)6h-KvBTe()qmVfgY1Hp^rBrna0658H@cru-oMbW^4**D2r|9>(()G<H
zu3lAeeRH|L5$uSN09NXaChqTUgYL^g5EkHckYD@kCc?ZU^XpXliO;TugRlTbZD_m4
zM6e2xZ7p{1Sx5-a%;%L0Bc~|*J!hB)UvD%q(RGY84gFp>lC!=QUvmH(G&?_kaTQ#T
zLdLTNh!7_W5b^^Uaa!LAf*=TjAP9mW+=xZQ1}vjdFYQI6QBTp}q1i`P+E+s4kcecZ
zy%0MAfMB!Ikrm*>=QjpB0DGd<O$0AV*~kiD<@YE1bmf$lmfB~+&yBPI^VuJM&32}o
zFpDrQsKUPyX#t!FGAkWfKVZ|k?{ygz@dYC52h65+lYdmjO`9MHf*`gd6-#9!Ez7n#
zo|n(wM%G6Ng7eCSF`G{R`2o!BjCx6nC{{-*+gd<spK&*N-dWz~0wiVNX4X8%_VUDQ
zos^|x#RW*J$vY)UCb|y5WC7LJ%WBYhM@F`_u!Wy-srayRe|L*|qv`nlF|aa~!Rn3z
zpbg|q))VK-5SBA=5`l-qLFL$@h+FoE3y_q`PbZwRM@QBM{{!Z6u4ROhD8jbvkyI>|
zji>qi+WXEL$FcI0;Z)hmnCLnlRn<Kwm;`H>==#QkVVeY#Q2xpoX&OI_+7Kg6!?>Vg
zTu}MazVQ_>6W3Q@8@6D`Y!*p`?JzMuzWV`S<q3{7jc+`h4)QQ+!;L#JNx;0>0+?cf
v&U^N+t_R>-sC^2RBu2diK@bE%5We^e=(jB9Byc6k00000NkvXXu0mjfWO!%u

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..3e52be44ec2c568bc9b74a9cb53962ea9e87ab41
GIT binary patch
literal 1173
zcmV;G1Zw+<P)<h;3K|Lk000e1NJLTq004jh002M;1^@s6($;@}000DBNkl<Zc%1E=
zF;Ck-6vzK=fkt7;02!#7iIy>dh?Ky{!WSqKsG=-XVrYlbC7*z$t-2w#s)QIoqDxz;
zQid{gC_w^284*m8U`QCU5T!un4#`;;<Ak$w=X1>aNv8zolE2Y=KA+#cdj<qZ4v&~3
z{aW$)Ao*m>SUvXgT^ag^e-4axe<O@^iFE3TL;wK&@wm{BmWoBE!-+j}9$uV4l0M<U
zJ&{hkJ9(pfyb1v5jYjd~+gJ2PqmB&#y2q<n$qy~B<cIL#*CVXthX7y_H79uN_9VUN
z@9yM{g{2A1zf5CcX~M1Kok7R}>`c$hVsm3%_PKP7ewYw;fY?c*;qO*PxY~|b?;rF;
zJ)W8z{qCOoQuM=$umhM=XE%;9BiIemH+KyHh+))f?cznBxE-NMAOM`Nb)mn-9BgxA
z9n&+jR$nY)tBifV%NBrw*Czqj`T$-$eM>X{TktdoU{@S_efE6bsapXxqqFAO_#X8M
z0feuRR61k2c?{d#$s7EPzg^>d(QilZt{{910Ng)c%evyd>JtP(5ClOG1VIo4K@bE%
z5ClQob!f#*kW@P3Dl=L3YNRTCSF3?{38$rO-C4;h^gShngq^za6Rh#hAd;1=650CX
z05&+|PjamxBUN`+vP^w)01n>xF^pze12Ab%G;L)B8A+)hzq~P7bNWqL`ZNb<f-Rxd
zF)5Wd0!v5*03$ab{d`pE(+JRlzn2y3J=>Yo4E|~?4;G~8UtRuFu1^l&0o_^2GW97A
zV1vyA7Bfdb?Vq`Q3~MJA;Pl+DLZ9XUHpYzA<2`d8m(`m??rA~J&@O^*eS#neBJ^03
z1bg8I*}Hm(U}69b5ilNUn>mT#V%TEeJW_Y`62Zhs4v&~UkqE2f1E5yep^W`y_}~Og
z-(JTj?0frD>5O?<t!k@Y#`LW?01JD{D(T`D7WNEFNf&z{r*G~WMsC0g(_U={L*H@$
zU500b#qc~0k-J>&#j14_S0C6B(dQ$9%j`{kCCt}3Kv;+TW=R?sm5SqWzx6E#c(rtx
z1!@(x`sS{2zSflmfK)mIKz@#!o$=STYM`8c!{?n^@q@2j6h!?lpgvTb)Q`jg<j}D8
zthzFXZhe)oHG5r7aGSoh9IPwHEhzdb333XV<p8=XZ|c@pO|zPYy7lkbJLp2UzMts+
zKY9Izj3C`c(5<h6pl1&m$>9<6VIt9RzvUARFDezKb@z1ZtAf=vZ1os+S|})s1d8gn
z%n8(eHR{%v!9}Iw*n*;eV-gtDp{f%p6^m9gr_N9+7EvB7pgdUc<<V9|-|-f}qvICf
zr@m^Mt+p;^j<SJT4DxeWazeMh3hX<L?3+#egzYe5e0ujAKs^#zDi*Dc2eFd`%&D^*
zp;(pZ*7p;BvxyG)%_ac17O?%E4MhjQcVEvb5c+-*v{l!Rysvf=LC?4%2k?O)=UkEl
n_ylEL69hpJ1VIo45e)tV;^?ecqhAX=00000NkvXXu0mjf4|FG0

literal 0
HcmV?d00001