From 8f53cb2d87bd6e3204fe6316a449af9838bf11be Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Fri, 23 Dec 2011 02:20:16 -0500 Subject: [PATCH] spaceman requested everyone having christmas hats admin verb for possible christmas event. it was possibly a joke I took seriosuly --- baystation12.dme | 1 + code/modules/admin/admin_verbs.dm | 2 ++ code/modules/admin/verbs/gimmicks.dm | 23 ++++++++++++++++++ code/modules/mob/living/carbon/human/human.dm | 2 ++ icons/mob/gimmick_head.dmi | Bin 0 -> 3454 bytes 5 files changed, 28 insertions(+) create mode 100644 code/modules/admin/verbs/gimmicks.dm create mode 100644 icons/mob/gimmick_head.dmi diff --git a/baystation12.dme b/baystation12.dme index 69a61b42524..8da74bc8662 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -708,6 +708,7 @@ #include "code\modules\admin\verbs\deadsay.dm" #include "code\modules\admin\verbs\debug.dm" #include "code\modules\admin\verbs\diagnostics.dm" +#include "code\modules\admin\verbs\gimmicks.dm" #include "code\modules\admin\verbs\mapping.dm" #include "code\modules\admin\verbs\massmodvar.dm" #include "code\modules\admin\verbs\MC.dm" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 50fc1241a22..e3133bdc82c 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -207,6 +207,7 @@ verbs += /client/proc/admin_cancel_shuttle verbs += /obj/admins/proc/show_traitor_panel verbs += /client/proc/cmd_admin_dress + verbs += /client/proc/cmd_admin_christmas verbs += /client/proc/respawn_character verbs += /client/proc/spawn_xeno verbs += /proc/possess @@ -340,6 +341,7 @@ verbs -= /client/proc/admin_cancel_shuttle verbs -= /obj/admins/proc/show_traitor_panel verbs -= /client/proc/cmd_admin_dress + verbs -= /client/proc/cmd_admin_christmas verbs -= /client/proc/respawn_character verbs -= /client/proc/spawn_xeno verbs -= /proc/possess diff --git a/code/modules/admin/verbs/gimmicks.dm b/code/modules/admin/verbs/gimmicks.dm new file mode 100644 index 00000000000..ae37d3ce2a9 --- /dev/null +++ b/code/modules/admin/verbs/gimmicks.dm @@ -0,0 +1,23 @@ +var/global/gimmick_hat = null + +// irreversable, for now +/client/proc/cmd_admin_christmas() + set category = "Fun" + set name = "Christmas Time" + + if(!authenticated || !holder) + src << "Only administrators may use this command." + return + + if(!gimmick_hat) + log_admin("[usr.key] has started Christmas!") + message_admins("[usr.key] has started Christmas!") + + // handle pre-existing hats + gimmick_hat = "santahat" + else + log_admin("[usr.key] has stopped Christmas!") + message_admins("[usr.key] has stopped Christmas!") + + // handle pre-existing hats + gimmick_hat = null diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d5933f49833..4be9f247296 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1006,6 +1006,8 @@ if(istype(head,/obj/item/clothing/head/kitty)) head_icon = (( lying ) ? head:mob2 : head:mob) overlays += image("icon" = head_icon, "layer" = MOB_LAYER) + if(gimmick_hat) + overlays += image("icon" = icon('gimmick_head.dmi', "[gimmick_hat][!lying ? "" : "2"]"), "layer" = MOB_LAYER) if (head.blood_DNA) var/icon/stain_icon = icon('blood.dmi', "helmetblood[!lying ? "" : "2"]") overlays += image("icon" = stain_icon, "layer" = MOB_LAYER) diff --git a/icons/mob/gimmick_head.dmi b/icons/mob/gimmick_head.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5be570dfd1edf578fe75837fcbc148719be2a966 GIT binary patch literal 3454 zcmbuC`9BkmAIE(nijWZHEIy80jfFz9H1{#)TDfH`mHQ6aDzh93xmh2x1C>nfs85z! zhM01X)x>gy7F&+5&)@L<;q`w0^7`TR+w<|xf;!uXi=Gq}5D*Zzv%T!L&w%|{9unTa zY+$s+K2nn1y<;zj!~{npBV&;fw*&+dD?(@%qG-#b!b8d5WmF~{wvohq+3`!OXJ<7! zAxD;u%=5L~Fy0pv&%HxR=xiTbz(6)aMS{bWzjY^3gshqQ4uGCVJ5Mx@zahED7pQyY zPe!|*6^yy`zW!kH_!1bHwt@1Gbxc~L;%NVnZ(uzO;~@>F`Wmq%&e z+81kaC}Ue{_))CpLC5?nXK3mJt_($hkQn3N3s+9k9q(V^gbiHSQoDJ&=CgXs$?^gK z68k==X*)l@U*#dvN;s>e%`STAlq~hG_QXbC#=3~s7*#Bm89vSRWyTEhswh>1GlP^( zN;So51lX})-f~+{&Pn0CZqLs@fRPAsr47>`>8k^Y!X*Gcrr4qn6CUBS8hYr*q#z+j z@$sKc&e}i08^wC*zDF7fDLpfTmf_nL9T96yU&TBdd?KVeo(_HpH?rLGv-mt=Xkzji zvHgX1LF}jf(^c;5=t>U&h}v(zu>SJPz9Htw0<%7o_wn(MeSl%N5|d06%*n=;eA z#r;na zGEQ2t-(l|rVxxmu;D=RFv`)(H-Txw+6yJqZ~*>eCfA z{@|k7Ful7@!0NtYNwIFyZS>1$aqN5D3A;_~aNzEM^z+8VHI{^A?-zd%7gDYCpdTD0wNFa0w_fiDNrQ8-3(y+t z)W)}vg%P4l+b*BX|Ft+WCz#Ex!c3dQ-|1zcK`??Oo&~DDJyLG zc*biw{c|F>6rc6n^-gYG4pTnt)|2r}Rxi%yQBerp1h zu_mrLYH219Hl+-R=GFXS_d%f*!fhib{Px-Sng#G^fG5;Nt_4HGszqBU|2&y_20d-Rp@8)lqIc=0 zKIU5#MyUR-EwP-)SkG5Y1?ael(>6o7-q(%$tT^3%1%(R@!O9uJ0 zR_TY`gw&kzC#-*8&?zg4?Si?`fv%XE1c=C#VOwaFQIsN86Sa=g&DF>u!Ywxp z-20#g#9gnt5iMoh%!6nEyIe~+$n=>+9h#B|L`GoM(CbMYbQ1@R4G!Z=RTH}vQf>{pzL5g0H?q)o~1VP zv0=u&$J(H*v;A5EHt)sOHH5{-w#<^3I$r4&RF|_qmU|`7{uCItu>~Qf^v5a*3iM49 zC@(=e?=?K|E&jBz>{qKRB|L9vPtF+B-*K(J;S8FO)t#1+$%BFHw$0hgy=f&@w~ZD9 zS%E-{NFY7%rp|MTCyMrQ=dGng9=?NuZ26)sPvl36#N4W-@q^IpT0iR-cY~6lshRw7 zTvEDOAQqOD;Fu0k>aNywk)2>NYK>-#Sh~5=&c9OQ6C~ou)G-+l-t-~xU=MMkiepGalkR{0VGB%+ zlpJNcRf6N>*nU75X_H|2N^^85o<%T0f>>5?j!PX`r_PeXMobBM_Dr9@_CABBu+!34 zX7URYp(cUn$#R8;d%hy-Yiw-GO|l^d^l zD%k_FlhuXu)0`;c8nbCM8**#ywk%n5&7PIj8!^W-F7@K7Ra#l(trtvGF(|TxCGgIC zy!X}7HekI0)3OGalTp9P^iMEIOG$fqXy2u+$^H*avzwcJ!^oZaGa2o@Vx*aA3A1`Y zuaY*%nW99WB)g~&sQN*+JLBIew$@%0kAR=c^tN6zkx8!}Jw?*T^MvSHED10m$S4jR zo*ELr^s~R(L^)&2?#SO3kgf;oX-oDL48NMR8kPbvM_<2H?pV*Xy^zQ9!xp@VnU~DC z1@AD^8X(y9qRI2nYzdl;=ijXOUX^^Z!F0bL%vWx{;aG+TV2(yXT4c!g|BS=)hj0?Y%1;JOxXob&Fue-RD6=K`*?Gr&28!vp|1Xg%=b`a zz(WLdx~DV`_4!_NHs^GmUHx&d0czy%Tq0&GwN6$>E`%=2_%5B!kkG5&dAXbZ?#v#D zB;H1kT2(uj3&N74`tt$P?_tg}xgC2+)=XWl&T3Qia0?u%HFMKpl}K2mF3D z{(co^PJeHMUbAXiv_b`GsmU3VK}cugKM7!-w`VF)zFkK-Kg+_Pb zuP{w2?5Tz;LmdtCSHW><^H+v@RrQf0)AVmWL2}K>&d}Jm9=)w@zs1XbOj6gk?%~qZ zV?g(z%Cd~S8o9-f;E_sBD0o8+8wjtM9Ekkt0p^Ez=1H(l539L%B9Ir^l3Jirs>sA` zSN;%ULh!S(=#^I+a_KW0#ES=4X|y-swSdPnwl5zM{D-D4#es*+U8WwyI(J%E%vi1Y zd)p=n(*<;i6?s+^emJ;4@exqXHuD;F5EW#&xT|YXQ6vdVi!!PdSuzT-Z;MzOo0^6h zT<9j0Mp7{A12~>3(rswlva@ikyhD;d+?B!UZ`jh~b{9%FA>0B?%4#UlJvj4R{x6*T zYn4>N<+FQG7 z8b?~N?;7LBo` z0}k4QAAOvXo6g1at)Ufv#>hddWZZX<8p2eoWq#C!Q??^bTc2>I zC9JlF8GTZ)XQec-Ghev1)FTs07rQY@cvenCu~L04ER9Nmr@{`4Yg3@hqX{E)}IGq)LiB zDBAjmD;`lnL;Yg9__Bwi;%g`zFWU1l7@+qjJs}ShGem>@v;R;D*g>2xKf4rw`X4RV B(V74N literal 0 HcmV?d00001