From b3ba567099377d88cdd4c0e01aa643d6c5ccaae7 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 24 Jun 2013 21:31:38 -0700 Subject: [PATCH 1/4] Fixes #3145 --- code/WorkInProgress/autopsy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/WorkInProgress/autopsy.dm b/code/WorkInProgress/autopsy.dm index 8bf45945bc6..8c5fbf7661e 100644 --- a/code/WorkInProgress/autopsy.dm +++ b/code/WorkInProgress/autopsy.dm @@ -78,7 +78,7 @@ /obj/item/weapon/autopsy_scanner/verb/print_data() set src in view(usr, 1) set name = "Print Data" - if(usr.stat) + if(usr.stat || !(istype(usr,/mob/living/carbon/human))) usr << "No." return From 2265e8e0b9746ccce9bf34dc73feaeb660f993f5 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 24 Jun 2013 21:55:21 -0700 Subject: [PATCH 2/4] Fixes #2815 --- code/game/gamemodes/malfunction/Malf_Modules.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index ef39b96db8d..104fbf1cdb7 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -85,7 +85,7 @@ rcd light flash thingy on matter drain for(var/mob/V in hearers(M, null)) V.show_message("\blue You hear a loud electrical buzzing sound!", 2) spawn(50) - explosion(get_turf(M), 0,1,1,0) + explosion(get_turf(M), 0,1,2,3) del(M) else usr << "Out of uses." else usr << "That's not a machine." From 59119fea075eac4cd52da9f6c8a25c05b3aa367f Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 24 Jun 2013 22:09:03 -0700 Subject: [PATCH 3/4] Fixes #3146 --- code/modules/organs/organ_external.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index d166dccd38c..f5092f59325 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -307,6 +307,10 @@ //Updating wounds. Handles wound natural I had some free spachealing, internal bleedings and infections /datum/organ/external/proc/update_wounds() + + if((status & ORGAN_ROBOT)) //Robotic limbs don't heal or get worse. + return + for(var/datum/wound/W in wounds) // wounds can disappear after 10 minutes at the earliest if(W.damage == 0 && W.created + 10 * 10 * 60 <= world.time) From 479d7a058f63d7728ffb6307400cd071ab4c8675 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 25 Jun 2013 14:03:09 -0700 Subject: [PATCH 4/4] Fixes #3154 --- code/modules/mob/transform_procs.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 9e3ed4b3a11..ca33eaa1b67 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -62,7 +62,6 @@ return for(var/obj/item/W in src) drop_from_inventory(W) - regenerate_icons() monkeyizing = 1 canmove = 0 icon = null