From be3caccd253d8b06f72ffa92e15e184cee5048e0 Mon Sep 17 00:00:00 2001
From: TTTomaTTT <terorgo2018@gmail.com>
Date: Thu, 12 Dec 2024 15:03:35 +0700
Subject: [PATCH] Xmas lamp

---
 .../Entities/Objects/Misc/fluff_lights.yml    |  12 +++++---
 .../Misc/Lights/lamp.rsi/christmaslamp-on.png | Bin 0 -> 915 bytes
 .../Misc/Lights/lamp.rsi/christmaslamp.png    | Bin 0 -> 970 bytes
 .../Objects/Misc/Lights/lamp.rsi/meta.json    |  26 ++++++++++++++++++
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Textures/SS220/Objects/Misc/Lights/lamp.rsi/christmaslamp-on.png
 create mode 100644 Resources/Textures/SS220/Objects/Misc/Lights/lamp.rsi/christmaslamp.png
 create mode 100644 Resources/Textures/SS220/Objects/Misc/Lights/lamp.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index 4092a5c9dfa4ad..340478c697d066 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -78,9 +78,13 @@
     visuals:
       enum.HolidayVisuals.Holiday:
         base:
-          festive: { state: christmaslamp }
+          festive:
+            sprite: SS220/Objects/Misc/Lights/lamp.rsi #SS220 Xmas resprite
+            state: christmaslamp
         light:
-          festive: { state: christmaslamp-on }
+          festive:
+            sprite: SS220/Objects/Misc/Lights/lamp.rsi #SS220 Xmas resprite
+            state: christmaslamp-on
 
 - type: entity
   name: banana lamp
@@ -124,11 +128,11 @@
       enum.HolidayVisuals.Holiday:
         base:
           festive:
-            sprite: Objects/Misc/Lights/lamp.rsi
+            sprite: SS220/Objects/Misc/Lights/lamp.rsi #SS220 Xmas resprite
             state: christmaslamp
         light:
           festive:
-            sprite: Objects/Misc/Lights/lamp.rsi
+            sprite: SS220/Objects/Misc/Lights/lamp.rsi #SS220 Xmas resprite
             state: christmaslamp-on
 
 - type: entity
diff --git a/Resources/Textures/SS220/Objects/Misc/Lights/lamp.rsi/christmaslamp-on.png b/Resources/Textures/SS220/Objects/Misc/Lights/lamp.rsi/christmaslamp-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd0507f250ccf1a6b1428b7b227bb3213d0caae5
GIT binary patch
literal 915
zcmV;E18n?>P)<h;3K|Lk000e1NJLTq004jh001Be1^@s6+9Gfz00001b5ch_0Itp)
z=>Px&O-V#SRCt{2n9WWTQ5c4w!*5cNNkcJF14`l_OaT*(iHpj@4NI@UO)tTlaMK$w
z=?!=R#;xg2aX~2<EXIHdELt)d1QI|vF3!x9P6-w~?U?vI$t07`&wJjPuits+fFKC}
zFUr=9^eYB|egIWq*VcV6pq~N;0Idr63Fs&7zYpjQ^bgv-&Po9U=0}1JU|SW~Y&xgJ
zP_TQXa_tYWP5l($09Sz%z*hxoF?|Q)_fX~7x2&JE|2|+e*Z^v(z*bCuFxWj-Ievw|
z_gET3KgN97Tc-@9W8yb}iC`N!H5gkAU|#-ey-F3h64MVK&NaZ%B~q64llI?>@we!2
zvPh#4LjCK&{a_o_CHlf+wh90MZyhS@fcY1mChe_J2FjQR)o)W5(7;K(3Jc!=IF22^
zQeUA8tYQjfz_LD&sDA+bO<3DJQ-9RoU=gC?=nW58DS%+k+fLsin|sETD)1$C%1LDj
zyfqtYXX^WapSjD#{5<2Tz>nA|#|xjJzGB9LDHxmjN&7zlYR(O2A3bJT6{y7Z*S><k
zamKZs8B!~{#3ZKRJe6ynAG@SKhN=8Lm21uiUD8k5e>Tvssazu;T&@80a+G*cZr2kp
zdO1q`D7Wj0{~z!lC4Q9qSAp{41z^lKC0>-<y^1z3zbWyf-0uCOllR|}_)+fGIai!Z
z-=9xuAxgY>Ly+Fhf@x_*-Dq=p)v-1gC4TC|klC34)6$E&(dP52V{JZZ|54({Pl2;P
z3#O$Pb)(Ja6>Sy8<wKx11Rp98B+jB{@=b}Aj~*3Zq^P6sUfXEkg!(YNTYw<(7d2zA
z-?Q<d&Ue5mYMc(~8<O*H@Kdl*J*}U8`<bP(Z<2mdxA&=e@d7Y&-ZtsoEH7?Pq1-U>
z_B_nOlk|BPTfofuKAD{fUfvr=xnbh(efk*YGG;7vD&QvX{{X1r?9cN2<}}I;6MxTx
zJ1}#>vcJp}KrrXUTb%bK%}lVr4IEwS-tFnvprys{&1JZYdHFwq!w%{v?SBheT6}HB
zVK&^SbuHxVTiG1fskV2NS9X^>+tiPid-KZfa&MdZN&AnMd-JNX+$#uzAP9mW2!bF8
pf*=TjAP9mW2!bF8f*|}y{0463P&F)Lw(S4_002ovPDHLkV1kq2w-NvV

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Objects/Misc/Lights/lamp.rsi/christmaslamp.png b/Resources/Textures/SS220/Objects/Misc/Lights/lamp.rsi/christmaslamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce92a64eee1b23ebb3b331beb18f5cef20154377
GIT binary patch
literal 970
zcmV;*12z1KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&gh@m}R9J=Wluu|JRUF4ZtI-^$yR##cSyz_gvb71_C>1XSiCCj}ustkVN=kbw
z6cKt@y0Aj2EqiK<#Zy6oM5Lt>5NT2`N|ywoc+i@ZWHD*7449B*moOwO3tdQj9@00?
z%+CJPc+2-P%x~VC&-eG|J=oKpc2P@5_KDHH{i2&a&+Mjwsp1Pv1^UROb0VeaBBkge
zlg<f%(aU{eX-VnIT-VB^b3)TJF&0jUv2a3ImL)995}Kxoks(8jUhez<45Sp@hGj!B
zkqyOM22zUd3*VI%q!e8oe@>-nuJF_SX-1!|v3>R&MRSE~FTb`Mh}O!ab7Cx<5ZO@7
zm8qs_c1xO7;NNRuLvU$AWYRfdS(eC#VnWk28<J9VkqyP{d62`{RxiFaBnD0$ZCI=f
z^t)r1CPehTw2)b9nkKXlPm6umQv!CX^6SG#!m_NE@PMBIfNG^eZDBFsj8`ia06Q*w
z|7!kw#&1vXWpsuQjx8{L=#PLj0r2@3pEYor8jzU=4TEs3hlM*+0T~Y(2GT_C<|L&b
z#yRx$H!S{DXZ!3qqQ_2hVYt63tYZTbzOlO1U?O*O(q5a;6@D2y!sG2HTsKV$rA><K
zwXRI~E_7xq&0NjiqPSiop)2+?8C5BiHUW6&ph3A>w@m;Y8EJYCIN<=FUOVFpPexT6
z?o>ioxRGBJ1E-D(IaeK50R9;|Z#%ALZ;_0uM1s98Xe8JRU{~Se^CR{???88Cz<KPP
z?RflS-nFh=t=n*^gYOR$j`gte`x>w_u+7@h_9|`#2O8k8)4q+>ErN!@?9ad1?dZyY
zoc30kJD*OKX6C3?DpV^KBEepgQI&+Q_;P&9awESe<e)h-^p;!p+qq5}@>Zr?t@DZz
zY~c0y8F0cS)UVe&@A4?Bp12#{Ouh!38zo#qyr!Jz-mhYSYfVQ6oImtJCg*BT`>ERT
zN4LL)(<4uJs~*#|yd8aq@WOC^ptxS6P}+1sit9D*Ub%?;Cg08FdHeh1+?vaDyQ{hF
zRhfvtAzq5bi60mQ;KB4g-hBHw=JGtV!&^k+y_C&5hx0we4-E2P`W~Nrbq9dES1z))
zYEm>GHs!RO0YGkUIK!zECn>4lG5GHDa34}9K4NyJV1t3SaOj`{UO6jr`1K_F;}QNe
s%goLcFqh{$g8nB1P7_{r3*QsK-yMh_&>toF0RR9107*qoM6N<$f?5{PyZ`_I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Objects/Misc/Lights/lamp.rsi/meta.json b/Resources/Textures/SS220/Objects/Misc/Lights/lamp.rsi/meta.json
new file mode 100644
index 00000000000000..f6a3bd3fee91f2
--- /dev/null
+++ b/Resources/Textures/SS220/Objects/Misc/Lights/lamp.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+    "copyright": "Made by TTTomaTTT for SS220 ",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+    {
+      "name": "christmaslamp"
+    },
+    {
+      "name": "christmaslamp-on",
+      "delays": [
+        [
+            0.175,
+            0.175,
+            0.175,
+            0.175
+        ]
+    ]
+    }
+]
+}
+