From 62d88717ba7d9c5333b2bb494658d8c07c6230f7 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 16 Dec 2012 00:18:50 +0100 Subject: [PATCH 1/4] Fixed a bug with rev objective checking. If a single alive, non-converted head left the station z-level, it'd be a victory for the revs. --- code/game/gamemodes/objective.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 40acaf36c90..ec1f67e3a57 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -106,6 +106,7 @@ datum/objective/mutiny/rp // less violent rev objectives check_completion() + var/rval = 1 if(target && target.current) if(target.current.stat == DEAD || target.current.handcuffed || !ishuman(target.current)) return 1 @@ -115,9 +116,9 @@ datum/objective/mutiny/rp return 1 var/turf/T = get_turf(target.current) if(T && (T.z != 1)) //If they leave the station they count as dead for this - return 2 + rval = 2 return 0 - return 1 + return rval datum/objective/anti_revolution/execute find_target() From 7b8a33dc53335b0953d6e46b08656b0c7ad41eb9 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 16 Dec 2012 03:39:45 +0100 Subject: [PATCH 2/4] Fixed compile error regarding unclosed comment in events.dm --- code/game/gamemodes/events.dm | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index acb669a4a99..90370188385 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -36,40 +36,6 @@ spawn(700) meteor_wave() spawn_meteors() - - /*if(2) - command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert") - world << sound('sound/AI/granomalies.ogg') - var/turf/T = pick(blobstart) - var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 ) - spawn(rand(50, 300)) - del(bh)*/ - /* - if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO - command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert") - world << sound('sound/AI/spanomalies.ogg') - var/list/turfs = new - var/turf/picked - for(var/turf/simulated/floor/T in world) - if(T.z == 1) - turfs += T - for(var/turf/simulated/floor/T in turfs) - if(prob(20)) - spawn(50+rand(0,3000)) - picked = pick(turfs) - var/obj/effect/portal/P = new /obj/effect/portal( T ) - P.target = picked - P.creator = null - P.icon = 'icons/obj/objects.dmi' - P.failchance = 0 - P.icon_state = "anom" - P.name = "wormhole" - spawn(rand(300,600)) - del(P) - */ - /*if(3) - if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. - space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.*/ if(4) mini_blob_event() From 0855c5d1af1374d5fe2609774a468ab505fbb54d Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 16 Dec 2012 04:04:43 +0100 Subject: [PATCH 3/4] 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 4/4] 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()