From 654a83be9d9e6879cc4abe61cc0cb92f12721d46 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Thu, 20 Jun 2013 18:13:18 +0400 Subject: [PATCH 1/6] Quickfix for INFINIMEAT. --- code/game/machinery/iv_drip.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index da6f8f90c89..40f5a3b9593 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -112,7 +112,8 @@ if (B) beaker.reagents.reagent_list |= B - beaker.reagents.update_total() + beaker.reagents.del_reagent("clonexadone") //Fix for infinite meat spawning when taking blood from human + beaker.reagents.update_total() //to an IV drip full of clonex beaker.on_reagent_change() beaker.reagents.handle_reactions() update_icon() From d0267a07d2d8cde85e906249b15f274a4e2816cc Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 21 Jun 2013 06:43:24 -0700 Subject: [PATCH 2/6] Fixes #3106 --- code/game/mecha/mecha_construction_paths.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index d5349ceae69..1063c910156 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -571,6 +571,7 @@ custom_action(step, atom/used_atom, mob/user) user.visible_message("[user] has connected [used_atom] to [holder].", "You connect [used_atom] to [holder]") holder.overlays += used_atom.icon_state+"+o" + user.drop_item() del used_atom return 1 From afece7e56edc271c12fda348a5d275e2753eede8 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 21 Jun 2013 15:07:31 -0700 Subject: [PATCH 3/6] Fixes #3118 --- code/game/objects/storage/coat.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/objects/storage/coat.dm b/code/game/objects/storage/coat.dm index c01a3087105..e5151ae5ded 100644 --- a/code/game/objects/storage/coat.dm +++ b/code/game/objects/storage/coat.dm @@ -211,8 +211,14 @@ orient2hud() return -/obj/item/weapon/storage/emp_act(severity) +/obj/item/clothing/suit/emp_act(severity) if(!istype(src.loc, /mob/living)) for(var/obj/O in contents) O.emp_act(severity) - ..() \ No newline at end of file + ..() + +/obj/item/clothing/suit/hear_talk(mob/M, var/msg) + for (var/atom/A in src) + if(istype(A,/obj/)) + var/obj/O = A + O.hear_talk(M, msg) \ No newline at end of file From d1e80194e3b3c639af5a02a51294a08024c4894c Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 21 Jun 2013 15:22:04 -0700 Subject: [PATCH 4/6] Fixes #2921 --- icons/mob/human_races/r_def_lizard.dmi | Bin 2318 -> 2315 bytes icons/mob/human_races/r_lizard.dmi | Bin 5673 -> 5665 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/human_races/r_def_lizard.dmi b/icons/mob/human_races/r_def_lizard.dmi index 6d7f8128ce368e9965b16f02040c039cf8d96798..ccb9736ddff9214b547fb864766ad2387ea9d763 100644 GIT binary patch delta 1947 zcmZXUdpy$%AIG;DLqrM_$B|c@0AUiTdZS)%$S%CeN9c8yYM8QV`RcO`PV(d0^VkzJ!}+`5`zxe&?s~>N~Ng#KyarM*_3Bl9^1ciernRD z=VLdH)SO6!^o=XhUb-7nRdkjMc<&9nF zaj(W!>clr!hL};HW~2*Ms_oga*?VU4G5ZH+GyQAp!?3^f9sCRPzl~B#o0wRB8Pnl7 zq_mUFa5mWiMDqggh=*8tiEW^sTzP+medbGF0ngCNr2O_()n5ljPuul>Vns%{9`N<* zr3QtzAo0M}b7Vx7mrIE#IV^_r(CKd!64cD{^h_wEDmYYXVc9Zcj0^UMHwbxe5{{N3 z8pffQXX9!S(;`jV{Zk46i&wCF{%v>=|4v=B;l84Ei+_!UPIHDJeVsqv_S~h=rfE#@ z?-J&(FPT@kbTs&ZV@MS5I{Ej0@6DuGaJ8*XT^043q4-6>gB7MH_er9IuCbft?mOT4EN#*MTMqkrbb4( zsj2JMpKtoD;`O^UAb-mR0`&}h%BrzOx&H2%fk|CbmVy*E(lGv}>jR!(w^36qbp`M@ zb^f@syYKfe1!EqN>!CJx&+-Yt(_tWufcxt^oG<9z(Wd1 ze~`E;M)widj>;Q5!Ek9#OXhYZnP>8zN1@-;)H(YGE)>wuZx%F%#hDlL!xEq=SL*dW zymt0-s{Pj9zm46ri`itJho(gBj1;A(!=j4z@XT7?!J{l33_6Qif=SW$+Tc-E>0{Y8 z)4E++gkJu1u|O*&aOYyIJ&^p*3cT&5Wz)cBZJL(2klBM`T!9}ym@`<+m=uM0AL(R| zPsGF=BK|6w@|NZ>QMP17?%Dz~Y+E2ezWVN~_o~-oi*mDPOeEVS|I_cJRd6n$gt3Q4 z8CcE{bSG*r&{SN2*67Uz`R#9RV5f;!wi{b4)5OaI|k5$Ya}LA#v-& z9n4*tB;&Ew#j)w*VvKjU(yDugv){Z%`0~8Q;63*b1+S9SA<%RkgT-P~EXTa9UvWNC%)!yAyfy~3WdiE z15dKiFg*lYcT>gk$UBBc<45x{*9#}W8R*infQ6I8*A(%W+OUe?i}iTA*C6LjfW06H zF00zi<`w~m!Kaqk-3y-0nkpvqfZANvDxA``>tY?Se}Q=?i~TG>fezDu^+YdqrS&So zKtvDJ>hXLB`~Poj(_N<^GEeoF&RsEZSRHpTM)N(J19#QPTzQR3%0;jRnu|Dtm~z)| zqsCu_E4s%~8_Inte6kc%i{=d2o#s|@8uh@+qSfyJfgX@9DAq`pF0Dw}TV?HS7mYWlHPAy%M0lTaJNbe}&Hk!*wL8Uk1 V@@i)E+y6MDxBCgV2G{WG{{{kfo=N}! delta 1950 zcmZXSc~sJg7RLcaa+xeGK}~VPeaj`AFAl*`rTW7!nY&1TUQ@y-{gR<(#l4D5Iqtj~ zrqE)%w#v428Y5FgFLA&+=6MM7Mo#5zk?8~kUUl6I)vum{xLLX=qdi5)6)bQbDeJNc~H z+FC+<$Lc!aiwd4enqaa>3R0mbh!!y#{K_sDW``!5MLHaBX`qy(*Dm!tO_a6%o&DPa z-wN=x+Ir3f-Y!2_AaOmHdO+4qQZV$ETw<9+kb4*8J#oSb#6CIr)^X2asp^FeOsaLJ;SE9^|3_^ax*AbG9r3)?u^jSWpZ|1-llA_0 zO`=#cgCoPyfB;?x05NE?=Q)3xxTroR2OJjDkf#x+yeoa-9Bx){ zQ0|hZ>tapNy53Q?k6p&jV+ZK0v!;c&KEC!w!?q``4PI`O8l%kjZIcWkzbT(jr4>?! zVkI=ZddF^G{E+2l(}6h?526;Qg(oQ!ha!`GH}bqmwz{aZRexpiutv3tK+X}HI{ScW zCCP_9x+s)thCG1C$LVgj945m4_g4FRa)LK|#}I1juQZ=Gck>*sQZo5H&AP?C?`uJ3 z;l;TFnV>!Ac-6`pZTQ9HPa5FUwA&sQ+$3~IKjIi_@}>?=&GP#8u%%Y9ucZE%!%EaT z(6#7NRq`#uo$4c8O?MOvy{Oh`8bYpDkY0Bk!7bajQh9KDb;ig@OQ+}A$f#@b{txm3 zx7bQSnPb>L^Q3M9jP`ax8C?)!mCksS8u4;&uHyL1oVc4mN9MMcs1&YhM;#?9#=wJ@ zKTuDZFV4(a1;0k@(ixcG=m$hY;N>)p&5cy3R=HrC5bXSu$V?IOvBud;uUE13fgNmK zUr&J@`P9#3MNsyp>+KTJTruo-0(cgSJ{O5pU4@@vVhF3JD<0b>4Y`u62Yz!dlEr{x zX%94l7G;>+mRb5FTypIQjTpKWEk|)2pMYv}eb-ql;;TIeLy~lz*#l<=} zxY;YoP`FkJ^r^|s2F&KgBDM~)1EYAJY!^j_lBWDgOD>lNRiKWFDnGTwLP_@};mi=B zlc2zN^;I(~0O*;8CyxWgTqKH&7)Lg&;tpxY zLrv%HXc;aeL{&ds50 zj_EnJr7|m};w|JsGiN$aVY;v)LA%n|X`3&W-&FZB9Co%bq@`^!uC0?|Ry|q_h=r~1 z?d?RMEAV}XcXz@BTAa1gO?dfD-=J>GU}${VZ|pnQxB~Q#ce(eGj0u{p2hO;^R{|g} zCE6_~@APjlmc;fSyj;Ik9c{V1u}gWvAntnKy>1XOv>@T!5rq{eZ-v=E(JU@2PSM|J zBuFY4x6SsJZF6cu$r0-}IzQ{x?RbFR73o;XtX+$%8i7{?1W19o&1)`N7uLe{?l|Zh z#*L2G&o<^`M6nRTL>n+#5RwSU>S&@6k~Xu@JF_2g7Y8k4JQ&Y_N zB}K9v&F^gceBV`m@Jx?vFDuNKXgFfr!*dyj&*$XMcE^Jy}1#C@-#LP9<7)w-ACev*2 z%q8{DPlUs7CbN0(c~}w^yEl63ZzrcT>j!@D9C znXLoVu^(s`;CPH!l(p&K;{7sw<(;kJUY~8MbX5W=J29w#E;<(Lh>^#fZ~QeK+bpvq XmfjTU4_+{Y@5guA9*?8h1*ZQSgO`gd diff --git a/icons/mob/human_races/r_lizard.dmi b/icons/mob/human_races/r_lizard.dmi index e8fb53fdac06d8237954c77737116b7dc1fece3e..8f8615d44e1c25b5bef94aa49e794f90eb1c8e00 100644 GIT binary patch delta 1704 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 Date: Fri, 21 Jun 2013 15:38:44 -0700 Subject: [PATCH 5/6] Fixes #2421 --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a0d9749744c..8e92cf653d9 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -380,7 +380,7 @@ u_equip(item) update_icons() - if (istype(usr, /mob/living/carbon/monkey)) //Check if a monkey is throwing. Modify/remove this line as required. + if (istype(usr, /mob/living/carbon)) //Check if a carbon mob is throwing. Modify/remove this line as required. item.loc = src.loc if(src.client) src.client.screen -= item From 476c8f2fcd9f91e522f1f6a3d2c0942c50e66e4a Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 21 Jun 2013 19:03:12 -0700 Subject: [PATCH 6/6] Fix for destroying alien walls with your bare hands. --- code/game/objects/effects/aliens.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 523e0ff72eb..1e762e68b3f 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -110,6 +110,11 @@ for(var/mob/O in oviewers(src)) O.show_message("\red [usr] destroys the [name]!", 1) health = 0 + else + usr << "\blue You claw at the [name]." + for(var/mob/O in oviewers(src)) + O.show_message("\red [usr] claws at the [name]!", 1) + health -= rand(5,10) healthcheck() return