From b8e81f31d376c184e904f1a3d8d7866a30f67565 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 10:18:37 +0930 Subject: [PATCH 01/11] Fixes #5595 --- code/modules/mob/living/carbon/human/emote.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 591e4426e0..d4050c06b8 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -66,8 +66,10 @@ return custom_emote(m_type, message) if ("me") - if(silent) - return + + //if(silent && silent > 0 && findtext(message,"\"",1, null) > 0) + // return //This check does not work and I have no idea why, I'm leaving it in for reference. + if (src.client) if (client.prefs.muted & MUTE_IC) src << "\red You cannot send IC messages (muted)." From 4f032ef7f4c19faaeb691ba93ee11007f43ff029 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 10:43:47 +0930 Subject: [PATCH 02/11] Fixes #5600 --- code/WorkInProgress/computer3/laptop.dm | 49 +++++++++++++++++++++---- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/code/WorkInProgress/computer3/laptop.dm b/code/WorkInProgress/computer3/laptop.dm index bff5a116f3..b88f782c2c 100644 --- a/code/WorkInProgress/computer3/laptop.dm +++ b/code/WorkInProgress/computer3/laptop.dm @@ -30,18 +30,18 @@ var/obj/machinery/computer3/laptop/stored_computer = null verb/open_computer() - set name = "open laptop" + set name = "Open Laptop" set category = "Object" set src in view(1) - + if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) usr << "\red You can't do that." return - + if(!Adjacent(usr)) usr << "You can't reach it." return - + if(!istype(loc,/turf)) usr << "[src] is too bulky! You'll have to set it down." return @@ -69,9 +69,42 @@ if(Adjacent(usr)) open_computer() +//Quickfix until Snapshot works out how he wants to redo power. ~Z +/obj/item/device/laptop/verb/eject_id() + set category = "Object" + set name = "Eject ID Card" + set src in oview(1) + + if(stored_computer) + stored_computer.eject_id() + +/obj/machinery/computer3/laptop/verb/eject_id() + set category = "Object" + set name = "Eject ID Card" + set src in oview(1) + + var/obj/item/part/computer/cardslot/C = locate() in src.contents + + if(!C) + usr << "There is no card port on the laptop." + return + + var/obj/item/weapon/card/id/card + if(C.reader) + card = C.reader + else if(C.writer) + card = C.writer + else + usr << "There is nothing to remove from the laptop card port." + return + + usr << "You remove [card] from the laptop." + C.remove(card) + + /obj/machinery/computer3/laptop name = "Laptop Computer" - desc = "A clamshell portable computer. It is open." + desc = "A clamshell portable computer. It is open." icon_state = "laptop" density = 0 @@ -90,15 +123,15 @@ set name = "Close Laptop" set category = "Object" set src in view(1) - + if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) usr << "\red You can't do that." return - + if(!Adjacent(usr)) usr << "You can't reach it." return - + if(istype(loc,/obj/item/device/laptop)) testing("Close closed computer") return From 8ba723695f4a756835dc59eb1ab0c28525527c64 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 10:47:45 +0930 Subject: [PATCH 03/11] Fixes #5540 --- icons/mob/species/tajaran/helmet.dmi | Bin 11193 -> 10957 bytes icons/mob/species/tajaran/suit.dmi | Bin 5157 -> 5159 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index dc431a835afc4fdcdfd8974fce1fdf4ce881a6c1..7316d42bb398f3b61064fb61bd28b150df45f2f0 100644 GIT binary patch delta 10210 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 RARGhzQBl-XD3`Mg{U3m#C!zoV diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi index d0eca318fd2b655231346279ebbb3a3c24f492b6..13eb7174d941c17463cfb89d809adfa7497f7e5d 100644 GIT binary patch delta 4699 zcmV-h5~S^=D5of}_yKqgJlO8cIG zx|O{`3D;6#ufl0quDIn=u~;mX-Ab8bP%gV}sZ_{Su23kIT(`{L?`fZ=SNWP(@t&@F z-oEEm^*t6ZSN2@6FBRN9Rzav;Dc%3+ehF9Bz&$W16~RH)A0R>y0~rC@`xh)w(Enea zX72TM)zoS~*J^*Js(p?*MM$ymOQ9&l2qtdNdSDMT&FEIH*bpn03cpDD|6*bAuavV^ zdRiX@+UVdwvo5GB-8l3fc!v$G>YRRshb36>EA%ftEMzsLsViF#kfB-m_kVKj5&>BJ zmDm4QSnt|ZVfBZPw*4eRddq-mzEXQ;a+KP{m$LQ4Ro{~fbe>D zBf5{x#ijKPGlZj#5ZVf`VY{0iFsAOn0-+;g+ITPY!xC{^4nZarWPC|9I|&`Gh>fDI35;~Bq+7-=9vnm7seHw@Ts zXq*E^KhfAl?-}e?i~+?0Bvi_UVvYg#B?BB<`SklQcz_sHG7+R}4ULtn)FA@=v5yV2 z@fm-P&oH1FsHzH@c=xo%89;~Ro@-Y#Yd~O+sbVQ$4RF%i=$v-BP);4Dcek~QP2XItXGDj8Rb-PiPN_7S&!bzR3 z&!V{IYqzRfE&urFX!Cz8)<;Ljb=3ymR`uf}ojt27dvws#af~f; zFRKFZy4`|`#X5(R0SIj*B2u>MkR!3hxm+UQ93A7VZTZ@7;ha4_V(~Ushu>_oI8o^# z9rVSAQZiFt8^|5x)_@8nQ`z|Viv-H{gj_J)N_~2fCGJPcTvl|MzD|DTD##Jvz)vrYs1cNK+{cXli9&n}S0hjdWV+2;wa~!34Ir=;60dNyH4aOkLeB3l9 zn`?refqs8}k8puGQaH+~D_9AP1@shBNt5A1W}l&_G14DPoO@RIQv_hw4rG6x%8;Tx zKJX849@iNQ{NL|AfByVl`!V5y{tq7_i!QjhaypO)2rm^F+)e#LiR?q!0&LNg^Zq&h zGyPjFWI+xxB7P(FegE0Bw$nzw!CO$WbaVN3{LeA60eNuU(#_@D@g41GM?2clKY_NZ z@Betpt?&Q+snh8w{M;3L?dgAZyZxn67^2zow^a`pQN>Q@3i}6gVvr89kutA zGXQ$o`hJI3u&z3%w!VMbVY5lyc>($4Mp?dvm44A-4e(y7mTGzY{MvsJ@R5fh>LugD zX3KO=UsZMW)oDkl?{`jYb@`;j)%R2RsT(Evsdst#B;vqV?MKFl&zw~HHjmoM&lb0B zeILRb)dplp^?g{d5B=Htekwn8qga-(-eu)m2F94S=Xs{KS+-kKt!4nXF^nCut+%*J>9Sq>=`4RmdY59T=e8gV-tU}_5IGtt6HP>3PJwu z_5HQ{)Qyt-)Vo!$!GDvipH}tJaohJip)S+(JimQ>q?v8X*7q@a>QG^pzN5asmR~<6 zH;VGX`xt)Yc5%yr^f#uaxm}JnLR~`$v9)bm-#4fT@~w9bCx1P{ zrxp62L#Z;>)Q5lnp>^(ayEu%0_3Bht_35iu-&NnY@>4fT@>B1!^3wqaWPwyVwQA5J z;kV&isP995>PAsKc~?uv02p8jT5X+|i)ak+xjm3*+xq^t@~sD2rk2N`W?F&=obBuT z+sa2afcu49b*+P^i33}FrF7EP_xW7WW^1;-&!=KH@+E)thJ`HOX} z(Dq-l3=Gmqs_(z(2=)Dwj;-%Y2Bz{Q^b-qFJ|fU*Q*}N!2DNFn9U%(0tM6|ozu9aa zy!0t&Y~?-^wOf=(`Y#Wfj161V_qUag-`e|MzC7@mT>j5-E&t%<%alV#%Ps2r+spSs z>7~_D;v9dpRjc)B;O3uwZB^gD1^MZSltc!3@NLxhw~@c29qnjGJNj>+t*i5QUEa^* z-v!)L_9_ne?8-6d=P}rlzMxfcQ11zp&eApij27@nYi6I!s z^It2-@{i7Uu9tc>ROpK8zt3Erw>k$BH zOq_omu~sk&BVIxHE>z>!@mc(OtU|`k6q>642F`oaS4=FYc8Es^9puH-Cz_BCZow990mBa$$)+rkZcIC?>RiS9*8-d3^2wF z`u)Di`ZuMs$N(N-Sk{14el!lp5i7qNBldsn>Ig>&)Hq|n2)~2=Z{jzw0PjZ(9-jw) z?Eev*#|#cKqtR$!m#F9gT1W#7%RUv8PSF1~A|xXD;paShy{@VUA%Y7(K^;pi!vIdH zoAXILIX87UZ1X^|cpUuk;Ey2YaI!IuCnL=7`7q`Uh=&NF!DxbwCWApI$d4dDBKd#e z#ww1^dLyUady6&jwui^M(Iy9lupEt)iTklpKqng-uJJesf*AN{6Hg78U;z&LdEYPe z;Q$)835C%pvhv4PemIFX42Z_PQSa@j7xhMOd!rFPe9i!YttOaP^#+mFohW?%Cfph@ zit&HY?f0`GZfVl*cL%W@mNj4;TK<2pEr0CzhR)qUy;VUM@1l6a0BA_lI-$KB z*HK2lFX5>L(BGJNs8|aoY8WGgz$hC*G{M9_9EX;FZ~QrnnD8J_y>U+k0eo?`8K#OR zW-=L`4<{3vqU;*T$E}9l0c9Kgq2vL=u!_439;W=UNK^is2O0E_>#E&*+iQQTdOYfF zI)EY=3u!VMjwY(^FstlKxML3j+J(e}7)KfHLfkR%iGP?UzuoQjy4|)U->FX~^%1=Y z;=hDX-~yyNdASfJOWld!p)bl;ZJZD}{R7HO>c7<|Mwr4t#TJi;+yZb?4`3t7GXQ&x z-~mv$mY+$~QtI`vz~hNhO#FYO`p1E-?*}n&0q_`jEa8)w^v4pE4FE_M#Hx2IsMUD&R_x#c_9S$lYt|wf-to5!%%;a-|JcVQUuu; z##W3FW%=W`lmtxJ5T4NH*LBFlxzA(+g(1kySQ%T$w^T>MMrToXRA;v_a0~VQK}wHg`(g@A9{KMY^?h6L!x9%U{HH7*X?~mMLk>30ch zKxpgxAwR!%1bh_Q`aTmw&6Y{l{R4^6KagD5{(*}`?jK0qnA1N1?~45cH}(CoY`|Eo z?^FK(gj4^(MI!YNz=D0~pVL2(x>4>QAYAMpu=V{A52mqHU5@d*8uImh>K{nf{R4^A zKakk|fh4zoAjyC4A4u~02cihuP&9^;JOcn@8WBa=vH|_QD?C8`0~d+ZKagB_PdrR< zUjG2OQSKig?@IjxAwnD*DMBccJP;v-u!&-kWK5*~fn?o3kZjXGkmUCdBy#@%eKklE z9Ol*cL+hff0k(f2xv>2M2=XoZ2gr?b{{VSc>>r4taYTRh{Vj_0SW!YLhK({*Y~6RH4x?0_kU#nz^&Bxe_;Q>?bP>wWdFcz)c5}m z{R2O`zQ5}q*wK!5w4)u}DNTufv=Up;^!;o;d!K(}!R%|eeAS@uqQ&B`mn==+&zGy^ zT()4gdjI}QLf*e$-IWE?<%(3Bu9m!p)AyG%cwlxZSukBLrnvV?RB(2MG1G;>e_NVf zO_v`K;vbfH$Ki|1s~J2nySiNP8Z4&QSJT;aDp@eQngYJMo=Ps>iWZk2r;FL@!)mse ze!PFoidbAOt}f^B!2I%R!Qde1e+f6vrjh~E8N7Q53vN~O8|e#7@nZIVhSw=G#e`qk zHE_k^AXrE$<{3cdVFGSd^R<2y7}pTLnq5<{Y-(un#T7h2`e$)FX0cd6#Siit_yF@T z=q^04xQ1evHpVZZ==J6#S$q!7FBfwTCnA3%?G#8tEGSsNEzKw{K6wB$$>8&qT?4B* z-g8P~4Wu5J^D^eC2kvGKK=nC1@B!j4r}OMA0*42d*Z4QXM##=GqGLHHY{|=55|jBd zJ3F^QGunPWS`U1r%_w8Qht(AGPA*tXr+l2xmP>dCXT^$_0SC_D#^v%(48WYu=d*w1 z2l#kyKV|R*t%FO7|3wy0$E@bgJZF=kjo6v5?&c^4)A5u}2X_wlI_;glt)BtV#CBmif-uBPCl|9{ZA=5<(G4C`*zV zgRx{M%VdmYW?s+x`@Qe^=UnHy?)!5-%YDvWAy+2XKw$t*-7wI%4$Iqgym2O5r`D!*PT@vFlJq{+|V`V;ye7I9q*G zvAv9u_K+Fq*dF(c@;{|>_uOVAy&D7@mC78|rc5|g_i#tp{9gqi!XjI3v1ZwmZ%$&Td_xYuf2 z)#Z!GnWlz=R$)p?&m?-YVGi=0;}2@F21_^N3|4P(y)VTm4B^JUads-CFNtD&CgLme zQuIiL<7}qyibQPqnj9d)5H9ZM5GHO6!0}A#w?x*kB2_7v-x#K{Z1BEjEyFc~xvXs< zUkaD2;VjpAPNpAg8AoO{JGVjRteNp1ccDuNwt8>J(1H*Trmgq7NF8S=Y-?5TS1~38 zwxfXhrWW+F-#m-jBvdb4Cz5-*Z*KkvEncMC#tGfS z+hs21weT}Upu)n2uL7U(!SF$eQ%y>>m+=0S!XH~>IT>RC^<)Cn4l*FHDj9645Q36o zoDBQoFKKxCYpSeYG?f!V7CF6-88ufm8;xYC5LnP_1aW2t6}?*Mit1-bc%)0E#Y0mI zjb&qkYl|8mW@;HkBgug%wU0p8jtbn1rK&1gc1EW*kZVNd{qp4WH!W`5gDN{VJ4oJN zw_x-3$UJJ-tZUVMzUoU{?|>1X`|#cGV7ifd2d5Kanw{}l7`M2f`Gef*nAWT$HOAJe zv)R>2+if~>CS_VNd~@YypJ~NFt6^nhD1Cof zPM#@#SIpT{#!8TXWbZ0ZYTD;X^U&H2y$Bw5v6Y^9ESTjeI}~KILW&#~xWl{}oFHJb z!Roe?q{GlS$_$Zwy4;(X_6~_P8D|4MNyqKDA zw<5`F$-xk?(MN(eoQBIYO{!AM_3>SR!}{_*x=%(H=YI~JggK`JYjsB!NNp$OFTDOX z*hsWj5jUN>cq-;BDRAtSPc3T%*CDl6r<-|BZtit?9qNp-*oc*pjAA@{_QUx6FJI9< zfq(4h%mpycz~EQy%p!xx$Fqo8-8vO9N+&ULXTJ9X*{z%T2%&2r;2f|sfY;*@@32M% zsHdH8IC6(!ptx95R(6@*RlO()c-&k-RfL1^@|*)oOV zPXA4@>uMQ)4v~!bJ)Fsqss-Lq;oG>}NTu@4TzLf?zac$bmbs(pgb4j;3oO4P=^^)4 zipKVTLs)8c5Nh6A^2?x&H&iN@Kgv18%m<*C_SmMkk$4Z~pT0q}pQFC%(VG2WsW`q% z0ruX(6JJ0C_mZBty!FsJQ(xV7cvvd+cmHxepE#o>(D^VLnimYpf@g)2<{Sqz7KX_>%?kp$e;oV>5XWdR_P zm&dhheuVzrpEw*-Ha;9%iNKZSCFlF$n8{Ch{7gKa8cIa$mI95ecp7?{5>k6BGDVtB zrqLXL)7NhRr>CnXX6b1)1-5&mZ=1KmuiPzP4M!j0UwA%~ClLGQE3d}c96tLOO%;y2 z^%I64<~IDp-@^M9?dF|xd2vPj=cQ6^0->2oO;6{W9-+{5s8s8JBX_3M&Hb&{d^}l1 z*UZpz18zo95R=Qgp-DXl6ZPi7HU%AMsxvjJ`u}=@^w1E8mHw){6r;upa1gHmh?8=X z*5un9+E~OvCL`YK9S#ODpO%O8ihYlc2x~1oUfB-$n4J5pJORyHTmIFEageUk&#DI^ z+BbP|OXo7vn>&XmlA0afQlmcdw*$YFiY6r8sb-{1Vm#GS{vI>DJEobQB!IFovjpfK zhAUf$P#@rKkn*@vQNgvu!xvby+&0pC&DS^IZbI!_odMu7^}8o&Hq-o)+qwPh*VDyU zegGjO?vHWBot?Gl<6mgncs017a*_V~!2zWHP8sh-Tfb2v@lGeq_^yK@AXBIB_|Bm~ zSe=fau%%KRM+$;UrP;p5_?L8crqKRnBoWX;d%7FrA}WEdZVp4sI{; zQ)YvtkGgX|V?1t>$DoB${p1?AG_{*~5>K2%`3uJ(^<)1R^|G&~|U#Be+@0w`rq@6=bX=_mf~zHQNGI|$XYSX=VpH6Jn+Wgv7|D2PD-ZHm-M0*{|A z^h4Jp)t-h!<|Qn>lyhba`%w+7hf*ugjeu65F}Y-H=4<8tj0>z|eXh~3NnT$<(NM}` z9__rhwu%_lw#hX0lBNc%9Vej_mE=Dz(F_@{F-A zLZQOiri*Ur<-6)i7jcLQoA&*>30q(<>?eT( zm{kRJ6wZ7%4rUg# z_N;lP_}8(j1Xa@h`f}CVzEj@+g#By|yB^ljjJ$qBvHy&2#*dxJ7*jFdA|zEiU$xD* zVp@O}rE8HxCgKiprAFl-jQ)+MicG~FV5LLR;{62x!f1C1QVi|0P>p}l0Rp+rCl>n=V8fiuUTxRbDjE5;2 zf*Em@lfb-(_OTkshCf?|2a)0ft6TK12Uy3Gt?K|w_|J*3vPBnNf}n!|K>fcmyWD1# z!%Ov&YA#$&z&|ES^Z_yW38RCv$z#H``B(e6Ee1# zWSU!-)e$!a6H+liJ(37lc0OND*(mdx-Qd+8ixUSNbMBbEM7)?sybSA`OHLjXmQ-%< zu-g_?D8K!33?FF zIFh?iSBSpUUhIx<8ktWvF~DpL&u86hwCno(d{>MD-R}w(;<0o3)WDv*Af)`)`{4@( z-GoJXJEeG5Sy z!g(mrJ)yDiM*>(W#=&#P>OJ~j>n^@=(>&wTziyY7dT_B_t3_W$3$2TXJ}&N&Tj=T= z=U+FIursZAoIjjpVgL#4O`5=hhPb~h?wY~7a)y@QE&_(1!~B4OS@ubYPzF6&A%C}K zX-IoHwI~LcUH@n4Z2ZUp+n~B*7hCzAY@UwRfb)W%yRwz<4tWlpRqDN;UXzFSk@rdS zWnH~d@j)7m_Tceh%6CD>jd$iKEd?=w=HKM9Gd7nUtOXsi(w*z<4vg+ppF%@9S{LeU zxAmTZHh{a%b6OozkSsFS9jEQxRcH=<@zP*JF%%^-$kQcQ4&7#NxFpdwX3lPa`B3J= zWT~dhNGc<};|cg9%VhD~A+$}Jvj%&A?flYXrhqWCFH>GS8-tfIQCj1YtHcEja*y04 zY3A40YM#|9F5bW3>_6WTp(9j~mUwMwZAh_4RP$Ctp*NaA{e0|ARCdtLeYPaAZ&sqA z3tjJg9!Je9G Date: Mon, 14 Jul 2014 11:42:39 +0930 Subject: [PATCH 04/11] Bandaid fix for #5589 --- code/modules/supermatter/supermatter.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index 129f54daa4..e7e3cc4972 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -123,20 +123,22 @@ shift_light(5, warning_color) if((world.timeofday - lastwarning) / 10 >= WARNING_DELAY) var/stability = num2text(round((damage / explosion_point) * 100)) + var/alert_msg if(damage > emergency_point) shift_light(7, emergency_color) - radio.autosay(addtext(emergency_alert, " Instability: ",stability,"%"), "Supermatter Monitor") + alert_msg = addtext(emergency_alert, " Instability: ",stability,"%") lastwarning = world.timeofday - else if(damage >= damage_archived) // The damage is still going up - radio.autosay(addtext(warning_alert," Instability: ",stability,"%"), "Supermatter Monitor") + alert_msg = addtext(warning_alert," Instability: ",stability,"%") lastwarning = world.timeofday - 150 - - else // Phew, we're safe - radio.autosay(safe_alert, "Supermatter Monitor") + else // Phew, we're safe + alert_msg = safe_alert lastwarning = world.timeofday + if(!istype(L, /turf/space) && alert_msg) + radio.autosay(alert_msg, "Supermatter Monitor") + if(damage > explosion_point) for(var/mob/living/mob in living_mob_list) if(istype(mob, /mob/living/carbon/human)) From 2b9b9b7a7d7bb7dd49825a8d1d3eaf3347c8a215 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 11:50:16 +0930 Subject: [PATCH 05/11] Fixes #5573 --- code/modules/mob/living/carbon/human/life.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 211da1cdac..09ffb42681 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1098,6 +1098,9 @@ return //TODO: DEFERRED proc/handle_regular_status_updates() + + if(status_flags & GODMODE) return 0 + if(stat == DEAD) //DEAD. BROWN BREAD. SWIMMING WITH THE SPESS CARP blinded = 1 silent = 0 From 2c634a8d7ad03e2e718750d51ee8725497fe370d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 12:00:15 +0930 Subject: [PATCH 06/11] Fixes #5611 --- code/modules/mob/new_player/new_player.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index b4d3f02196..0f18e02cf3 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -134,6 +134,7 @@ return 1 if(href_list["late_join"]) + if(!ticker || ticker.current_state != GAME_STATE_PLAYING) usr << "\red The round is either not ready, or has already finished..." return @@ -143,6 +144,11 @@ src << alert("You are currently not whitelisted to play [client.prefs.species].") return 0 + var/datum/species/S = all_species[client.prefs.species] + if(!(S.flags & IS_WHITELISTED)) + src << alert("Your current species,[client.prefs.species], is not available for play on the station.") + return 0 + LateChoices() if(href_list["manifest"]) @@ -159,6 +165,11 @@ src << alert("You are currently not whitelisted to play [client.prefs.species].") return 0 + var/datum/species/S = all_species[client.prefs.species] + if(!(S.flags & IS_WHITELISTED)) + src << alert("Your current species,[client.prefs.species], is not available for play on the station.") + return 0 + AttemptLateSpawn(href_list["SelectedJob"],client.prefs.spawnpoint) return From bc2f91b4e4913b2598460cb4acee22b1e0abe4d9 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 12:02:48 +0930 Subject: [PATCH 07/11] Fixes #5608 --- code/modules/mining/machine_processing.dm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index d350e2052c..d8b671af25 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -142,10 +142,20 @@ /obj/machinery/mineral/processing_unit/process() - if (!active || !src.output || !src.input) return + if (!src.output || !src.input) return var/list/tick_alloys = list() + //Grab some more ore to process this tick. + for(var/i = 0,i Date: Mon, 14 Jul 2014 12:16:02 +0930 Subject: [PATCH 08/11] Fixes #5508 --- code/modules/mob/living/carbon/human/death.dm | 3 --- code/modules/organs/organ_external.dm | 22 ++++++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index bebd5680ef..e14cd9c534 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -58,7 +58,6 @@ dizziness = 0 jitteriness = 0 - hud_updateflag |= 1 << HEALTH_HUD hud_updateflag |= 1 << STATUS_HUD @@ -117,8 +116,6 @@ ticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now return ..(gibbed) - - /mob/living/carbon/human/proc/makeSkeleton() if(SKELETON in src.mutations) return diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index b885d7610e..713de4aef4 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -32,6 +32,7 @@ var/damage_msg = "\red You feel an intense pain" var/broken_description + var/vital //Lose a vital limb, die immediately. var/status = 0 var/open = 0 var/stage = 0 @@ -355,7 +356,7 @@ INFECTION_LEVEL_THREE above this germ level the player will take additional toxi Note that amputating the affected organ does in fact remove the infection from the player's body. */ /datum/organ/external/proc/update_germs() - + if(status & (ORGAN_ROBOT|ORGAN_DESTROYED) || (owner.species && owner.species.flags & IS_PLANT)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs. germ_level = 0 return @@ -363,7 +364,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(owner.bodytemperature >= 170) //cryo stops germs from moving and doing their bad stuffs //** Syncing germ levels with external wounds handle_germ_sync() - + //** Handle antibiotics and curing infections handle_antibiotics() @@ -386,10 +387,10 @@ Note that amputating the affected organ does in fact remove the infection from t /datum/organ/external/proc/handle_germ_effects() var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin") - + if (germ_level > 0 && germ_level < INFECTION_LEVEL_ONE && prob(60)) //this could be an else clause, but it looks cleaner this way germ_level-- //since germ_level increases at a rate of 1 per second with dirty wounds, prob(60) should give us about 5 minutes before level one. - + if(germ_level >= INFECTION_LEVEL_ONE) //having an infection raises your body temperature var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/INFECTION_LEVEL_THREE, 1) + owner.species.body_temperature @@ -400,7 +401,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(prob(round(germ_level/10))) if (antibiotics < 5) germ_level++ - + if (prob(5)) //adjust this to tweak how fast people take toxin damage from infections owner.adjustToxLoss(1) @@ -411,7 +412,7 @@ Note that amputating the affected organ does in fact remove the infection from t if (I.germ_level > 0 && I.germ_level < min(germ_level, INFECTION_LEVEL_TWO)) //once the organ reaches whatever we can give it, or level two, switch to a different one if (!target_organ || I.germ_level > target_organ.germ_level) //choose the organ with the highest germ_level target_organ = I - + if (!target_organ) //figure out which organs we can spread germs to and pick one at random var/list/candidate_organs = list() @@ -420,7 +421,7 @@ Note that amputating the affected organ does in fact remove the infection from t candidate_organs += I if (candidate_organs.len) target_organ = pick(candidate_organs) - + if (target_organ) target_organ.germ_level++ @@ -666,6 +667,9 @@ Note that amputating the affected organ does in fact remove the infection from t // OK so maybe your limb just flew off, but if it was attached to a pair of cuffs then hooray! Freedom! release_restraints() + if(vital) + owner.death() + /**************************************************** HELPERS ****************************************************/ @@ -829,7 +833,7 @@ Note that amputating the affected organ does in fact remove the infection from t max_damage = 75 min_broken_damage = 40 body_part = UPPER_TORSO - + vital = 1 /datum/organ/external/groin name = "groin" @@ -838,6 +842,7 @@ Note that amputating the affected organ does in fact remove the infection from t max_damage = 50 min_broken_damage = 30 body_part = LOWER_TORSO + vital = 1 /datum/organ/external/l_arm name = "l_arm" @@ -931,6 +936,7 @@ Note that amputating the affected organ does in fact remove the infection from t min_broken_damage = 40 body_part = HEAD var/disfigured = 0 + vital = 1 /datum/organ/external/head/get_icon() if (!owner) From a2a5991baecf7467ce89954a425a9fe0540224a9 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 12:23:28 +0930 Subject: [PATCH 09/11] Fixes #5523 --- code/modules/clothing/head/jobs.dm | 2 +- icons/obj/clothing/hats.dmi | Bin 59315 -> 59313 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index d2ef8deccf..692cc90b63 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -3,7 +3,7 @@ /obj/item/clothing/head/chefhat name = "chef's hat" desc = "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work." - icon_state = "chef" + icon_state = "chefhat" item_state = "chefhat" desc = "The commander in chef's head wear." flags = FPRINT | TABLEPASS diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 31be71e8e9eecca1d639cc38d64c8593f365bc0d..901928b4145bd83ecc9cc33635a2cfb8c932ac68 100644 GIT binary patch delta 933 zcmV;W16usE&jYc~1CS&Ev9TpD0e{G{^b(7V0;?|37@+2AY*v+vL8{~_&0|_knNGhp()KU{9yp*|fl=AEhO;}%HXhPD@IGQ|3 z=v<8D(ZdXaDzTgfVb;V@ZGR9K&*d~tY*IV|9m&ddM=#R^7~Y`F0X7zzfT{MZoV%VZ za8GboLyw#lIY<`{K;bxXhIVKq@gtSp%*;MR2guCalP{NWj#8c#JCkfpgj#$Zf#T5( z>y`9NmVN#``!c62h9?Q-PIP0z5@@5Lf@Wi}u6Bcwf?%X!PJkil5PzZkypec@da^>u zRc=UaA9d);SKzIJn&xpj0o~KBib4Z83~3_69r!|JxC&Pp+6Jo@RfYqOwhf0t0<$8O zo62yg4QQKD0xXWRZL`QLxEdJPHi^xDUolM#HM7s1i_ww?&cy69dLVi~Gn9dEAe?}! zTS40IXx#-2iQmW??SCsOeXUYn+dxSB9fj4WStpOFzoW3al7t@I(4SabpDm`nai^roFR!n;#wHz>Zby2orfMRB~Q4sE#bYj4pE+ZxANz{os zac~U0?_D^=aAELk~FGHi->v_T^S&*1^!!ttkrQ*nh7J8;sR^bD->`bL_{? zI0jlrN1{g`7ogoasf5r$M`6vLs;oH2OEW2_G%N6I9WRX`C8&v}vAhgxJ*2raaU3aF zU^&)`s5WFB1%6t-MO1je8t_)D;ong+sYC6g4t0~NX_n9N(xlAfbGaQj$II%F<@+{z zG3?lv`)d~y^nXedb;4Sw4TP_?bW-+yD6OVi^t@+!Y4Bd>P|3GV zx&|xUWO@M|y^6o-uisuZ1Rio5W!;skQSgwrQEKFYhnDTf)lcQ(n?pttB`uVp#QW({ z82f&W(8Hd}aHwG0CXqiAU{&kFg7B-O&?Q59{1f_d{}JW;)Bfq(^X`A6h=ur2dP`HY H-~`j+M$XJ6 delta 935 zcmV;Y16cgA&jYj11CS&Ev#}*F0e?lPmsn&Ju-sl^H*jDj53yz}kK0S^&Z5!B;R?Zt z&8(6!_=SSxsF<)34p~z9jP-Hs(=0gHElz+8d&B?r<-KsE)=_S|D|;Uols{DRZD%2` zy~$VMZ3nvQO}>tA!G*ucSK)1k`1(y7fu}{vIe+w&J3~|1irHJlL?%(>0)OZ!SPE2@ z^EAwCqd_vyG1=q=aKxS!C^P5eD4fW~rR>KWI|C~zucYPeTO=D-wptmQ2&A~O1;_2@ z5Xy#lmgqTyk|)WC$8L_5*dSlD9Y|ooM^Z`Uqn4T=;ib%-qm*Z7Xu_HbLlcsI#?jVKs^E}qM2n%Jax1lp06>yBQg2{61tnFDMrGyzlXSvhw- zS>T@Fu7(~tD{_!79Du5E;tcK3Na9B-yP27Nh7ORKxhG#P;T)wrD|RN?nh5pxIs(O` z8`dl7mn{4Id-i2cSqx7S%5CVzf+f&KLj}#oVlC|kBL%@o!<+y^(tjaB`FSJp4E1D% zkgME~+CJ*gm9M~C1vSm%bOKtZTNQ-{a2V1=hCA?i%5W8~GPDg=EvgI$9Bms8g9K(p zDmRtkP#e%TqXbwSXWM3xS8z2jux%2X|Gr|H7;0vpI~SuR51fhFXY@eyer6~G-#|D4 zSGR(+-_g1Y7!tpcHGkSyRQg(_ytaXm_B#rzPqR)QQ-4QcbtMTsxS>C>xISA9_c;CBlh~;8KWoR49BZeMuv~3a_*zC)#$gG2*sasPN#(%M&7B(2G_vS#^N$1#) zopB7bj*di+J}yAJb5aSRgO0+QJylt8j+bUqPH9%)%{pEhLrPE+O=Ec()_O>DXW}?g zu)uPx6;W--Itu)>e2b{?fHmN)R>QxeW>SaRNge7YRnsh=(xAaE_PNAP8$ecYw4uy{Z>GNPs_i?U_Y*I_R=epap-x^^wQwH&Y_ZT zn{*9UxXJVaI(ij<(_g>6Y6v{!Hp;pyRioe`Z==-60}n0RFRP!*#W#nHBuZK+Ly7m( zqcHaU8li_hmElmqwoM{`CcvuJg$3bPN1;oG^pC&0eiPh(`Tn$j`u4p0AI8vxyN!=o JCbQlI)8bDo&o}@8 From 338602ee181d8d4871acac51dd1580bb0997514c Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 12:41:10 +0930 Subject: [PATCH 10/11] Fixes #5531 --- baystation12.dme | 1 + code/modules/mob/living/carbon/brain/login.dm | 3 ++- code/modules/mob/living/silicon/login.dm | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/baystation12.dme b/baystation12.dme index 411f58ddd3..855bd5368e 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -954,6 +954,7 @@ #include "code\modules\mob\living\carbon\brain\death.dm" #include "code\modules\mob\living\carbon\brain\emote.dm" #include "code\modules\mob\living\carbon\brain\life.dm" +#include "code\modules\mob\living\carbon\brain\login.dm" #include "code\modules\mob\living\carbon\brain\MMI.dm" #include "code\modules\mob\living\carbon\brain\posibrain.dm" #include "code\modules\mob\living\carbon\brain\say.dm" diff --git a/code/modules/mob/living/carbon/brain/login.dm b/code/modules/mob/living/carbon/brain/login.dm index 84bccdfe96..e90297dfe5 100644 --- a/code/modules/mob/living/carbon/brain/login.dm +++ b/code/modules/mob/living/carbon/brain/login.dm @@ -1,2 +1,3 @@ /mob/living/carbon/brain/Login() - return ..() \ No newline at end of file + ..() + sleeping = 0 \ No newline at end of file diff --git a/code/modules/mob/living/silicon/login.dm b/code/modules/mob/living/silicon/login.dm index 32e0c8d346..a95a754eae 100644 --- a/code/modules/mob/living/silicon/login.dm +++ b/code/modules/mob/living/silicon/login.dm @@ -1,4 +1,5 @@ /mob/living/silicon/Login() + sleeping = 0 if(mind && ticker && ticker.mode) ticker.mode.remove_cultist(mind, 1) ticker.mode.remove_revolutionary(mind, 1) From a0291b0d7aac8b7ae1696d30b7e5dbcd1ec0de3e Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 12:51:30 +0930 Subject: [PATCH 11/11] Fixes #5485 --- code/modules/mob/living/carbon/human/life.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 09ffb42681..f772fe5840 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -690,6 +690,7 @@ loc_temp = environment.temperature if(adjusted_pressure < species.warning_high_pressure && adjusted_pressure > species.warning_low_pressure && abs(loc_temp - bodytemperature) < 20 && bodytemperature < species.heat_level_1 && bodytemperature > species.cold_level_1 && environment.phoron < MOLES_PHORON_VISIBLE) + pressure_alert = 0 return // Temperatures are within normal ranges, fuck all this processing. ~Ccomp //Body temperature adjusts depending on surrounding atmosphere based on your thermal protection