From 754661b1f05d80e6e68050a2005d908cab0bddac Mon Sep 17 00:00:00 2001 From: dj-34 Date: Sat, 30 Sep 2023 12:58:28 +0500 Subject: [PATCH 1/2] sprites update --- modular_ss220/aesthetics/_aesthetics.dme | 1 + .../aesthetics/goonstation/code/items.dm | 66 ++++++++++++++++++ .../aesthetics/goonstation/icons/geiger.dmi | Bin 0 -> 978 bytes .../goonstation/icons/hand_tele.dmi | Bin 0 -> 659 bytes .../aesthetics/goonstation/icons/igniter.dmi | Bin 0 -> 509 bytes .../goonstation/icons/items_lefthand.dmi | Bin 0 -> 1330 bytes .../goonstation/icons/items_righthand.dmi | Bin 0 -> 1327 bytes .../aesthetics/goonstation/icons/penlight.dmi | Bin 0 -> 638 bytes 8 files changed, 67 insertions(+) create mode 100644 modular_ss220/aesthetics/goonstation/code/items.dm create mode 100644 modular_ss220/aesthetics/goonstation/icons/geiger.dmi create mode 100644 modular_ss220/aesthetics/goonstation/icons/hand_tele.dmi create mode 100644 modular_ss220/aesthetics/goonstation/icons/igniter.dmi create mode 100644 modular_ss220/aesthetics/goonstation/icons/items_lefthand.dmi create mode 100644 modular_ss220/aesthetics/goonstation/icons/items_righthand.dmi create mode 100644 modular_ss220/aesthetics/goonstation/icons/penlight.dmi diff --git a/modular_ss220/aesthetics/_aesthetics.dme b/modular_ss220/aesthetics/_aesthetics.dme index 844ab6d26152..f1e86d635cc0 100644 --- a/modular_ss220/aesthetics/_aesthetics.dme +++ b/modular_ss220/aesthetics/_aesthetics.dme @@ -15,6 +15,7 @@ #include "extinguisher\code\extinguisher.dm" #include "firealarm\code\firealarm.dm" #include "floors\code\floors.dm" +#include "goonstation\code\items.dm" #include "hydroponics\code\hydroponics.dm" #include "keycard\code\keycard.dm" #include "labeler\code\labeler.dm" diff --git a/modular_ss220/aesthetics/goonstation/code/items.dm b/modular_ss220/aesthetics/goonstation/code/items.dm new file mode 100644 index 000000000000..ffdcb4b40d4c --- /dev/null +++ b/modular_ss220/aesthetics/goonstation/code/items.dm @@ -0,0 +1,66 @@ +/* Geiger */ +#define RAD_LEVEL_NORMAL 9 +#define RAD_LEVEL_MODERATE 100 +#define RAD_LEVEL_HIGH 400 +#define RAD_LEVEL_VERY_HIGH 800 +#define RAD_LEVEL_CRITICAL 1500 + +/obj/item/geiger_counter + icon = 'modular_ss220/aesthetics/goonstation/icons/geiger.dmi' + item_state = "geiger" + lefthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_lefthand.dmi' + righthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_righthand.dmi' + +/obj/item/geiger_counter/update_icon_state() + if(!scanning) + icon_state = "geiger_off" + else if(emagged) + icon_state = "geiger_on_emag" + else + switch(radiation_count) + if(-INFINITY to RAD_LEVEL_NORMAL) + icon_state = "geiger_on_0" + if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE) + icon_state = "geiger_on_1" + if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH) + icon_state = "geiger_on_2" + if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH) + icon_state = "geiger_on_3" + if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL) + icon_state = "geiger_on_4" + if(RAD_LEVEL_CRITICAL + 1 to INFINITY) + icon_state = "geiger_on_5" + +#undef RAD_LEVEL_NORMAL +#undef RAD_LEVEL_MODERATE +#undef RAD_LEVEL_HIGH +#undef RAD_LEVEL_VERY_HIGH +#undef RAD_LEVEL_CRITICAL + +/* Igniter */ +/obj/item/assembly/igniter + icon = 'modular_ss220/aesthetics/goonstation/icons/igniter.dmi' + item_state = "igniter" + lefthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_lefthand.dmi' + righthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_righthand.dmi' + +/* Penlight */ +/obj/item/flashlight/pen + icon = 'modular_ss220/aesthetics/goonstation/icons/penlight.dmi' + item_state = "pen" + lefthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_lefthand.dmi' + righthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_righthand.dmi' + +/obj/item/flashlight/pen/update_icon_state() + . = ..() + if(on) + item_state = "[initial(item_state)]-on" + else + item_state = "[initial(item_state)]" + +/* Hand teleporter */ +/obj/item/hand_tele + icon = 'modular_ss220/aesthetics/goonstation/icons/hand_tele.dmi' + item_state = "hand_tele" + lefthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_lefthand.dmi' + righthand_file = 'modular_ss220/aesthetics/goonstation/icons/items_righthand.dmi' diff --git a/modular_ss220/aesthetics/goonstation/icons/geiger.dmi b/modular_ss220/aesthetics/goonstation/icons/geiger.dmi new file mode 100644 index 0000000000000000000000000000000000000000..20506c65f593ae1c6e615c600c2b0ec84a1e36a4 GIT binary patch literal 978 zcmeAS@N?(olHy`uVBq!ia0vp^2Y`412Q!e&{WdutNQDRZgt#6!aKOaGX=4rFhCUX* zpyb~-{co*j?OC|EI5mi;JTj?XDu_j-zF2Di$x}006AW*;E;^xiURe0VQoVbxUN4wg zzvKVvw{O?~IhXtP%KD$D1WW3r4xP|@`)vK|O+{aURxp+X`2{mLJiCzwB{eWMGKloA4=Ni^4nx2But37srr_IdA8_ExKhO;-Y)9 z?1$Iowq=}K-v6JowS}Aa#IBu>CuH}ZPi(Vaz4fC)LYlaDC@TZQgaX;k*UtNIzFKSX zIDL6|>C@TE-e%64EjanQ{HqHw>o#y|JH~VWa=Wm-Y2W3a+V5*K?k4wVAKo4sSsyk1 z>-*W8{v}6Wn_sR~FM4a6^oH`^F6IxOuUfNzP4TaPCW|iD=YFb^y7Y4WZN|HE|KwXw zwcqRdlGW~rySajK>%EsVHLti`{aTgAwe|m7$0zGTDdEe7P+8 z&wa)7rOWwG9+XvD_;Sa-Ln~jubiQC?X7Lk8Q%9_ zf9Cv`FJFHI%RY}xnP&xzP+*#xV|f1iOLn!n|Ml0)Px$n|`nCJq`1$|uNB^%4`Ds7v zfA`;p-#Y*2Cr8$weEvJ=pZ+)Icbosr)C{rOSGmvMK4I?r%lr|~e}7?q_S5b!*gysy z$k=;gwEuhH#Gkmg)8EDT`MOp2X<-uw0cnvLrs`} zk*|#`_5154eEI=$WJ4*;-7`S$2D^Df%9+o#zZyNC|3CejeaTjTv{gSoEqW)a|JedElfs6*Z8fakm6aD3T7gt!g Rom>Pm-qY33Wt~$(699sG`lbK? literal 0 HcmV?d00001 diff --git a/modular_ss220/aesthetics/goonstation/icons/hand_tele.dmi b/modular_ss220/aesthetics/goonstation/icons/hand_tele.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ad7d416fcf1acbcad0a499a7ad09db6a5a9c244f GIT binary patch literal 659 zcmV;E0&M+>P)P)t-sOlffi z9w-lp)CW6U3u&Y?I6N2~AzNEpjEsy@m6~v_vq@HBDp5FWxPEiOgl4UFcgcypy}rx< z0GR*)N@i~i4iG$6UrL6HOlfiG@B{b&0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pS zoZ^zil2jm5DI+m2CB7szCsm1yGbOXA7$|1Q#hF%=n41b>n*c>qa}p~-!a87xMQeO! zUSe`dW*H7M47rpQT>V_Y&I17bXD^L8Bb!+O00Co3L_t(oh3%Hha)cldMahFlGdfCw z^8bGt&`M>4Tx)Kz(8`(R>7lzVv93}#;|=(C^8f0ivsa&;{q;A{T6guvI%_)mGQdtR zFMdbr6|Bz%kD>55Jb?2?%P>Bt=Qz|0il3)(nj3x^=W#ml+O`{PzR_Uw%?2*7XbSZe zS+8`^Qt;OL>H(zRCJ^}&>w-O+kn!aidXaCj!PO5SeR&IFt`Kc){id*9EoLnhN$XTC zVEtaPu`XS_GSLT@e?Hc~Sgcpenq2-Kx^y%l>F=>Y3L&J%gp@B6h;vRF6H;E8Ke~AJ z`x?jf-~iI+ixSsDG)EVS^SNT#_FH=Sf6hSXe*~SL5p@1XTz&&K|0C%9k6`mZJfF?~ zxB-{{5ohxM&T9=$<$tOHoBv@0Hvhv0Z2pH0==_hM^FM;m|7SW-`5!^2X9S&|5x3ZY t%l`;E|0C%94;!%gAHnB;*x`!#{|BCHI~Dzyzf%AJ002ovPDHLkV1lmMC++|M literal 0 HcmV?d00001 diff --git a/modular_ss220/aesthetics/goonstation/icons/igniter.dmi b/modular_ss220/aesthetics/goonstation/icons/igniter.dmi new file mode 100644 index 0000000000000000000000000000000000000000..9b90afdfe5910463c9717f41e9d206f66804c221 GIT binary patch literal 509 zcmV_a#he zaS(tO#{d8T0d!JMQvg8b*k%9#0D5{PuZ zHP_@j^Er+j*HRGE`9a9!K_dXifv-#6S~ZLlb8q0Zd;%l|)>@pW8O@aIfDM|9^l|Cn zu`}Q26%XLeRp6W>;yWjRlazqGr@UYZAuN8Y2?6;SSIP=#S;z-3kGc*>@=**4LCFwB z5MxXVlsTyVgc7oUq0DenmG5*qo!_Kj8MxuK0@NA?*#O3YPxD&CWVSVc*MUlbnvXNA zdJ44f0j@!?ox%+QTIGEGVh7DbEZ74&olb%$X~7A;8SxJi00000NkvXXu0mjfPdw61 literal 0 HcmV?d00001 diff --git a/modular_ss220/aesthetics/goonstation/icons/items_lefthand.dmi b/modular_ss220/aesthetics/goonstation/icons/items_lefthand.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ed8476d9e9102bcd1a80a1fbf1e329b83ebdd922 GIT binary patch literal 1330 zcmeAS@N?(olHy`uVBq!ia0vp^3xK$RgAGXbBqvD&sotuPh!U67;^d;tf|AVqJO+k} zIlbrhavd@dX?tk-T+8lOQgA7!+L_CMY?0pa>t@ZC$^&U~1hohKF~}cbA9% zxtVm}_W`TVHxCu3r(Mf9|8{@xZS7rZH#j4rDnmaS_EcQ@wC1?@@-^>#ntS#ALTh@z zGvvqbd@-;0UU71Aa@_S=v#RrV_Z1n6^8a$4wC8xh`CU=J?f>3dCZD_g*R6c*eaEUB zo^pTv_Tk@}+R6_B2cPfae}6ver_*|{U!5{xt@Nc+b zot$f{zSn-jwt16Vliv5dPu=VNNv?aZaoCS1u1UXZ&)l!Svvv03ex=yp2mO;499f^J zfW@CUypLNrxyy)~KU*-tCot_{;#v>JbN~KVzS{pbKmCg8*6_!lF1vg`GuwmFOwXRT zRQ}$TxtSg%>pvdVjLx!~b7NlRniUs`)w_S~6Ww|1?M?=3i+Y5aTZTI;|6_gfg%GNmc*GgmsAp7!n8=h((~ z>ZU*;rQcwJLZ_a}ZTQTuR%ClgN%xW6^F`~W17F{&I%{g8yZ86^b@P3< z>%Q1uT30ViJd^j?v5Wb)(C*_4_a)xmTJC-IysEkSg5OCOyL5}ga%OH8wy#gWJb8b0 zZ2f}L3qRwGTNdtn=<-c6L$-u@ZL{9H&ELclq@I1A>h2XLr+G8r{)V~#KQ9lNAF|NL z&ssV|mgnE*8FR{j=5+sEvv+UP)x*N;{}pdDus3<=rq|CNS^vE6?6pgK@4w<>iL{%1 zN?G;x&g9}Xrb+zjr%rX4ED2r{ZtziY-Kw~QuTv|O4y}I05~F`uSWu2xOL6M#`^-wS dQN!x1)U0&+q5;u!}0nvf#x7D=3|>w_Q{znoRSr{$@uf>J%8)YC8phbWBz%PgPP@s zx8K=Th+N@zC{}jx5L8&gArQpEp~=)D!syh+py=8#K?zydMa{gfa@H@2=?oK3x?7i5 zNp63U8uG-iy7tnVyp=O=#=p<=jp?2Jk|ig$;@Q(5y^)*Wp8Ro#`S!Q7$Ia}%A9%TA zCexY_t#1`?!m6IWnQ6NJW%#*yp7Q;7Kkf57I#1*K{@l~)VY~NV{kG@t!pnumtUvxO zpRZn??|<{pOS9#Ze;d^AI{WV4yia!hN&ZuQ$7g7&{GNCI*0lAz@Al39%Dwv+pZZbZ z{yBc{oIf5>e*Mb&&71To=APGVw@#>DbnpM^dh&$gztQ#nns=)=Sf7|$+U?0ql4Nn15e|5|L%_<2?7!$_;Uo9upFF5CIM;~&eJ)iy`cxBV#=AQa#D z{g0A5W(3B)e;yni+OW|!W$~vP`}d(>y)bnJ4>#dIam7i*#DTrPlK}3j_;~!ulrnh$7zAF2f zV&7916dUjw&YyX+b+Yog<2_0T9$(+@tv5$zv*mL`_0xSL?o3WPz9lsK-*4#` zGCs9ugpX?9IFoby8*f_LwTrut$Lwc|u`0>h-#hJi^O>#5zuA7jfF&SmdKI;Vst0O*WdEdT%j literal 0 HcmV?d00001 diff --git a/modular_ss220/aesthetics/goonstation/icons/penlight.dmi b/modular_ss220/aesthetics/goonstation/icons/penlight.dmi new file mode 100644 index 0000000000000000000000000000000000000000..63eee397d59fdcfe5e499932d26d3972596168a6 GIT binary patch literal 638 zcmV-^0)hRBP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm z%}mcIfpCgT5=&AQY!#FWQuA^$(=$qxxHwZXi;5L&6%4sJ(~1&vQz2{&g}V89xYQ~u zxca#$xcGW<0RXi;C~0r~4jljh0l!H^K~!jg?U*r3!%!53PgFW|XtGFka282$kf!1v z5W$WqR69Eq6pR*JL>ycK790cz=hlLun?J(74k8g;1Up%wL*vlFB1YLN3u*;(iLggO_fSOA1 zR*R8Ah|)h00L!uf08|j7^bgzu^?E(B5S0Fb0OU%h)NJ08L5R{{3UeB~zp;5XyNp7i z0LB;q;Nk6E5)p*TKh!q3xNbFLR0&vlZD zto8HdO3m*&p@*TtH{m)h(n?re+o;aW9$xlbCwYCkzv*|4unHIqakXc1Rn0E7j+xJ8<3rfF%H3zxBca0N#Eb#eIXQ=Q_!DI}Oeoct>1Y$ z*@E}xp~zYnz@y*#vHKyCFIQ@cto0RH>wZ4`Panad2cf^Nv8#ZviUCjupjHfkIsmmk Y0PUv-$1uLkR{#J207*qoM6N<$g4XyM#Q*>R literal 0 HcmV?d00001 From de5372d3e96ba98118181ff0b00c3d1be1352b83 Mon Sep 17 00:00:00 2001 From: dj-34 Date: Sat, 30 Sep 2023 13:06:58 +0500 Subject: [PATCH 2/2] license --- modular_ss220/aesthetics/goonstation/LICENSE.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 modular_ss220/aesthetics/goonstation/LICENSE.md diff --git a/modular_ss220/aesthetics/goonstation/LICENSE.md b/modular_ss220/aesthetics/goonstation/LICENSE.md new file mode 100644 index 000000000000..bb6102702e6b --- /dev/null +++ b/modular_ss220/aesthetics/goonstation/LICENSE.md @@ -0,0 +1,2 @@ +All files located in this directory and any subdirectories are licensed under the +Creative Commons 3.0 BY-NC-SA license (https://creativecommons.org/licenses/by-nc-sa/3.0) \ No newline at end of file