From 2d9f98cdcc06f5e98520522f41276f05defae568 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Fri, 25 Aug 2023 19:58:56 -0700 Subject: [PATCH 01/10] mothroach --- .../mob/living/basic/vermin/mothroach.dm | 11 +++++++++++ monkestation/icons/mob/pets.dmi | Bin 8994 -> 9767 bytes monkestation/icons/mob/pets_held.dmi | Bin 714 -> 1037 bytes monkestation/icons/mob/pets_held_lh.dmi | Bin 347 -> 580 bytes monkestation/icons/mob/pets_held_rh.dmi | Bin 351 -> 585 bytes tgstation.dme | 1 + 6 files changed, 12 insertions(+) create mode 100644 monkestation/code/modules/mob/living/basic/vermin/mothroach.dm diff --git a/monkestation/code/modules/mob/living/basic/vermin/mothroach.dm b/monkestation/code/modules/mob/living/basic/vermin/mothroach.dm new file mode 100644 index 000000000000..2559bacbf56f --- /dev/null +++ b/monkestation/code/modules/mob/living/basic/vermin/mothroach.dm @@ -0,0 +1,11 @@ +/mob/living/basic/mothroach/void + name = "void mothroach" + desc = "The mothroach of the stars!" + icon = 'monkestation/icons/mob/pets.dmi' + icon_state = "void_mothroach" + icon_living = "void_mothroach" + icon_dead = "void_mothroach_dead" + held_state = "void_mothroach" + held_lh = 'icons/mob/inhands/animal_item_lefthand.dmi' + held_rh = 'icons/mob/inhands/animal_item_righthand.dmi' + head_icon = 'icons/mob/clothing/head/pets_head.dmi' diff --git a/monkestation/icons/mob/pets.dmi b/monkestation/icons/mob/pets.dmi index be91b29f487a8939340ad166d7e1b526f576162d..9812f630912ca117cb6b330cad495a70e3c03e8f 100644 GIT binary patch delta 9484 zcmZ8{2UHW?*7k%z=uJdw07V5sK|$#xAV^V>-unv(2vU?PkO@r$q^qcaK|leeiS(8L zB1NQ1??ox0*APPT$9w!M#|{8AOkXZIKtKY4;N#mH&CTs(Vd301AS5UNP$+^@a-8fOk{2(kDk@Sv2TDyisj(q`M)!;X zwLhcxsW%;IXKA>=VxwlZh^s8BUrQ}!A3QHGm)816p+h=(g~?j*c?DPN4D%BM7EPVI z(xsgtrD1x|rldsQ7WVwtL+HGRoq?hCHrF;wJ{UjzYALH9-t#i##$r_D8REPaTXcWU zdAgT0FA%$VTC0Mu)8C6{x6WDTcn0gq4nF6Y&^`6sO{symNE(zJ@EX6%IPX;N^E$Zd zHJjtMW@cj~6$N?U81GhSbGAZrX+GR-tAB zX~QEUMT4Db&s%}d7|0u}mb!A3V+$|g;Eb@^_HIg-QI&Rt14=PSG9D3tGIK5u>)?lQ zzHch>prwI{Cq3s3vLOth9?X;cw5t?5@j5(V{VyZnz zpU%*nCAjGNZ;K_~l}qyvFpR?1s|a3Ki@16O@QG6Gb-W-$-WUvMZH%KoWNLS$gVJH{aqvx*0iqP&dN24qipEU@akM$(? zB_n?LMls|l_=#_-q-8+;)R563YrMg05Yr%#h<-%a^6C6x$d3rMP~5uyO?VHBr=1*e zWiS1nbg4Xeu~L8}Revw3tBc`oxEe|wZrEjCCJEdO_BX+w%e=VFXd-C3+tIK77+n^O zY%UR|QxV~5lKUu#coemW7S(2xbh4N1sG-=tx;y+9gdu5zBbAO8oCeMr5AQ$9Hd zzd9G%KdwN1)(Crh*Tc|$g5YPvKL!biV1wY>;T*z}FK^Gk8rxJZx{&e!C&fQ)A#<-q?K;b<;?4C{998jov*V<^G5&+PSmTH$tTI*(k_6 z8{Hs5gDq&8dh8W)rTD z`WTq@2;MHFkq!EoxL0A&YW-xLIc%VT;o8MGBTPOeJfIai6S93=@f}Yf$Ipl!f{teg z#rWC}iS}QuNwgvFw@GRm40$8`BG+N>yiet!wt+Zyl#WMTf-o7q zhVE{WY$DD23zHS2X1h+M+ViSE^I_vIi_w3VH`VHZyHuc6rSEho95WL{E57u`c$6}G zyb#3DAi5PNLSEJ$7!!`)LNaNxKmz7Q}=bb3JuWc99dHU`q5_f*JJDy7PvpCuSi5Ve_}u%M7Bq83=XJj?f%R4qG>RJE?i%1Q zLal7|sd%CmxMKT9ap1eZ*a z0sG{Z^Wr+usLXSxz;n9V=KX_}ldrmj?mJ*n_hf0%SLqJNAb@K(dFpMrBTbn=fnVF4 zqlU1wL)bLl`$c&T#r$oK1_C=%E^pYm_6<-9GBCUz)&NFCd`vQb5lLUHT{G6;(}wDK zaKqsA&H0*=eOCtRmhh$O^oN4MIsU$P?Iw2WUEW29SH@Q=sW zX&EQH1YsW?q#-`ZIq!WkA#V5QZM|6W^L+(sR@reRV5e?_(p9@YDO(XzY<7aQv!(fSj;H1_m+Ez9)$#AqrlA@VD z)7$kFVfW7TS0M#$Zc8N&`B~y#eRKzrbou7*atQ&5Nbe`8aZj#5KtBUIV!})00r1R6 zJ<=F0E&wSz-%9r}_Qo@|`Zz9zJrLk%E|ID|ZRO@*&=IrH%Nz+U8Ft$D{~(j|fEeUo zl|%Y8sjBH>Qc~~=Vdp>LuQ{^h;iMujlS_x|_WT`f|B~^*QWj_kfcMj=o&Kt~B+Wpar=sr{{R0dJj@)2F@M!mD<;B zMT~eYFZ_-hNo>yUrFZ`L^x|{iHLhK3RMIShwpmJ(4dA>n)E|nlekV(lP4ZB{zBk-Y zm`wGe-*h#svbjc+oimZ~pu~gLf`-HCtTZ1n)P3~vlNb)a<=rn+vXIfeBPHxR5%qbV zNs^r=3&7y>BId{4`?qCeoWZTRxjcIFqYJHUpgQecUdYvc7uVm_{ps?1o2`rbF@nU< z(iBUK_m;Wnjy4;*=(V~z+Z^QzfDM50%59Q44k{kDlWt|$SAX46c3fRpS@qEn)(7el zm<0Rf8$gkHc|mFKpHd});h7n?iGW$@+yC|r^fwr6Pg5@N24_F_vUjt6u~OGHU}(0_ z+lom9HVG5ekEKwp4r2o8acx>(f(qxxQetOfMZ!pQTa@Uj!6hE)%$GgHj#lX#{6@LH zv2LxL97fsk;tOE#_P`jk>q+JNTW{sA!^l^OK|VnLbgl~Ka-X;0CA$Wnl*<&kHJpB0 zjPav;&(I06;Mt&~`S~`t@je9^znd!y0?uKfr8}XQ`wkoYf(@4r<8d%W8s9*3MjPm>tIM{xR^c4ty)!NWqH!Vw5PR7FO zl=$T&bbjR<_6wk8HGLv(CL@Hz#AjJjYL2eZKQD}NXHzIjJW|HpGdP<8uG4Z$FQRT4 zzMKqvG_*RpwS}lw37gs4vZ!RbKdSTIAM+kke*O|PvI;Rh0ayzo6|!{}&(|sl0;E=F zdKM_Q6uL$y*ipvgBhq*0lT2U7qQSiqGhe6;Y0IcmB2saX_o`V#TqWd@;T1L!V_|kr zuP{>C8OU3N5G(F`-kERU0+5B71q8#J*r+kG<L)4;)*nV3h4dT_l}?8n5O-v;&| z#amofBpdPy@y^*3O-ULj29-iR!$^j_ket2f=$ScSR!j*XoWLEf%&N`FFRq-XPJeFK zUp=Z*8vl_5B1Qka;!l9Q4CQ>A@*Ji^EmwSZg!RkWv;S!Y3zNj0pIHzIS}EsqofcdJ zanGGQ1`A0~RkFIJum5?xJW(s+@3%1_F0apmG<^560;cozoy!lu`VUEBo57$XRj>Kd8RK-u{t~kdQ$O!#75yHA@(ndxK$75~`D7|SzD`Nt_uP-#*P_$FkKAU6g^b`x`FsC)@yrUwfgPLAB(^9&^<2sa4p^T^9A~` zK!N%x%3}DVdr9Xi*6g}vaXrmU<|@G?0p}&^&e31dkv}!^@uQHghjAJkh|Uv8PL>;b zRqIBr=oLSkOMubJofF1e*`6KnR(InMuRrHc{60$X}eO7fXd5KIdlP>2VAWJQi*Bw{}iR)6^_;dsLbXq79)|(#M7nSLP(eIT%?Nv+3P*8JpeJ687h>>!*W7Jrg02zKbcJ1P zq__I_oL$J`>RjSJWNn|h15ZDS=iwM;=g2v;ndossD+z=WVuvQK?GXw0Pf%7Tp}CMe z;?d=y*7bc5>gRvm{{-+jp_wN_QsQ0PD^WKWcTNIMLK`8!h({k0?@W-GW(bvTXb9Z{ZINoj>NZHUo}geWkul|Xvj|hFjJ86~ z{Ay2IU6M6tx9_;~R7GWg2YpGCA1xlTT`jn7+ zh^c5SKlChjhaJ4f4P+V;q^uYg${1wi3H(&SSx;tu+dlnt;?{M(M&c|2*$ zQ|%QkKzZjkMXYS8rSv~00u6=i?QJWy94>5g`UEQ{m8V{;X=4kzto;i1M`#dE-J1Jw zc_+>(ViEs-alKwFskF4DxTMImh39F}mikB~|o z{r8byC?n?c{OG$?(hG%Z7rWkgUd*(mS1RZ@iN4AvzW1X`eRFAUgzRwMz<|S9KK%DK zSaT)}lvy<&87YPUl+x1THhDTCQO0Z^{+Rlm+(0+s^<(f>pq+-$%a@!tz`GFlHwDj#ma8k_eIVmV`}a>0`~9e7TY9tV1lyPd(GC6Z4ayC{6OYe?+hs6W^i@Fe zJ3FiVbBt6rb*;NI;C1Qm6{)Ed&^7u&z;*fv~+I~s3I%V(_>eNtlsnm z*L|{jD?G80 zoX=k9t_Ia^0T5t96cDanwZ4YYqIJC66Egua0-c~<01|iia__~Ror8jaY z=9Sjx#~CJTf_J~Ol78$f-3)FtD70;~F_8?2inN6feMFl!HU99rIoKYfV<57!aKk3O zzt}o1$Dlhr;ObOe^djEykS9v?x<(^gi7m7`Lu3jXzBxjY>X|+EC!D(riK^hO?y7F3 zEf^)=SgS(Vof$GL1u1lMwLXkYLSYTDc<_aH(p~Wr!}XJ{ZygVhlJ+25WA^xjB+8s% z)Cu;Vh>D@EPjYeys1Fo|3t@}+s`9CT(D%vn~${3k` zG0*uM-gMLXpbxRH&uNLibE=ShI3YaM#EMN4Jevrq5msXaL+C@b>3yIZ@4Z?czHkMi zE?xgn@X}H@E&tBT_m4i>1dQc(ao-W%{Nm&g97-J-qX=|3exx5WooTSq$2RMV&Ar=j zB<43oE%wJVPdRG>Sf}V}^!%re@!xivxFkUoUfLVG+oQY(>AR;M1yNJbaO}7|^R83c z`HxP3?K=c$zdcH)Atd|)lkF;=%thNcmK>#o{}Z7_+I^K%9(HM z&vEM>ftzIcQ>7jn4z`^vlvV~>f^aYTa5|*d8&*^@9VNU8FtpfwY)Ce5yIpzi)9egg z>eN7c$of+i#8ssF4+9^@#rmxz<;~m)@xxwgXIXHFJY`Mk4xc+wrflVlZ6?vWo!oF6 zvCSj*P9eJjFLXAgf5ryhSf2dH!3EB4mPLfEe-oI{UC8C#7Ro!c>|| zek?$Dxhh!btRm1)17~>p=!K`7ZcSkBWBrd?*^{?WINI#BB>#2Qiit(yX=eNgyn^hl=eZo9Tc1U z*70_^u*HNLYgoJpA3_Hi9M?E_|G!dtk2ZmUi(QS!V5c zJ0@^*($M*+?tJel#2~9I;4!|wI;72$ggQ zOg}LzC59euBS~8tgsghm+#a30eEz&7R2?L+(ElOqS7-HS`Rhw~c)4f>c|YYA#_|k4HKCqL@hlD$Edb)@X4Z8EXHa3TmctAikEoEd>V!f>3wpDhI`Si zZG53$?;HF>PCB@RPBVdn8{xAVGElQ(KDAmF*$d)6MMc)K=pfN2PD5`Yzm7%TW#iD? zTb}R|h(AGooMqO5=9?-?^yv(vF$_Tdz{X@uDf`}DmR4ouM9wA#f=cqy;xuLY_}8)8Q_(YSJZPoK7!ajtc4hi_aZrErWTsIc zN%g?iy11*`autsh4(x{$x# zCJT(sVll%H=x(esUnrw-~;EGJXHIyzjnhF`a71SH8cn zi07}K)>Z`!i8BmnM9{=j@vKQ6l6W?6?A7O>8m0I`?^}%^XvW1ZjgM$iq6#`5c?$jxHj(-_!%2!dhdC6HHX?)9YjLKu9KdqkXbR?NS)#9 zAGWDdn$0=?GUJ8k-+ZVUJ`pIpCq2e(DU1m~t>-qG=AOxF2Iq=9d2K4Bs6p3B3bb3F z2?u8|^E#xnU2<9@?fF^u$~C?!jjWpf?hbPU%YQLEJ|q`s%`U%y(Z1YBC`!^-#(w7A zXZj-b$Y=WjEG%^VNMqWm z)&I-|{??9KJp7qEdjv_MrSPaxVaa~@-LyaY#R#N3mGty`e*^s+q~>pymqwPveqtW| z+Y0{0{+IdY{NL=vN~jruJO5WLrCO2n{}FAIB3|Tm6&WHa?}(9}@x{mahX>E8c;s*U z+wM#H)qmB+zv|&LY)fq9Vcg%oTnr0sA(EnYxd=o^NH~R=I^fD6Shr7QB;O2!xsLUJ zdnf-tL2Uk}^5S2q)c$WP>a6cyqPhMK5Hk4xsA+$#n8^Q#sD#;bVSXVh*#jbe=M3J) zRgcLMNp7T@pQEw4;9Iyel^bDQvYAKj(1V8qq0jXmHt5cVrw+Fxb4bMr2|vx~wH$MQ z-2QuVy4Qrv`m6y&p{0`Yy?CrJrT8^CF_f}k zrM#MPZCAiAkwi;rfU?dGAGnUQ5Q_8^dKVs3%<>;&2N?wc$wZ@1y-6K2<6eQ|v-3S? zNcB@YudOF0t|+Kh&Pi+hJ%a{S=gy&2pclvVJaV~gdG^847*EZ5lIRJ zIv-@_;v7$kkQCI1ErPM{T&1de7|CvyM{YbzFI1pHJ&$J=;l{-dG*kP4V&7tJ8IF|u z9(jeP{{9)91V=ZO?n7G8?|gC6j3^20PpLqllD4$92Z#jKmR@w;{&q+t2BJ%Kf+3ly zqp-<}g8kc8X%A3!L!>}_K8Po?x zHTwrRetz=i)Q`A%o$&dT)hmhcaavxrlMDu4%aaVYDv(@#eP!?ap8|3HD(c}5{NKX_ zVW|yPA)FcV%T74z^nV5**JZx?@Z&u^hgG>sn5jkMvfb9GUwjjHaTv?VNJA2+v=s(^ zUEmKt&iZ)_|H&}nnR1MKn~mcKJi96mmN4Kn$}JQ*x)LBOG~6p(mEb*^tb^+VZ7UM9 zCRRYtWlLBI%uV_q4`%$Nu45FvKK&Ou2qV)Pr0>C|XJxh07T2we*ch+;69Wo4G(SXW z4!Z@cEzc-_)BQdGP9ExAsj3PL*a9l%Y*szh^1l`~)_sLexjlU7S?wTbE49?}~GRQq*kWzBP4(?G0sF3<{wXm72c%LU!}=GavNFd5cse!($~lp5WM;&u87i*HR| z6QVcZ%kfjdg7uH z=wQ00`bZM+5Z zh0T*Q_+(TM>=zuc40EzC$wSAtl2w7IVb=r2(K|l&k28Wf{V+Kpb+DDde}tGOK~;^5 zHz{-n6J_)QW{JPW1IGeBJYnIC!;wxqxg=! z{r27;=>>^K%tSBGXyUSBQ5#QZd>Xf33nMC~8B{}cg5+b{{qf=3dMs#q>+kZv5t-`= z9Qb37VKUzOS`)W?iHyltvLO%#GJgXYAj3&Fb$HUt%re6rZCnbEW7a{?nYO|}q@jJr zSSN(?-F%VY6Y_trhl JlA8_@{|_1Qh0g#0 delta 8719 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 delta 217 zcmX@Ya+^uDGr-TCmrII^fq{Y7)59eQNIQTq2Q!eIyS?!ZkTRaAYAF5U$hRfi?)_W4 zzX&M8SQ6wH%;50sMjDWlIk6|c{z*_+!PjEO*<1_~_ayhR1)RGMlu7h-aSVxQeS6K2 zuR%e;C6L91MdW>b6!&ezn`ceb&S|SZN%wXVn8+V}!=Yr2$0^RUt1SbzF#- zwm0-tuMI+&sQt9I5uejm-)$v$?jf6h(;e=8#{)y0|VZzU6dE5FXIkU8R7Dv{1*GYH^h98KcQ!1Edl&k*zU~&*V5Wya z;y5V~3k4`W1(GqrU^wSn&;E*U0%~$olF2uaVS)_zOi90of^qz1TjtwmEl;-&JC(3< sN(A(Z?ic^Ydk^~=R}@|w1OR|BKj3>1Se=r4QUCw|07*qoM6N<$f**3vB>(^b delta 280 zcmX@fa-XTbGr-TCmrII^fq{Y7)59eQNIQTq2Q!eIyS?!ZkTMSN32{Ae-~gYPn1Zla zzEk>UZt*onMnRcVY!qCMZrZyga}BSkXthID_riP9)-kgdq`x@wZOOKK|JLp=0%~V0 z3GxeOaCmkj4amu?3W+FjNi9w;$}A|!%%3MIEaj?(fan9H(!GR2g`-5?6phl-qlCxGn`a;eCWj<)y76u&CV0AeR2-?ls%htvEk_2 zYg?N>=Vr(4jAmzU3O&pw(XgJ&W%UK-L+9r53J6Z*w>t4t_`gt1*olVjIsa|HoD{0O b$9v%{qp!fyO_|m}8yP%Z{an^LB{Ts5Io)nZ diff --git a/tgstation.dme b/tgstation.dme index eda0f80995ca..363787847214 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5747,6 +5747,7 @@ #include "monkestation\code\modules\mob\living\status_procs.dm" #include "monkestation\code\modules\mob\living\basic\animatronic.dm" #include "monkestation\code\modules\mob\living\basic\space_fauna\fugu_gland.dm" +#include "monkestation\code\modules\mob\living\basic\vermin\mothroach.dm" #include "monkestation\code\modules\mob\living\basic\vermin\mouse.dm" #include "monkestation\code\modules\mob\living\carbon\carbon_defense.dm" #include "monkestation\code\modules\mob\living\carbon\carbon_defines.dm" From d1b7a4bf01a376ce5d2eadbb2678dbe5f9e3ac41 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sun, 3 Sep 2023 20:10:03 -0700 Subject: [PATCH 02/10] add spycrab --- .../modules/mob/living/basic/vermin/mothroach.dm | 8 ++++---- .../mob/living/simple_animal/friendly/crab.dm | 13 +++++++++++++ monkestation/icons/mob/simple/animals.dmi | Bin 0 -> 3696 bytes tgstation.dme | 1 + 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 monkestation/code/modules/mob/living/simple_animal/friendly/crab.dm create mode 100644 monkestation/icons/mob/simple/animals.dmi diff --git a/monkestation/code/modules/mob/living/basic/vermin/mothroach.dm b/monkestation/code/modules/mob/living/basic/vermin/mothroach.dm index 2559bacbf56f..0e7a09ba2a8c 100644 --- a/monkestation/code/modules/mob/living/basic/vermin/mothroach.dm +++ b/monkestation/code/modules/mob/living/basic/vermin/mothroach.dm @@ -1,11 +1,11 @@ /mob/living/basic/mothroach/void name = "void mothroach" - desc = "The mothroach of the stars!" + desc = "A mothroach from the stars!" icon = 'monkestation/icons/mob/pets.dmi' icon_state = "void_mothroach" icon_living = "void_mothroach" icon_dead = "void_mothroach_dead" held_state = "void_mothroach" - held_lh = 'icons/mob/inhands/animal_item_lefthand.dmi' - held_rh = 'icons/mob/inhands/animal_item_righthand.dmi' - head_icon = 'icons/mob/clothing/head/pets_head.dmi' + held_lh = 'monkestation/icons/mob/pets_held_lh.dmi' + held_rh = 'monkestation/icons/mob/pets_held_rh.dmi' + head_icon = 'monkestation/icons/mob/pets_held.dmi' diff --git a/monkestation/code/modules/mob/living/simple_animal/friendly/crab.dm b/monkestation/code/modules/mob/living/simple_animal/friendly/crab.dm new file mode 100644 index 000000000000..181261689e1d --- /dev/null +++ b/monkestation/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -0,0 +1,13 @@ +/mob/living/simple_animal/crab/spycrab + name = "spy crab" + desc = "hon hon hon" + icon = 'monkestation/icons/mob/simple/animals.dmi' + icon_state = "crab" + icon_living = "crab" + icon_dead = "crab_dead" + + +/mob/living/simple_animal/crab/spycrab/Initialize(mapload) + . = ..() + var/random_icon = pick("crab_red","crab_blue") + icon_state = random_icon diff --git a/monkestation/icons/mob/simple/animals.dmi b/monkestation/icons/mob/simple/animals.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4156ff7627873aa1397a12becc8f53b5a4fbc5ef GIT binary patch literal 3696 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 Date: Sat, 9 Sep 2023 23:06:25 -0700 Subject: [PATCH 03/10] move stuff to module, add rest of the things --- code/game/objects/items/choice_beacon.dm | 72 ------------------ .../code/game/objects/items/choice_beacon.dm | 72 ++++++++++++++++++ monkestation/code/modules/donator/README.txt | 38 +++++++++ .../modules/donator/code/datum/loadout.dm | 53 +++++++++++++ .../donator/code/item/choice_beacon.dm | 58 ++++++++++++++ .../modules/donator/code/item/clothing.dm | 34 +++++++++ .../code/modules/donator/code/mob/pets.dm | 45 +++++++++++ .../modules/donator/icons/mob/clothing.dmi | Bin 0 -> 1062 bytes .../code/modules/donator/icons/mob/pets.dmi | Bin 0 -> 5218 bytes .../modules/donator/icons/mob/pets_held.dmi | Bin 0 -> 669 bytes .../donator/icons/mob/pets_held_lh.dmi | Bin 0 -> 423 bytes .../donator/icons/mob/pets_held_rh.dmi | Bin 0 -> 422 bytes .../modules/donator/icons/obj/clothing.dmi | Bin 0 -> 741 bytes .../mob/living/basic/vermin/mothroach.dm | 11 --- .../mob/living/simple_animal/friendly/crab.dm | 13 ---- monkestation/icons/mob/pets_held.dmi | Bin 1037 -> 714 bytes monkestation/icons/mob/pets_held_lh.dmi | Bin 580 -> 347 bytes monkestation/icons/mob/pets_held_rh.dmi | Bin 585 -> 351 bytes monkestation/icons/mob/simple/animals.dmi | Bin 3696 -> 0 bytes tgstation.dme | 7 +- 20 files changed, 305 insertions(+), 98 deletions(-) create mode 100644 monkestation/code/game/objects/items/choice_beacon.dm create mode 100644 monkestation/code/modules/donator/README.txt create mode 100644 monkestation/code/modules/donator/code/datum/loadout.dm create mode 100644 monkestation/code/modules/donator/code/item/choice_beacon.dm create mode 100644 monkestation/code/modules/donator/code/item/clothing.dm create mode 100644 monkestation/code/modules/donator/code/mob/pets.dm create mode 100644 monkestation/code/modules/donator/icons/mob/clothing.dmi create mode 100644 monkestation/code/modules/donator/icons/mob/pets.dmi create mode 100644 monkestation/code/modules/donator/icons/mob/pets_held.dmi create mode 100644 monkestation/code/modules/donator/icons/mob/pets_held_lh.dmi create mode 100644 monkestation/code/modules/donator/icons/mob/pets_held_rh.dmi create mode 100644 monkestation/code/modules/donator/icons/obj/clothing.dmi delete mode 100644 monkestation/code/modules/mob/living/basic/vermin/mothroach.dm delete mode 100644 monkestation/code/modules/mob/living/simple_animal/friendly/crab.dm delete mode 100644 monkestation/icons/mob/simple/animals.dmi diff --git a/code/game/objects/items/choice_beacon.dm b/code/game/objects/items/choice_beacon.dm index 77177b1123a2..b4bc8154e5c7 100644 --- a/code/game/objects/items/choice_beacon.dm +++ b/code/game/objects/items/choice_beacon.dm @@ -175,75 +175,3 @@ GLOB.holy_armor_type = choice_path return ..() -// Pet Beacon for Monkecoin shop - -/obj/item/choice_beacon/pet - name = "Pet Delivery Beacon" - desc = "For those shifts when you need a little piece of home and some company." - company_message = span_bold("Pet request received. Your friend is on the way.") - var/default_name = "Stinko" - -/obj/item/choice_beacon/pet/generate_display_names() - var/static/list/pet_list - if(!pet_list) - // Bug SeeBeeSee on Discord if you want an animal type added - // (no, you cannot have a pet goliath or other hostile mob) - pet_list = list() - var/list/selectable_pets = list( - /mob/living/basic/mothroach, - /mob/living/basic/axolotl, - /mob/living/basic/mouse, - /mob/living/basic/mouse/rat, - /mob/living/simple_animal/parrot, - /mob/living/basic/butterfly, - /mob/living/simple_animal/crab, - /mob/living/simple_animal/crab/evil, - /mob/living/basic/pet/penguin/baby, - /mob/living/basic/pet/fox, - /mob/living/simple_animal/pet/cat, - /mob/living/simple_animal/pet/cat/kitten, - /mob/living/basic/pet/dog/corgi, - /mob/living/basic/pet/dog/pug, - /mob/living/basic/pet/dog/bullterrier, - /mob/living/basic/lizard, - /mob/living/basic/ant - ) - - for(var/mob/living/basic_mob as anything in selectable_pets) - pet_list[initial(basic_mob.name)] = basic_mob - - return pet_list - -/obj/item/choice_beacon/pet/open_options_menu(mob/living/user) - var/input_name = stripped_input(user, "What would you like your new pet to be named?", "New Pet Name", default_name, MAX_NAME_LEN) - if (!input_name) - return - var/list/display_names = generate_display_names() - if(!length(display_names)) - return - var/choice = tgui_input_list(user, "Which pet would you like to order?", "Select a new friend", display_names) - if(isnull(choice) || isnull(display_names[choice])) - return - if(!can_use_beacon(user)) - return - - consume_use(display_names[choice], user, input_name) - -/obj/item/choice_beacon/pet/consume_use(obj/choice_path, mob/living/user, name) - to_chat(user, span_hear("You hear something crackle from the beacon for a moment before a voice speaks. \ - \"Please stand by for a message from [company_source]. Message as follows: [company_message] Message ends.\"")) - - var/obj/structure/closet/supplypod/bluespacepod/pod = new() - var/mob/your_pet = new choice_path(pod) - pod.explosionSize = list(0,0,0,0) - your_pet.name = name - your_pet.real_name = name - - new /obj/effect/pod_landingzone(get_turf(src), pod) - - uses-- - if(uses <= 0) - qdel(src) - return - - to_chat(user, span_notice("[uses] use[uses > 1 ? "s" : ""] remain[uses > 1 ? "" : "s"] on [src].")) diff --git a/monkestation/code/game/objects/items/choice_beacon.dm b/monkestation/code/game/objects/items/choice_beacon.dm new file mode 100644 index 000000000000..1a80a7738e9e --- /dev/null +++ b/monkestation/code/game/objects/items/choice_beacon.dm @@ -0,0 +1,72 @@ +// Pet Beacon for Monkecoin shop + +/obj/item/choice_beacon/pet + name = "Pet Delivery Beacon" + desc = "For those shifts when you need a little piece of home and some company." + company_message = span_bold("Pet request received. Your friend is on the way.") + var/default_name = "Stinko" + +/obj/item/choice_beacon/pet/generate_display_names() + var/static/list/pet_list + if(!pet_list) + // Bug SeeBeeSee on Discord if you want an animal type added + // (no, you cannot have a pet goliath or other hostile mob) + pet_list = list() + var/list/selectable_pets = list( + /mob/living/basic/mothroach, + /mob/living/basic/axolotl, + /mob/living/basic/mouse, + /mob/living/basic/mouse/rat, + /mob/living/simple_animal/parrot, + /mob/living/basic/butterfly, + /mob/living/simple_animal/crab, + /mob/living/simple_animal/crab/evil, + /mob/living/basic/pet/penguin/baby, + /mob/living/basic/pet/fox, + /mob/living/simple_animal/pet/cat, + /mob/living/simple_animal/pet/cat/kitten, + /mob/living/basic/pet/dog/corgi, + /mob/living/basic/pet/dog/pug, + /mob/living/basic/pet/dog/bullterrier, + /mob/living/basic/lizard, + /mob/living/basic/ant + ) + + for(var/mob/living/basic_mob as anything in selectable_pets) + pet_list[initial(basic_mob.name)] = basic_mob + + return pet_list + +/obj/item/choice_beacon/pet/open_options_menu(mob/living/user) + var/input_name = stripped_input(user, "What would you like your new pet to be named?", "New Pet Name", default_name, MAX_NAME_LEN) + if (!input_name) + return + var/list/display_names = generate_display_names() + if(!length(display_names)) + return + var/choice = tgui_input_list(user, "Which pet would you like to order?", "Select a new friend", display_names) + if(isnull(choice) || isnull(display_names[choice])) + return + if(!can_use_beacon(user)) + return + + consume_use(display_names[choice], user, input_name) + +/obj/item/choice_beacon/pet/consume_use(obj/choice_path, mob/living/user, name) + to_chat(user, span_hear("You hear something crackle from the beacon for a moment before a voice speaks. \ + \"Please stand by for a message from [company_source]. Message as follows: [company_message] Message ends.\"")) + + var/obj/structure/closet/supplypod/bluespacepod/pod = new() + var/mob/your_pet = new choice_path(pod) + pod.explosionSize = list(0,0,0,0) + your_pet.name = name + your_pet.real_name = name + + new /obj/effect/pod_landingzone(get_turf(src), pod) + + uses-- + if(uses <= 0) + qdel(src) + return + + to_chat(user, span_notice("[uses] use[uses > 1 ? "s" : ""] remain[uses > 1 ? "" : "s"] on [src].")) diff --git a/monkestation/code/modules/donator/README.txt b/monkestation/code/modules/donator/README.txt new file mode 100644 index 000000000000..c2c8b19a8f1d --- /dev/null +++ b/monkestation/code/modules/donator/README.txt @@ -0,0 +1,38 @@ +## Title: + + +MODULE ID: DONATOR_ITEMS + +### Description: + +This PR adds adds donator specific items to the game. Also migrates old donator items to the game for easy CRUD. + + + + +### TG Proc/File Changes: + + + +### Defines: + + + + +### Master file additions + +- N/A + + +### Included files that are not contained in this module: + +- N/A + + +### Credits: + + + +Code and sprites done by Lmenvs. + + diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm new file mode 100644 index 000000000000..56dfe930024f --- /dev/null +++ b/monkestation/code/modules/donator/code/datum/loadout.dm @@ -0,0 +1,53 @@ +//bidlink + +/datum/loadout_item/suit/cirno_outfit + name = "Cirno Outfit" + item_path = /obj/item/clothing/suit/costume/cirno + ckeywhitelist = list("bidlink2") + +/datum/loadout_item/head/cirno + name = "Cirno Wig" + item_path = /obj/item/clothing/head/costume/cirno + ckeywhitelist = list("bidlink2") + +/datum/loadout_item/pocket_items/donator/cirno + name = "Pet Delivery Beacon" + item_path = /obj/item/choice_beacon/pet/donator/cirno + requires_purchase = FALSE + ckeywhitelist = list("bidlink2") + +//ttnt + +/datum/loadout_item/head/pot + name = "Dented Pot" + item_path = /obj/item/clothing/head/costume/pot + ckeywhitelist = list("unkown") + +/datum/loadout_item/pocket_items/donator/spycrab + name = "Pet Delivery Beacon" + item_path = /obj/item/choice_beacon/pet/donator/spycrab + requires_purchase = FALSE + ckeywhitelist = list("unkown") + +//spinnermaster + +/datum/loadout_item/pocket_items/donator/void_mothroach + name = "Pet Delivery Beacon" + item_path = /obj/item/choice_beacon/pet/donator/void_mothroach + requires_purchase = FALSE + ckeywhitelist = list("spinnermaster") + +//ruby_flamewing + +/datum/loadout_item/pocket_items/donator/blahaj + name = "Pet Delivery Beacon" + item_path = /mob/living/basic/lizard/blahaj + requires_purchase = FALSE + ckeywhitelist = list("ruby_flamewing") + +//happiestplane +/datum/loadout_item/mask/zoro + name = "Zoro Mask" + item_path = /obj/item/clothing/mask/zoro + + diff --git a/monkestation/code/modules/donator/code/item/choice_beacon.dm b/monkestation/code/modules/donator/code/item/choice_beacon.dm new file mode 100644 index 000000000000..1db42a11514b --- /dev/null +++ b/monkestation/code/modules/donator/code/item/choice_beacon.dm @@ -0,0 +1,58 @@ + +//Donator specific pet beacons +/obj/item/choice_beacon/pet/donator + var/mob/living/donator_pet = /mob/living/basic/axolotl + +/obj/item/choice_beacon/pet/donator/generate_display_names() + var/static/list/pet_list + if(!pet_list) + pet_list = list() + var/list/selectable_pet = list(donator_pet) + + for(var/mob/living/basic_mob as anything in selectable_pet) + pet_list[initial(basic_mob.name)] = basic_mob + + return pet_list + +/obj/item/choice_beacon/pet/donator/open_options_menu(mob/living/user) + var/input_name = stripped_input(user, "What would you like your new pet to be named?", "New Pet Name", default_name, MAX_NAME_LEN) + if (!input_name) + return + if(!can_use_beacon(user)) + return + consume_use(donator_pet, user, input_name) + +/obj/item/choice_beacon/pet/donator/spycrab + name = "Mann Co. Crustacean Deployment Apparatus" + default_name = "Spy Crab" + company_source = "Mann Co." + company_message = "Prepare for infiltrator deployment." + donator_pet = /mob/living/simple_animal/crab/spycrab + +/obj/item/choice_beacon/pet/donator/void_mothroach + name = "Secret Beacon of the Stars" + default_name = "Moffles" + company_source = "*UNINTELLIGBLE BUZZING*" + company_message = "*LOUD MOFF NOISES*" + donator_pet = /mob/living/basic/mothroach/void + +/obj/item/choice_beacon/pet/donator/void_mothroach + name = "Secret Beacon of the Stars" + default_name = "Moffles" + company_source = "*UNINTELLIGBLE BUZZING*" + company_message = "*LOUD MOFF NOISES*" + donator_pet = /mob/living/basic/mothroach/void + +/obj/item/choice_beacon/pet/donator/blahaj + name = "Blahaj" + default_name = "Blahaj" + company_source = "IKEA" + company_message = "Please enjoy your new pet -- some assembly required." + donator_pet = /mob/living/basic/lizard/blahaj + +/obj/item/choice_beacon/pet/donator/cirno + name = "Cirno" + default_name = "Cirno?" + company_source = "Touhou" + company_message = "Please handle with care!" + donator_pet = /mob/living/basic/lizard/cirno diff --git a/monkestation/code/modules/donator/code/item/clothing.dm b/monkestation/code/modules/donator/code/item/clothing.dm new file mode 100644 index 000000000000..e6a4c75550c5 --- /dev/null +++ b/monkestation/code/modules/donator/code/item/clothing.dm @@ -0,0 +1,34 @@ +/obj/item/clothing/suit/costume/cirno + name = "\improper Cirno's dress'" + desc = "A dress that is styled like Cirno's." + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "cirno_dress" + inhand_icon_state = null + body_parts_covered = CHEST|GROIN + +/obj/item/clothing/head/costume/cirno + name = "Cirno wig" + desc = "A wig that is styled like Cirno." + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "cirno_hat" + inhand_icon_state = null + flags_inv = HIDEFACE|HIDEHAIR + +/obj/item/clothing/head/costume/pot + name = "pot shaped hat" + desc = "You are literally just putting a pot on your head." + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "pot" + inhand_icon_state = null + +/obj/item/clothing/mask/zoro + name = "zoro mask" + desc = "A mask made to look like an old hero." + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "zoro" + inhand_icon_state = null + flags_inv = HIDEFACE diff --git a/monkestation/code/modules/donator/code/mob/pets.dm b/monkestation/code/modules/donator/code/mob/pets.dm new file mode 100644 index 000000000000..7761d54b4c0d --- /dev/null +++ b/monkestation/code/modules/donator/code/mob/pets.dm @@ -0,0 +1,45 @@ +/mob/living/basic/mothroach/void + name = "void mothroach" + desc = "A mothroach from the stars!" + icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' + icon_state = "void_mothroach" + icon_living = "void_mothroach" + icon_dead = "void_mothroach_dead" + held_state = "void_mothroach" + held_lh = 'monkestation/code/modules/donator/icons/mob/pets_held_lh.dmi' + held_rh = 'monkestation/code/modules/donator/icons/mob/pets_held_rh.dmi' + head_icon = 'monkestation/code/modules/donator/icons/mob/pets_held.dmi' + +/mob/living/simple_animal/crab/spycrab + name = "spy crab" + desc = "hon hon hon" + icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' + icon_state = "crab" + icon_living = "crab" + icon_dead = "crab_dead" + + +/mob/living/simple_animal/crab/spycrab/Initialize(mapload) + . = ..() + var/random_icon = pick("crab_red","crab_blue") + icon_state = random_icon + icon_dead = "[random_icon]_dead" + + +/mob/living/basic/lizard/blahaj + name = "\improper Blåhaj" + desc = "The blue shark can swim very far, dive really deep and hear noises from almost 250 meters away." + icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' + icon_state = "blahaj" + icon_living = "blahaj" + icon_dead = "blahaj_dead" + icon_gib = null + +/mob/living/basic/lizard/cirno //nobody needs to know she's a lizard + name = "Cirno" + desc = "She is the greatest." + icon = 'monkestation/icons/obj/plushes.dmi' + icon_state = "cirno-happy" + icon_living = "cirno-happy" + icon_dead = "" + icon_gib = null diff --git a/monkestation/code/modules/donator/icons/mob/clothing.dmi b/monkestation/code/modules/donator/icons/mob/clothing.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a424c8398e768e55d0db5eb95a4ff43295a0ca10 GIT binary patch literal 1062 zcmV+>1ljwEP)C0001HP)t-sz`($p zoupb^VQOq~b$EYtBVHXaldFeM@p3kxAhj~gy{CuOJ}JA`(h>VK&0vD)+M`R$Ik z?v}squh!f_OP@nlr}O>)%^v8E$4UKSwB-r-1cyDBqz-|X(lfFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5; z&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSAiqS3i!&v&s2HS$i!-e# zF*g;&HbkhY$}h?%s3x5E2(}Mw`~z{|{a>=XhE%7X*NIA6Rn>kFh%&Rg14g8( z{wcm7I}Cg4568E!Z^y%L8}`(H1DXyGXBdWI7=~dOhG7_n zsjAa=Fp0Nj|V+$}*Iz%|*zK>Fa-OU+>VHk#C7>4=Z zsp|$$O$^A`G%ePgRitI?;4Jey9M+ps4YP>bpizw^;P|KKTK%6HwoG z9d(JTq5KR$K&n3s?$WsjCp>?FCy$#Qz@v}JX)SZi!n`RFk=>(LIXJxJPm zu()46Ne?SIeVy-|v7?@->60F8ct;0tKHR8kSl64GMmJ98mR(}h1I!PEo-7r3 zyrBXZ55>d-gh2WUws50#Xzo)Fnjw?}grQJuuo^5>12aSj5J`Ov5K94KIY1nSFbt6l zfHwedK`8)aEChh~h4~?-0g;%n&8HKjpJSx;;A8x0q~=E|!95?D(1a}jsmCn1~TJ4fiSd^S9z!->?_2649VHDl0bakF*7S{t36-D31h z^}8X0A!H41S?mlFywBk>m&H}D)gK$Q)9|Z<_xZBu%zw>Z{jmWp;DDWaRqoXv8!%-- g-LF43FwEcQ2Z7672p+pVhX4Qo07*qoM6N<$g2boiwEzGB literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/donator/icons/mob/pets.dmi b/monkestation/code/modules/donator/icons/mob/pets.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5780d2c5647c1c5478d2635af2f5b556786b8b6e GIT binary patch literal 5218 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,-Zr9U*p8}!rkj>c|)aT?y8jvaF-m||K zp=TA0nsR(JV3LdNy4f)<{VX^ufK@2xnPp!(8Oj{#(j@2Rw zwHv`*%$AG26#0V;{30i{-vSc8>F$BZ_9g$Oe%oK_w{7tnZ)|mU{h@3Lg`PnumP(Mx zy+gi8HGogba}#VH*-~WG{RKuaao?|q$bu_UCMKpr=`;e)iN#KRb zrNqDbGquW~E@DBSf;`cm7iiuC^>85+7Z$})n8vtIx>fbECd$*dj$=3ICwId(hUW57 z(`S$mr0DL)0#|AJ7<(xKjzFBj;|gk@q9(SbO-|j9Jj+u$eT@E)nlADgV=UHTkfa)jW2Gn?X4jy+Wit%UVJ2UK=7WR{Ztna@t3F8Kz) zmTRvj&@Q+PB$Ya;TGZ=Sv$bB|>Gf4mJ1`V4_YE&zOrAX2zk?Wl_5IG|T>@JbIFiIo zALZnl9sqBT_V!*LW(?&}+|c2-pWg{0a1{8dRPI*HjS^vH~A$^`$u|^WOEqRLt-*Mv{ozXh<_LnFRwUy$fi0p zf^*)9l^7F6E;LOWL81e$-aSzeB}60T|M1MWPP)PxRnQ7K{{hWH0IPB|EG?u~B_;XJ zqnDG|?n~+wURj?wDsJ{uTNMzkd$it^0)C89`2K!ziiNfEftSY^NTy{o0nq&ItJaTR zUfxeB4&UBZZ5^Dg%^n*%+M^ ztFxUwdTJD5e>4atF*HFElC3&J2N+kqN7uqO-uq9c%!rkB66+z1aqjW)4YurjLV;a| z`JuW{65Ew+;ixc1H$>rq@!4=vJeCx9mKrZ3bH@Z4g6nJw;1X01rwJf;ZU~}dUw$%! zZFreH775n^#X(JD9=(0~eA$iBolzP}sPt#)mV6%qrxrBgYFz-G)^vqZ;nBHew(1{! z!cB4ff-{d3_99GkKe8}4<_1!52XK-C#nS5M_ipf$xwv~L?sJ_$479>0I~AVN?mILskTZq*Z^u zOOhL#P4d{)y}@-Ig*=_XVeVs}p7>EzEK#lxR-Me8Eu8h19VNM=fHYqhzJGc7sx5Q@5N=EC+y z9JGM!AT&Pb{oYwsM6c*ze2%Filxuo-;UdTxE0`t97o+=2}TFqd~i_ebw2{G*ye-ke8N9<8SFYMEZbo#K*j z;1?IiQUXp5L_qL~Fde`GH_|DsxMau=vP>RfabZlVzE{PJ=Fl+@?k zGP&wsI1m;(K~UE`^XJxW(P$t|YzherpAhp*H0@mVd$6j{HKp}l57Itya814eXH*me z_VeL&zANMu&gYSHt@4K25Vnx=4K&8i0sMw`Gn4i}`mL>gf$=NC-Z+=*AzjWgjr3a+ z8pyykE=LKMBoEB@a!|+31SWR=a6&7%?mX08*#n4FHhh>>+UB}az^IV$3THeknDt|v z8(rfYTfw8{8{GgNX}3}NK8KEhx_fdGyuSiM+zWlY4^SCkZMxt!=9fE2teaMpa$DJC zZDQCZY<_r|Phjal?3B?00i32XjZ^K$Tew$^P1{)coTal=nidSF5i-*W5~ zM^(2^O9c*66#({~zV^+~fcN literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/donator/icons/mob/pets_held.dmi b/monkestation/code/modules/donator/icons/mob/pets_held.dmi new file mode 100644 index 0000000000000000000000000000000000000000..897b0b5374271cd3c93b6ae313c9b06c9ad38a0c GIT binary patch literal 669 zcmV;O0%HA%P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5sVqM;B|bO5B%>%lF*!qti!&v&s2HT1i!-e# zF*g;&HpHboJ|#6V1(zOW1y?^8u$usoQ7%XhVw33r00EszL_t(oh3%KIPQx$|hTSf$ zGC`hzSVl-4;SH=Hp^gj;VL?b_C<`hZ69ZExHW;HQDV003{e=9JW;CNGWB}A@N{PuRy}CR#>ikx#M=U=BipSUGgI=>-|Aev+OF+hmfN|Ji z`bo&QUe}avR9WY6hl#v~dR>%1LzUbyz9Bf<#dD;1@f_Iaf~tez6zaaP5f3{X%v)=b8ZZ3%Nr+8}0*sv17&fQ*|hCzu2>+v$7&S z48M>hV(k|gej&#cb9Ex(ej&%C*J>o(FC;60oVl&z<&q&g7=Ce}Y5fA{iJu7n_mN2C zh}ijnn0^6qm3RlxcxwpWl+)00000NkvXXu0mjf DKY}3B literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/donator/icons/mob/pets_held_lh.dmi b/monkestation/code/modules/donator/icons/mob/pets_held_lh.dmi new file mode 100644 index 0000000000000000000000000000000000000000..9bbfa5988042f5ba3a658120d6bd65fa7ee0b6d2 GIT binary patch literal 423 zcmV;Y0a*TtP)5|0^aY94V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sVqM;B|bO5B%>%lF*!qti!&v&s2HT1i!-e#F*g;&Hsn%PaP@Nm zn-2hPkR9YP-mB37006s5L_t(YiDO_G1;Y<8DhV(cDdJNhB5W)ofKLIdiHj-RxIkmwq ztRNI&A}c7TTUZ#NDnJ;(z@W~~z~GEf0I?zgNkJML1A~b%1Af3vKzVS)*8>L*Bu7NJxw+|Ssfmh; zifb7#{Qs}5rY56j)>PR(9jJ`4B*-tA!Qt7BG$5zADkP%BCAB!YD6^m>Ge3`kp<+&O zSV2+g_btQYfElvXo%}2qCN;x`84gQR)JG(W-nwbT;&fM9c!NJRW zAm6EjJBG1(L!m{S@QqOCs~cw=U=Gcr+ zI)Zw7YzBRu+`G0g1~__iIXQC8vMFW`aAcpvxlUn{=)wa#7-uwEHwj8P9pHK}bNbGm zGaDCjOuXF~DZl0bP`0IU;R24Eej%(p$IkKaaGp?QkX|LK5Z}Wzit2Wd0rMEMP#uV!Z0d!JMQvg8b*k%9#0D*c`Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1V_Y{s91`6g^ZLp~Tz( z00EszL_t(oh3%8;a)K}rg>&Vm)sT_^8j$$@57`X_r%Iqje>m-MU=oJ$e0z2=2yNQ* zw}dgm1iJ@VF<$Sdj1kVj%Q#_-t|s6pqJ&c%W6BAQq5vRCvz=EKCSby27IT6h{YjFf zX^PM;%l021`z+f9GvEU`#xy>X!`uj#0SFxgKf)yrbAA2v)o&gBBpL35fUa@c5^uMHE1(a_Al%N*?rG~z>)w${|AAnzp^vkMB$E z3idX;8JAO(4 zl#>9+T>aiPlOBeu_I41o4UEuqUB7o`3UKAECk+WE^?Sms|2~Tj+J7x;!}T|9dZWGo XZ%81m34}Io00000NkvXXu0mjf^tnrZ literal 0 HcmV?d00001 diff --git a/monkestation/code/modules/mob/living/basic/vermin/mothroach.dm b/monkestation/code/modules/mob/living/basic/vermin/mothroach.dm deleted file mode 100644 index 0e7a09ba2a8c..000000000000 --- a/monkestation/code/modules/mob/living/basic/vermin/mothroach.dm +++ /dev/null @@ -1,11 +0,0 @@ -/mob/living/basic/mothroach/void - name = "void mothroach" - desc = "A mothroach from the stars!" - icon = 'monkestation/icons/mob/pets.dmi' - icon_state = "void_mothroach" - icon_living = "void_mothroach" - icon_dead = "void_mothroach_dead" - held_state = "void_mothroach" - held_lh = 'monkestation/icons/mob/pets_held_lh.dmi' - held_rh = 'monkestation/icons/mob/pets_held_rh.dmi' - head_icon = 'monkestation/icons/mob/pets_held.dmi' diff --git a/monkestation/code/modules/mob/living/simple_animal/friendly/crab.dm b/monkestation/code/modules/mob/living/simple_animal/friendly/crab.dm deleted file mode 100644 index 181261689e1d..000000000000 --- a/monkestation/code/modules/mob/living/simple_animal/friendly/crab.dm +++ /dev/null @@ -1,13 +0,0 @@ -/mob/living/simple_animal/crab/spycrab - name = "spy crab" - desc = "hon hon hon" - icon = 'monkestation/icons/mob/simple/animals.dmi' - icon_state = "crab" - icon_living = "crab" - icon_dead = "crab_dead" - - -/mob/living/simple_animal/crab/spycrab/Initialize(mapload) - . = ..() - var/random_icon = pick("crab_red","crab_blue") - icon_state = random_icon diff --git a/monkestation/icons/mob/pets_held.dmi b/monkestation/icons/mob/pets_held.dmi index 2c255778430d84f5fb8a33c2f2ff2c86111e6d15..fad72b134944d4f0dcf4ff6e2e17f882751c835c 100644 GIT binary patch delta 550 zcmV+>0@?kI2+9Q|iBL{Q4GJ0x0000DNk~Le0001B0001B2m=5B0M$l^3IG5Aa*-uH zP9PH&Z$f9Y3m2?1GK-*2YbGimrH(+xIwC-S56-_{0H>3u;v=H|uB z=`DYnpb$f;c)kDz==@Ao_^9YDgn)+tflvVpJRLp?P)1Yv2G>6|Kf{;EFa?wI)%{mw zwy=l=RF4?CAOsx(wa$fN{sEuzKR&;+d_?;t)xf<#f*=TjAP8SrP1C{U7O2bZ8|z2` zuje!8EM9ME$7Z`>6E-_mFT5`m;5DCg)Z2fWEofdFRxj{+f4}9kr^K;8?4urkA0tu= zj_omS@<2~9G3u5-!uN*sf^1Aa-oumg#}z<)l9)sRf157|f*=UOQ?NSm`YARbL^xj} z1Hk%no|4~oyO?FywG;B2u8VoPu1Ria`}Pob9nhARf9?Ab`Pk6+*OdHyJq+WV!%!y2 o=a?Vzf8$PR5ClOG1VMOiZb=pl^|X%I;Yw?^dJq2q z00M?dL_t(|ob8xfbJ{Qvg|TGWfKx-7D;NqS*!ULl|NmWACQWBRD+}i#ZRUKF;2F+p z&tWCMXf*n#2!xb@OAm!pS0V~x!RsOpBB6La7UM|}f5yBXs!$4E7eYjFJZ2*X<2a6} zh)%fFk!zyQ*m zGRFw!e|~M|tpDs}!v{#yFipANIhUSWE4ZYyv*$UtC+p;vOW=9|{xT7slL7z$0002s zYxwzD{m!l5^)058iIR(sv;e?0st!EX0DIKXPjZqa77-}^P$?^ljF z_9fu`uWBc ze*jf#o6?*;FLYg3x~{cN*Hzv1<-&i^c1fv`Pu2^UW3B6>b*Twv#>0jGpy`H4)q?`) zqdwZR>snXZv#BPm0ot?Yg|1K7bn|^_moB@MrrIJk?}v~-1GELz(S8PKsHMjabbC-% zL${#PO!g5!n+x6tIV3=1&VY3QCY#>?O->`Qp8*fp-2LJ#7 z006!{xF5j%0PY9+!TkX42XH@t`vCv|004k*$#0?Zd1|eY+b6!&ezn`ceb&S|SZN%wXVn8+V}!=Yr2$0^RUt1SbzFlI*iBL{Q4GJ0x0000DNk~Le0001B0001B2m=5B0M$l^3IG5APLU-s zHe*;=Mn*<1DkkW}_7xQs7b-BMw%!2$|0^aYz`(#9E;jrpkc0pL00DGTPE!Ct=GbNc z004TCabJH#C@Ra(Oo`9UFUcs%PfX6hrCeFT)z1a&2mpG4C^ZNIQqBMX0Uk+2K~!jg z?U&JR!Y~X)J7A1aw$!tiD*ykZb75>1ag^3dB_8g1Xr){5smaTw>i_@%Y{bjfg58SL z!~U?h;@4(^1(9PekcmZxy1?8(G;JdoMbALSOweqD zanMOaF5s@w1~J|*k8vKBX!d6e00000z{cIFAJFP%ry;cIR#W-R=WEJI3tS69GzF2< zufSVcu+IPXQrIBf1<7NWbz>Iu3`FPOT5mEBsWN}ojSD^euT@i`^*hW3r7!FFtANQN tn7?+ZhEEm!`U33uiB_@kcmTk&@dLlg4_~m5#6bW6002ovPDHLkV1k99#iRfL diff --git a/monkestation/icons/mob/pets_held_rh.dmi b/monkestation/icons/mob/pets_held_rh.dmi index a72779552cada212e4efb74e7f36c536ed7cafc1..3088ec9bfa2ca74a09921f6290ab94bd59b961e8 100644 GIT binary patch delta 280 zcmX@fa-XTbGr-TCmrII^fq{Y7)59eQNIQTq2Q!eIyS?!ZkTMSN32{Ae-~gYPn1Zla zzEk>UZt*onMnRcVY!qCMZrZyga}BSkXthID_riP9)-kgdq`x@wZOOKK|JLp=0%~V0 z3GxeOaCmkj4amu?3W+FjNi9w;$}A|!%%3MIEaj?(fan9H(!GR2g`-5?6phl-qlCxGn`a;eCWj<)y76u&CV0AeR2-?ls%htvEk_2 zYg?N>=Vr(4jAmzU3O&pw(XgJ&W%UK-L+9r53J6Z*w>t4t_`gt1*olVjIsa|HoD{0O b$9v%{qp!fyO_|m}8yP%Z{an^LB{Ts5Io)nZ delta 502 zcmV#- zwm0-tuMI+&sQt9I5uejm-)$v$?jf6h(;e=8#{)y0|VZzU6dE5FXIkU8R7Dv{1*GYH^h98KcQ!1Edl&k*zU~&*V5Wya z;y5V~3k4`W1(GqrU^wSn&;E*U0%~$olF2uaVS)_zOi90of^qz1TjtwmEl;-&JC(3< sN(A(Z?ic^Ydk^~=R}@|w1OR|BKj3>1Se=r4QUCw|07*qoM6N<$f**3vB>(^b diff --git a/monkestation/icons/mob/simple/animals.dmi b/monkestation/icons/mob/simple/animals.dmi deleted file mode 100644 index 4156ff7627873aa1397a12becc8f53b5a4fbc5ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3696 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 Date: Sat, 9 Sep 2023 23:15:37 -0700 Subject: [PATCH 04/10] makes pets non core spawnable --- monkestation/code/modules/donator/code/datum/loadout.dm | 5 +++-- monkestation/code/modules/donator/code/mob/pets.dm | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm index 56dfe930024f..6fb31dc16e5a 100644 --- a/monkestation/code/modules/donator/code/datum/loadout.dm +++ b/monkestation/code/modules/donator/code/datum/loadout.dm @@ -21,13 +21,13 @@ /datum/loadout_item/head/pot name = "Dented Pot" item_path = /obj/item/clothing/head/costume/pot - ckeywhitelist = list("unkown") + ckeywhitelist = list("unknown") /datum/loadout_item/pocket_items/donator/spycrab name = "Pet Delivery Beacon" item_path = /obj/item/choice_beacon/pet/donator/spycrab requires_purchase = FALSE - ckeywhitelist = list("unkown") + ckeywhitelist = list("unknown") //spinnermaster @@ -49,5 +49,6 @@ /datum/loadout_item/mask/zoro name = "Zoro Mask" item_path = /obj/item/clothing/mask/zoro + ckeywhitelist = list("happiestplane") diff --git a/monkestation/code/modules/donator/code/mob/pets.dm b/monkestation/code/modules/donator/code/mob/pets.dm index 7761d54b4c0d..7773898f6426 100644 --- a/monkestation/code/modules/donator/code/mob/pets.dm +++ b/monkestation/code/modules/donator/code/mob/pets.dm @@ -9,6 +9,7 @@ held_lh = 'monkestation/code/modules/donator/icons/mob/pets_held_lh.dmi' held_rh = 'monkestation/code/modules/donator/icons/mob/pets_held_rh.dmi' head_icon = 'monkestation/code/modules/donator/icons/mob/pets_held.dmi' + gold_core_spawnable = NO_SPAWN /mob/living/simple_animal/crab/spycrab name = "spy crab" @@ -17,14 +18,14 @@ icon_state = "crab" icon_living = "crab" icon_dead = "crab_dead" - + gold_core_spawnable = NO_SPAWN /mob/living/simple_animal/crab/spycrab/Initialize(mapload) . = ..() var/random_icon = pick("crab_red","crab_blue") icon_state = random_icon icon_dead = "[random_icon]_dead" - + gold_core_spawnable = NO_SPAWN /mob/living/basic/lizard/blahaj name = "\improper Blåhaj" @@ -34,6 +35,7 @@ icon_living = "blahaj" icon_dead = "blahaj_dead" icon_gib = null + gold_core_spawnable = NO_SPAWN /mob/living/basic/lizard/cirno //nobody needs to know she's a lizard name = "Cirno" @@ -43,3 +45,4 @@ icon_living = "cirno-happy" icon_dead = "" icon_gib = null + gold_core_spawnable = NO_SPAWN From 212e5092ae7ad02a8d976fd1fa1e88080b0b34e0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 9 Sep 2023 23:16:21 -0700 Subject: [PATCH 05/10] adds vars --- monkestation/code/modules/donator/code/datum/loadout.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm index 6fb31dc16e5a..a2a80767e56d 100644 --- a/monkestation/code/modules/donator/code/datum/loadout.dm +++ b/monkestation/code/modules/donator/code/datum/loadout.dm @@ -3,11 +3,13 @@ /datum/loadout_item/suit/cirno_outfit name = "Cirno Outfit" item_path = /obj/item/clothing/suit/costume/cirno + requires_purchase = FALSE ckeywhitelist = list("bidlink2") /datum/loadout_item/head/cirno name = "Cirno Wig" item_path = /obj/item/clothing/head/costume/cirno + requires_purchase = FALSE ckeywhitelist = list("bidlink2") /datum/loadout_item/pocket_items/donator/cirno @@ -21,6 +23,7 @@ /datum/loadout_item/head/pot name = "Dented Pot" item_path = /obj/item/clothing/head/costume/pot + requires_purchase = FALSE ckeywhitelist = list("unknown") /datum/loadout_item/pocket_items/donator/spycrab @@ -49,6 +52,7 @@ /datum/loadout_item/mask/zoro name = "Zoro Mask" item_path = /obj/item/clothing/mask/zoro + requires_purchase = FALSE ckeywhitelist = list("happiestplane") From 01189447524508052b849cf6b909a5b5f5d5efad Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 9 Sep 2023 23:19:28 -0700 Subject: [PATCH 06/10] wait the clothes aren't ckey locked dingus --- .../code/modules/donator/code/datum/loadout.dm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm index a2a80767e56d..aa29d5d88a2e 100644 --- a/monkestation/code/modules/donator/code/datum/loadout.dm +++ b/monkestation/code/modules/donator/code/datum/loadout.dm @@ -3,14 +3,11 @@ /datum/loadout_item/suit/cirno_outfit name = "Cirno Outfit" item_path = /obj/item/clothing/suit/costume/cirno - requires_purchase = FALSE - ckeywhitelist = list("bidlink2") + /datum/loadout_item/head/cirno name = "Cirno Wig" item_path = /obj/item/clothing/head/costume/cirno - requires_purchase = FALSE - ckeywhitelist = list("bidlink2") /datum/loadout_item/pocket_items/donator/cirno name = "Pet Delivery Beacon" @@ -23,8 +20,7 @@ /datum/loadout_item/head/pot name = "Dented Pot" item_path = /obj/item/clothing/head/costume/pot - requires_purchase = FALSE - ckeywhitelist = list("unknown") + /datum/loadout_item/pocket_items/donator/spycrab name = "Pet Delivery Beacon" @@ -52,7 +48,6 @@ /datum/loadout_item/mask/zoro name = "Zoro Mask" item_path = /obj/item/clothing/mask/zoro - requires_purchase = FALSE - ckeywhitelist = list("happiestplane") + From 20c20be31e5512e777bda3a4e4072c56a4b9fc20 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 9 Sep 2023 23:42:55 -0700 Subject: [PATCH 07/10] store items --- .../modules/donator/code/datum/loadout.dm | 2 +- .../modules/donator/code/datum/store_items.dm | 25 +++++++++++++++++++ tgstation.dme | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 monkestation/code/modules/donator/code/datum/store_items.dm diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm index aa29d5d88a2e..596557496f41 100644 --- a/monkestation/code/modules/donator/code/datum/loadout.dm +++ b/monkestation/code/modules/donator/code/datum/loadout.dm @@ -40,7 +40,7 @@ /datum/loadout_item/pocket_items/donator/blahaj name = "Pet Delivery Beacon" - item_path = /mob/living/basic/lizard/blahaj + item_path = /obj/item/choice_beacon/pet/donator/blahaj requires_purchase = FALSE ckeywhitelist = list("ruby_flamewing") diff --git a/monkestation/code/modules/donator/code/datum/store_items.dm b/monkestation/code/modules/donator/code/datum/store_items.dm new file mode 100644 index 000000000000..1adb54f7b779 --- /dev/null +++ b/monkestation/code/modules/donator/code/datum/store_items.dm @@ -0,0 +1,25 @@ +//bidlink + +/datum/store_item/suit/cirno_outfit + name = "Cirno Outfit" + item_path = /obj/item/clothing/suit/costume/cirno + item_cost = 4000 + +/datum/store_item/head/cirno + name = "Cirno Wig" + item_path = /obj/item/clothing/head/costume/cirno + item_cost = 4000 + +//ttnt + +/datum/store_item/head/pot + name = "Dented Pot" + item_path = /obj/item/clothing/head/costume/pot + item_cost = 4000 + +//happiestplane +/datum/store_item/mask/zoro + name = "Zoro Mask" + item_path = /obj/item/clothing/mask/zoro + item_cost = 4000 + diff --git a/tgstation.dme b/tgstation.dme index 9404bfdd317a..94e7c7145b4b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5727,6 +5727,7 @@ #include "monkestation\code\modules\displacement\displacements\assets.dm" #include "monkestation\code\modules\displacement\displacements\large\apply_large.dm" #include "monkestation\code\modules\donator\code\datum\loadout.dm" +#include "monkestation\code\modules\donator\code\datum\store_items.dm" #include "monkestation\code\modules\donator\code\item\choice_beacon.dm" #include "monkestation\code\modules\displacement\displacements\large\assets.dm" #include "monkestation\code\modules\donator\code\item\clothing.dm" From 381ae36ae890aefe52f9c772f1574b5e57247472 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sat, 9 Sep 2023 23:58:06 -0700 Subject: [PATCH 08/10] mr krabs you cant be evil --- monkestation/code/game/objects/items/choice_beacon.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/monkestation/code/game/objects/items/choice_beacon.dm b/monkestation/code/game/objects/items/choice_beacon.dm index 1a80a7738e9e..d0e649f7f81b 100644 --- a/monkestation/code/game/objects/items/choice_beacon.dm +++ b/monkestation/code/game/objects/items/choice_beacon.dm @@ -20,7 +20,6 @@ /mob/living/simple_animal/parrot, /mob/living/basic/butterfly, /mob/living/simple_animal/crab, - /mob/living/simple_animal/crab/evil, /mob/living/basic/pet/penguin/baby, /mob/living/basic/pet/fox, /mob/living/simple_animal/pet/cat, From ec1ddc3966560cbdbfd102de20a518971d858b6d Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sun, 10 Sep 2023 00:01:53 -0700 Subject: [PATCH 09/10] alphabetize my balls --- tgstation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 506f528812fa..3e4472d11e43 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5749,10 +5749,10 @@ #include "monkestation\code\modules\displacement\displacements\_base.dm" #include "monkestation\code\modules\displacement\displacements\assets.dm" #include "monkestation\code\modules\displacement\displacements\large\apply_large.dm" +#include "monkestation\code\modules\displacement\displacements\large\assets.dm" #include "monkestation\code\modules\donator\code\datum\loadout.dm" #include "monkestation\code\modules\donator\code\datum\store_items.dm" #include "monkestation\code\modules\donator\code\item\choice_beacon.dm" -#include "monkestation\code\modules\displacement\displacements\large\assets.dm" #include "monkestation\code\modules\donator\code\item\clothing.dm" #include "monkestation\code\modules\donator\code\mob\pets.dm" #include "monkestation\code\modules\events\wizard\summon_gifts.dm" From a688e6179f8f9368eebbe17cadcab409c1f13922 Mon Sep 17 00:00:00 2001 From: "DESKTOP-M4GD565\\LME" Date: Sun, 10 Sep 2023 16:19:38 -0700 Subject: [PATCH 10/10] fix delivery beacon item names --- monkestation/code/modules/donator/code/datum/loadout.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm index 596557496f41..ea5eebca6c2d 100644 --- a/monkestation/code/modules/donator/code/datum/loadout.dm +++ b/monkestation/code/modules/donator/code/datum/loadout.dm @@ -10,7 +10,7 @@ item_path = /obj/item/clothing/head/costume/cirno /datum/loadout_item/pocket_items/donator/cirno - name = "Pet Delivery Beacon" + name = "Pet Delivery Beacon - Cirno" item_path = /obj/item/choice_beacon/pet/donator/cirno requires_purchase = FALSE ckeywhitelist = list("bidlink2") @@ -23,7 +23,7 @@ /datum/loadout_item/pocket_items/donator/spycrab - name = "Pet Delivery Beacon" + name = "Pet Delivery Beacon - Spycrab" item_path = /obj/item/choice_beacon/pet/donator/spycrab requires_purchase = FALSE ckeywhitelist = list("unknown") @@ -31,7 +31,7 @@ //spinnermaster /datum/loadout_item/pocket_items/donator/void_mothroach - name = "Pet Delivery Beacon" + name = "Pet Delivery Beacon - Void Mothroach" item_path = /obj/item/choice_beacon/pet/donator/void_mothroach requires_purchase = FALSE ckeywhitelist = list("spinnermaster") @@ -39,7 +39,7 @@ //ruby_flamewing /datum/loadout_item/pocket_items/donator/blahaj - name = "Pet Delivery Beacon" + name = "Pet Delivery Beacon - Blahaj" item_path = /obj/item/choice_beacon/pet/donator/blahaj requires_purchase = FALSE ckeywhitelist = list("ruby_flamewing")