From bed5fca35ea4ce2e88e5b5f4bf872173ddf95872 Mon Sep 17 00:00:00 2001 From: SonicHDC <100022571+SonicHDC@users.noreply.github.com> Date: Sat, 21 Dec 2024 15:59:39 +1200 Subject: [PATCH 1/5] Sprites --- .../Misc/Lights/lamp.rsi/christmaslamp-on.png | Bin 186 -> 944 bytes .../Misc/Lights/lamp.rsi/christmaslamp.png | Bin 697 -> 1444 bytes .../Lights/lampgreen.rsi/christmaslamp-on.png | Bin 0 -> 450 bytes .../Lights/lampgreen.rsi/christmaslamp.png | Bin 0 -> 1281 bytes .../Objects/Misc/Lights/lampint.rsi/burnt.png | Bin 2499 -> 1699 bytes .../Misc/Lights/lampint.rsi/flashing.png | Bin 4023 -> 1115 bytes .../Misc/Lights/lampint.rsi/lamp-int-on.png | Bin 1629 -> 620 bytes .../Misc/Lights/lampint.rsi/lamp-int.png | Bin 2444 -> 1702 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/christmaslamp-on.png create mode 100644 Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/christmaslamp.png diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/christmaslamp-on.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/christmaslamp-on.png index df2434f83de4c6dbeb6dacde99748956938c8686..a33f5d0e9cd7645cdb08f4c14a85943f51f72ca2 100644 GIT binary patch literal 944 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/christmaslamp.png b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/christmaslamp.png new file mode 100644 index 0000000000000000000000000000000000000000..3e88f566a1d56d69fc98cb82401b073098f9ad80 GIT binary patch literal 1281 zcmV+c1^)VpP)4iHT@qNF!(j&->5izfOj`+nK$2Czu^bW@m2p{oefd&D`F;6=|T9uB|TN zuK^Pcof?DRlEs5$(px(#r@t9Bb<5c=ne2u75R<kh>6!z^7j0rV4ERI*nIF7-CHWFE-yAFvhahP z1$^e+pnwA^1TEAoZ;=R zJsZB`)+c$schYp>TOyVSHh)X8gZBVFrNxt1Onh_yw0T^PHXVyF z$C@T=KG^U9?5zBt2mqW$- zbqK>|WQUocvDrwD;8mGWzPAAN!jD%@a~Wvyy#>G|83FVD{Qx`kc=b_d4MW>Ttz(LB zFF$)MeF|NMUJ+0){M>w<#xkhIci9jmlm&+$38BpaQgr6!vlA3nj%LA7i zPZb}Mwb*EioP77rlgw&9U~k~NLTUU|0RW;Cg!svJVLC*s;^7Fov$2bkXcLXp6p1&VZz7qNS0kbbkxZ&HZ r{Cxg?fUA7o&K1ZN$Q8&H$fm#_l`y^I(p2+P00000NkvXXu0mjfe1>dB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/burnt.png b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/burnt.png index 8814243e0f0855589906b01b0d3af45c573d887d..2da23ef1c569126d20c22dc05b7e760499d50a1d 100644 GIT binary patch literal 1699 zcmV;U23+}xP)B?}m6T%whp#{PObc71bcdT!gB|Y7#?W-c*B=bV+Vc;rs5r$Jap& zMDRp|nzP<1jy}vY5q2mH| zs7p{=YFlw#6L9puiScmvHUuxOE8j>=>n@cT@2s_LN>Wb4g)}ZqC^6nw41a6yt@<9d z^GI7qPz}#TB)otC|E4;P0#H!~XZgq-4y+sC$*L}C&-e)@Cc-cwbj=rWy{^1gB-}d=V3rt9JIMmriN%Uw$yjoI z&KDZj!jj0!$Hu2j*s9w)2dIz;9DV9(KcnJexY`HT{&vq?`NMBYFy0a)uU=C-C9$wo z7Yy2FmIoUS*6rb#gWWj?2v{)yY>J529(vecKB}907=!=o1aB>1GUIbCHzaugYTM^; zfbfF&hw=)PZ`-h_Tvr@pgAwDBx5npSCwsuT^BeB5N2d=rxLkPfnBgy>DBo8Y5<5u% zErl{jLMU%z8Q!-0vgNzdLt`fi0Lhq06Y-SYS5w`l>qBBEFN2nxw#fFH(t)h9y~m5h z?%kNN!BK%xfl+}`fl+}`frTniv=I_x`?%Zp0f;c#;y&<`x56MQe4R}3bjrzf*GrH((TfD&8J*{HJ^9fv zWb`0Z2h`^^@ag?Ha6LC<3xN7Ml;9-R1`Z{*HrroC+4A$G)%&!;83bNX60!t{jn`o$ z1UMxogj1oxhJxH5tk~$1VUQ&NpkcxzSrM>A?0sLT=RXahhdfg7-Yx2dO>k~zi$B$7A!bm?30h&SwVdM^)D5-oDN7j z6|PW10)W@we4_${5cwS7xXsi&J&%`RJl_rQ5d}Z;T(9$twzji8KxcEjd12hkU}DV! zq=!5fQ_t(`6B&mH&P~53$Ppn+0Kg=I++HFmKcw-(o*I49_xv`HvK+Vit+l!|{iw`D29+8WmuayU-l` zWB~vV+gxuvy$=Cqe+>h@x(-J4x*d-3;d1$%cipqM-r_#_^Dnn@hLxBVmLqY;ssVJezFI|@8~U{80Es8=*zN tqhB<>?U*q=DljTADljTADsTfU@DD{Z$+$002ovPDHLkV1gVlD60Sf literal 2499 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 diff --git a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int-on.png b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int-on.png index 6182bc21373112a2af6f3703664a7be016eed373..980d0c280b198c988f78a0356fb70ad4c81df203 100644 GIT binary patch literal 620 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^4b}aSW+od^_u)*I@^NHsO!! z)+<(RbQ3&M{z1dzVD}@}uBP*WN4j6QYBagucVxL3q2INBq5p5L^?c$v+7VT^LiuFK%%Ki0@J0x12YuUtasefFXTKx0REBC}x zRzcnsJiE@Z@b&qxS-m%R-@4};^!zFr=f}srd~)C3ZtKafuGeRpv8aBW`c!r8eM_s7 zRqI`2YZ#6^E?%ROAU^9t(=vy$g)c)7tFqib`TM`@1JTmT!siS%_m;p?Y|0m0Mf6&-cxPQL&T%F6$ zrFwX-upM~yY}>6{9ZpwfEV5 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cawI7X{O1&V1SAj=$Ke?MhB0cAIltqbo6i z(R5~%cQYq__oT-6Ayio(h$b%I* zbAuAgWlLC3z09q!bq??o zF(+9{3MnQ@DQQ}ZT+yIWMU$$UW-S&h znpiS5vuq`E4p;*vr>xm>&ZV#`=%^r8fq#Leat$?Bsi|tUnrms8J}owBscEy8Tj|_G z$1>4V*KR%cGRO_A6eA89Y3Q(#N12#wGt4+;rm53rp5?CEQT0vw4b|wV##^c7r+3w0 zb*i@zw3ZWDnn5v+1jThJfCEX>4Tx0C=2zkv&MmKpe$i zTZax9<%6_Voz|AXJ%n)%5IHz^ba zf-koHF#>e%0*#t&e;?a+;{*si16NwhU#SDLpQP7XTKEX)-3BhMTbjHFTnGy0}1(02=TuerT7_i_3Fq^Yar8{ps&7%foty2rb_+I#!=OtZfq%0_a^ zyLK+u00006VoOIv07(E201iQhfl2@X010qNS#tmY3ljhU3ljkVnw%H_000McNliru z=LH!R6BRVO(j5Q*0Fp^WK~z}7?Ub)w|Gy@4_AZ4$2srN07bqpG zoeu9ngC&p-BO8n{#u#%kp+?hErU1mR)E>fEnh0ok4U9sFkVAr4pkOXKCvg-f!3NHT# bj4|d7ngcD_ST0QW00000NkvXXu0mjf8Zh1> diff --git a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int.png b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/lamp-int.png index c7be36ac95f2aa11305b5b6c40d0a1455fed4ed1..59a435608b8b5abead9d1009aeff6248c7a3b6f0 100644 GIT binary patch literal 1702 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 KMNUMnLSTaLsCdr+ From 85d228a8efda63b572b594b0b8cc71f346ce675b Mon Sep 17 00:00:00 2001 From: SonicHDC <100022571+SonicHDC@users.noreply.github.com> Date: Sat, 21 Dec 2024 16:09:03 +1200 Subject: [PATCH 2/5] Update fluff_lights.yml --- .../Prototypes/Entities/Objects/Misc/fluff_lights.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index 0219718996b..1505a7aaac7 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -123,13 +123,13 @@ enum.HolidayVisuals.Holiday: base: festive: - sprite: Objects/Misc/Lights/lamp.rsi state: christmaslamp light: festive: - sprite: Objects/Misc/Lights/lamp.rsi state: christmaslamp-on - - type: Rotatable # Corvax-Resprite + - type: Rotatable # Corvax-Resprite-start + - type: PointLight + color: "#F0FFA0FF" # Corvax-Resprite-end - type: entity name: interrogator lamp @@ -184,6 +184,7 @@ enum.FlashVisuals.LightLayer: True: {visible: true} False: {visible: false} + - type: Rotatable # Corvax-Resprite - type: entity name: floodlight From 09b1514c1c4709093474b1fc4a3fa16429f3256b Mon Sep 17 00:00:00 2001 From: SonicHDC <100022571+SonicHDC@users.noreply.github.com> Date: Sat, 21 Dec 2024 16:12:44 +1200 Subject: [PATCH 3/5] Update meta.json 1 --- Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json index 2f26fd28799..2ce16355403 100644 --- a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional sprites by SonicDC#9046, christmaslamp by Alekshhh (Github)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional and christmas sprites by SonicHDC", "size": { "x": 32, "y": 32 @@ -12,10 +12,12 @@ "directions": 4 }, { - "name": "christmaslamp" + "name": "christmaslamp", + "directions": 4 }, { - "name": "christmaslamp-on" + "name": "christmaslamp-on", + "directions": 4 }, { "name": "lamp-on", From 43bec6ba8387a48c293524950c8cb1684a0fd232 Mon Sep 17 00:00:00 2001 From: SonicHDC <100022571+SonicHDC@users.noreply.github.com> Date: Sat, 21 Dec 2024 16:15:42 +1200 Subject: [PATCH 4/5] Update meta.json 2 --- .../Objects/Misc/Lights/lampgreen.rsi/meta.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json index 9ddddd542cc..460dfe311b6 100644 --- a/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional sprites by SonicDC#9046", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional and christmas sprites by SonicHDC", "size": { "x": 32, "y": 32 @@ -10,6 +10,14 @@ { "name": "lampgreen", "directions": 4 + }, + { + "name": "christmaslamp", + "directions": 4 + }, + { + "name": "christmaslamp-on", + "directions": 4 }, { "name": "lampgreen-on", From b5d916b891e76e9780b0adb740689c58529eb013 Mon Sep 17 00:00:00 2001 From: SonicHDC <100022571+SonicHDC@users.noreply.github.com> Date: Sat, 21 Dec 2024 16:21:28 +1200 Subject: [PATCH 5/5] Update meta.json 3 --- .../Objects/Misc/Lights/lampint.rsi/meta.json | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/meta.json b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/meta.json index 664d3467bf0..08330c09728 100644 --- a/Resources/Textures/Objects/Misc/Lights/lampint.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/Lights/lampint.rsi/meta.json @@ -1,30 +1,49 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "copyright": "Created by SonicHDC from lamp tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "lamp-int" + "name": "lamp-int", + "directions": 4 }, { - "name": "lamp-int-on" + "name": "lamp-int-on", + "directions": 4 }, { "name": "flashing", + "directions": 4, "delays": [ [ 0.1, + 0.2, + 0.2 + ], + [ + 0.1, + 0.2, + 0.2 + ], + [ + 0.1, + 0.2, + 0.2 + ], + [ 0.1, - 0.3 + 0.2, + 0.2 ] ] }, { - "name": "burnt" + "name": "burnt", + "directions": 4 }, { "name": "off-inhand-left",