From 0db60b65c72379492b7daa67920f25808103e9e0 Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Wed, 12 Dec 2012 02:49:29 -0800 Subject: [PATCH 1/3] Portable generator Fix Portable generators properly drop their fuel when deconstructed Portable generators need their cover open to be destructed now Fixed a runtime error when building a portable generator with a 2s wire --- code/game/machinery/constructable_frame.dm | 2 +- code/modules/power/port_gen.dm | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index e9dfd6a6a74..7790526dd77 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -154,7 +154,7 @@ update_desc() break user << desc - if(P.loc != src && !istype(P, /obj/item/weapon/cable_coil)) + if(P && P.loc != src && !istype(P, /obj/item/weapon/cable_coil)) user << "\red You cannot add that component to the machine!" diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 57a71fbb5cc..82530f3add6 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -213,12 +213,22 @@ display round(lastgen) and plasmatank amount user << "\blue You open the access panel." else user << "\blue You close the access panel." - else if(istype(O, /obj/item/weapon/crowbar) && !open) + else if(istype(O, /obj/item/weapon/crowbar) && open) var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc) for(var/obj/item/I in component_parts) if(I.reliability < 100) I.crit_fail = 1 I.loc = src.loc + while ( sheets > 0 ) + var/obj/item/stack/sheet/G = new sheet_path(src.loc) + + if ( sheets > 50 ) + G.amount = 50 + else + G.amount = sheets + + sheets -= G.amount + new_frame.state = 2 new_frame.icon_state = "box_1" del(src) From 0855c5d1af1374d5fe2609774a468ab505fbb54d Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 16 Dec 2012 04:04:43 +0100 Subject: [PATCH 2/3] Fixes issue #2006 Medical belt can now hold autoinjector. --- code/game/objects/items/weapons/storage/belt.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 3662579f5cd..79a60e0a794 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -95,7 +95,8 @@ "/obj/item/stack/medical", "/obj/item/device/flashlight/pen", "/obj/item/clothing/mask/surgical", - "/obj/item/clothing/gloves/latex" + "/obj/item/clothing/gloves/latex", + "/obj/item/weapon/reagent_containers/hypospray/autoinjector" ) @@ -153,4 +154,4 @@ storage_slots = 1 can_hold = list( "/obj/item/clothing/mask/luchador" - ) \ No newline at end of file + ) From 7cf324431687617516b1988e5ddc3ec175bb4feb Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 16 Dec 2012 04:57:32 +0100 Subject: [PATCH 3/3] Fixes issue #2059 Mob transform into monkey no longer uses hardcoded DNA size of 14. --- code/modules/mob/transform_procs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index ff624a0bae8..d1c60d9bb62 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -29,7 +29,7 @@ dna = null O.dna.uni_identity = "00600200A00E0110148FC01300B009" //O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8" - O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*13)]BB8" + O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8" O.loc = loc O.viruses = viruses viruses = list()