From a14adaf747ffe4d17b58491e1b9690873ef4b080 Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Mon, 23 Jul 2018 22:06:56 -0700 Subject: [PATCH] More bugfixes (#5018) Microwave can now eject items that are inside even when there is no power to it using Eject content verb. Fixes #4847 Mechs who were IONed and got into maint mode(while have maint mode change forbidden) can now change if they are allowed to switch maint mode by DNA owner. Fixes #4532 Changed door names. Fixes #5009 Found important bug in rejuvinate proc of living.dm It would crash when called on mobs that do not contain any reagents in it (AI, borgs, some simple animals). Effectively fixes #4986 Renamed sprite for basic service module so their eyes overlay is not missing anymore. --- code/game/machinery/kitchen/microwave.dm | 17 +++++++++++++++++ code/game/mecha/mecha.dm | 2 +- code/modules/mob/living/living.dm | 3 ++- .../mob/living/silicon/robot/robot_modules.dm | 2 +- html/changelogs/Sindorman-bugfixes.yml | 9 +++++++++ icons/mob/robots.dmi | Bin 328998 -> 328996 bytes maps/aurora/aurora-6_surface.dmm | 4 ++-- 7 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/Sindorman-bugfixes.yml diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 3eb0797de31..fd1980e6f6e 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -426,6 +426,23 @@ dispose() return +/obj/machinery/microwave/verb/Eject() + set src in oview(1) + set category = "Object" + set name = "Eject content" + usr.visible_message( + "[usr] is trying to open [src] to take out its content." , + "You are trying to open [src] to take out its content" + ) + + if (!do_after(usr, 1 SECONDS, act_target = src)) + return + + usr.visible_message( + "[usr] opened [src] and has taken out [english_list(contents)]." , + "You have opened [src] and taken out [english_list(contents)]." + ) + dispose() /obj/machinery/microwave/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if (!mover) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index a8372feb28f..0543ddf06bb 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1657,7 +1657,7 @@ return if(href_list["toggle_maint_access"]) if(usr != src.occupant) return - if(state) + if(state && src.dna != src.occupant.dna.unique_enzymes) occupant_message("Maintenance protocols in effect") return maint_access = !maint_access diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index d70c5c73fe7..313430b3868 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -455,7 +455,8 @@ default behaviour is: fire_stacks = 0 /mob/living/proc/rejuvenate() - reagents.clear_reagents() + if(!isnull(reagents)) + reagents.clear_reagents() // shut down various types of badness setToxLoss(0) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index cf17eff896f..bceb655b309 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -614,7 +614,7 @@ var/global/list/robot_modules = list( "Kent" = "toiletbot", "Bro" = "brobot", "Rich" = "maximillion", - "Basic" = "robotServ", + "Basic" = "robotserv", "Drone - Service" = "drone-service", "Drone - Hydro" = "drone-hydro", "Classic" = "service2", diff --git a/html/changelogs/Sindorman-bugfixes.yml b/html/changelogs/Sindorman-bugfixes.yml new file mode 100644 index 00000000000..c1851d68233 --- /dev/null +++ b/html/changelogs/Sindorman-bugfixes.yml @@ -0,0 +1,9 @@ +author: PoZe + +delete-after: True + +changes: + - bugfix: "Mechs that were shot with ION guns and got into maintenance mode while having it forbidden to switch the mode can now be unlocked by their DNA owners. By being able to allow maintenance mode." + - bugfix: "Cyborgs, AI, simple animals rejuvinate proc no longer crashes, making healing process to be complete." + - rscadd: "Microwave now has a verb to eject its content even whe it is not powered on" + - bugfix: "Fixed service cyborg basic sprite eyes overlay" diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index ea2151b19f8d4025882265c1e2e435b50a4d2e3d..61dd77e20d8544a9a3ba7f30dfa76be4fac94809 100644 GIT binary patch delta 1693 zcmV;O24eZ9iWH=Z6p$o;T6$DibVOxyV{&P5bZKvH004NLy;{qT+c*$B+g~9h$B}}u zJ(ElhzGM?Da!7t*K}l_!Ga}m|X*>G+JxGq}2gRbiSQtStK#|?-t}eDnzR$jV`}_OP z?CX#3(>)n0S!c`a>BHl6a*(y#WXo(ZpH4O;*BjUUVV!W4Ewguj_3YhrQcGjAW%e|k ztc*}(vt>5(AoDn65rvd-LuK4hi5Pldz!U;n0H7K%S0mW(d-q^={ z_IRNhMLz?kF-5f@C9N~Tpk3e%*=k4NUSoG=O`)lWc-IY&_!ggFFceXpQ&h|NE^Hg3 zH#~~AA$kLYxFNA`6+tyuvV)f!6wnBD1~s%LTYyD>bP_zMk~&36DW~UKiU}8nHw4eC zHwetGFVJJ_#GB)eV)14fT`{Mf0xO#nJ~75A1w<{`BBhG{>_($Y>1;E)r=Ij$Y9b@` z8rzgeuj8fE2wf}TfXL~!EZM9doFM^(uJ;z}Vk#=x#Fy1E@;LQK5g#6Y)vOW_?hT23 zivW9nE=5y`NHf5Ps63}|>ZH*Sv8W|m;OshjlR`0n1qt0UNH$Lc$20CEP%!Phb{V8p zuV^s(zhL2+s@+LNOBIw6!zDXQ;dcIXklQfV8{X+Si<}_=LM>H0BV7xBv1=+U1$Msp zM|E!v)TyAMOPxZ1$1ku!7Z8z(Eh4H=C^t@j>I4ylTCzm~OQL~72 zXz3W-$rM!^QSYn^?I`mzOP8|L+ZriNgQKry1T}VhlR=YoQUEAZ-RJ2Y={h=x=dAyK zB90{Pwj_*B*hv-=vi7HNN2jj)@U@jBUBQP#L+JQ^3EJuetb!O)vV*<4&EB*)_{+m zPO}p_zM(52q4Tz5n=z1tA&PawH*IZy0`C`q<`&C;-)#VC?K>`PS|6OUv*4b9EbIEp zG^$;mWx|B(_MZgSbt}QB*H4b|@2uAyNkVUqkxcYE<^Th#~C&AV>_!(qY1`?o9M0WZ_bzWVxQf`11wjz``N1nzqhqrB?`IF9#m z>zE3dV7Aq@q<<35I{FbQ2VCM4w_x^=Kp@flI{PhLs|2yD-^^d+_-hL2v%A?T-E$ z1ExM9V}_muaLfdM)<0&jf6I?mNmrH_PdzNgrv8XJfw5O35)8osWR0~u;D`ioNBBV6RjlxPD`3F;?Ay<;+1DT6r~d*<`YW7HuGvHY n03ZNKL_t(|ob0`Qm=x86nFfcM1_6he1_Fnf1_QU51_X`%SA9By delta 1693 zcmV;O24eZ7iWH`b6p$o;TzXVkbVOxyV{&P5bZKvH004NLy;@Cg+c*$C+rL6+kCBSl zPSW(?OSi?MhxW2RprE9&%|zt5Bpp}(eh-ps`h()5yjU1T5#W(CoO$y&BKbc1{Ppi| zKe8|1zfIrBSjjqDW)C0kr<1*`-6mURi}`f2A-UeT?hosPqimUfy{l*MrjuG4n=P}4 z>11VuBAYF<^y6+=o$Z4H;~qF{b2cuRUK zG&NaKMQi^Af0v5i#|6l+Ccvdn(@9N@XtQOu$mjX2|1I)G{wX|L$l+&ywugL{Kji)Y z19Jry^We|*>C_*?CA**8)X_K?F4^6&?{FyH9kM`?d%}Q!NUCIDA@loV5N0{_I}fyV zLf66s44ee{IbY<@UY#^VufxOrs@lq$OcX{fmF#e@9`i;1m@oX8?wuhjnqAd~tW7rT z?3P`&%;xv`>@oM6BvK+E{ZCh8J)Jbn+iaQ5rxQbasq2dc*#hU|5spCz$Z-XFQ@*Js zTcjnu8v0BE626QX_P&gaaa{*Ro`@zH^2I5W3!5tc$6rWD{Rj$H>FfBSn08_(iiyK)5#~ z-dY5I*mEhGN<^9gK1Ag?g;Ph3hKNNi*#c+R!J8C{`7221mO-+48aSSDM}dNA=e5fq zrFun!(fmA5?Del*&=}|2j3I;;&*>z zNaKB(qs;N724qDqH8A>rBGR)z!^v-uVJ||L?BbVDhD&xYLdSPK#oILrW9WBusTW6a zFG5Sl;7+Ef+K75*U1&#{pIADVrQX&^X&M}TDI=({>zfRkq@w~rnd&}IZ%Eg{IXq{7 z{TFd0an~hbbi$6ZkdU=Mg*!TR-G{HOBxUgw`aLUetdjhho z>nqc!c7B!#6Rz8T5?I%*1fyO*ImW+}UUwu3y*WlQ(eIcOc!P6NNlga2@l#ThxqHEH ztCiGoca_vYm(kk>uY0gL`?KRPHmVSqo$ljBNsXLfb?3fF;0|ZLkpCB(Tjx%HZ5T_@ zF!rpEpD2DKMcQ4fKA3LaeG3>43nt#bT?r3(o}TyBmoF3iJBV>S@@^n--;)^ST_?bC zyp3CjRKNtYt*#~gOgQW4N2DB#wYru?`06g)EcJ&Etw!$8TV2a8+F&Y^m+lWsKJAGF zA#m;jE!{IPxPJezW0B9E^9%WZu2_`j=!^hnF7Yc