From 2db7beb19c13bf1443260b80d526e9bedbea9903 Mon Sep 17 00:00:00 2001 From: Akai Alonkai Date: Tue, 6 Aug 2013 10:46:23 -0400 Subject: [PATCH 1/4] Removed Z-up function from Client/Center() Turns out this was allowing mecha to travel semi-unrestricted upwards through z-levels, including to Central Command and the Away Mission. --- code/modules/mob/mob_movement.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 80d55c0a041..7a618ac6549 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -166,10 +166,12 @@ /client/Center() + /* No 3D movement in 2D spessman game. dir 16 is Z Up if (isobj(mob.loc)) var/obj/O = mob.loc if (mob.canmove) return O.relaymove(mob, 16) + */ return From f10c7a90c0c906054ac71ccb4193e58e0e59c58c Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Tue, 6 Aug 2013 15:55:36 +0100 Subject: [PATCH 2/4] Another tiny change to IRC nudge. HTML entities are now unescaped so that they show up correctly on IRC. Signed-off-by: Mloc-Argent --- scripts/ircbot_message.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/ircbot_message.py b/scripts/ircbot_message.py index 95673c62f44..4339019e03d 100644 --- a/scripts/ircbot_message.py +++ b/scripts/ircbot_message.py @@ -1,15 +1,19 @@ #!/usr/bin/env python2 -# Two arguments, channel and message. -# EG: "ircbot_message.py #adminchannel ADMINHELP, people are killing me!" +# Four arguments, password host channel and message. +# EG: "ircbot_message.py hunter2 example.com #adminchannel ADMINHELP, people are killing me!" -import sys,cPickle,socket +import sys,cPickle,socket,HTMLParser def pack(): + ht = HTMLParser.HTMLParser() + passwd = sys.argv[1] ip = sys.argv[3] try: - data = sys.argv[4:] #The rest of the arguments is data + data = [] + for in_data in sys.argv[4:]: #The rest of the arguments is data + data += {ht.unescape(in_data)} except: data = "NO DATA SPECIFIED" dictionary = {"ip":ip,"data":[passwd] + data} From 81c8478e74f4856a69c9d3de7f71dbe0e5841889 Mon Sep 17 00:00:00 2001 From: Segrain Date: Wed, 7 Aug 2013 00:50:46 +0300 Subject: [PATCH 3/4] Fix for #3450. Also, stuff. --- code/game/machinery/iv_drip.dm | 46 ++++++++++++++-------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index da6f8f90c89..2074bfd3ff5 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -6,7 +6,7 @@ /obj/machinery/iv_drip/var/mob/living/carbon/human/attached = null -/obj/machinery/iv_drip/var/mode = "give" // mode can be "give" or "take" +/obj/machinery/iv_drip/var/mode = 1 // 1 is injecting, 0 is taking blood. /obj/machinery/iv_drip/var/obj/item/weapon/reagent_containers/beaker = null /obj/machinery/iv_drip/update_icon() @@ -70,7 +70,7 @@ set background = 1 if(src.attached) - if(!(get_dist(src, src.attached) <= 1)) + if(!(get_dist(src, src.attached) <= 1 && isturf(src.attached.loc))) visible_message("The needle is ripped out of [src.attached], doesn't that hurt?") src.attached:apply_damage(3, BRUTE, pick("r_arm", "l_arm")) src.attached = null @@ -79,16 +79,17 @@ if(src.attached && src.beaker) // Give blood - if(mode == "give" && src.beaker.volume > 0) - var/transfer_amount = REAGENTS_METABOLISM - if(istype(src.beaker, /obj/item/weapon/reagent_containers/blood)) - // speed up transfer on blood packs - transfer_amount = 4 - src.beaker.reagents.trans_to(src.attached, transfer_amount) - update_icon() + if(mode) + if(src.beaker.volume > 0) + var/transfer_amount = REAGENTS_METABOLISM + if(istype(src.beaker, /obj/item/weapon/reagent_containers/blood)) + // speed up transfer on blood packs + transfer_amount = 4 + src.beaker.reagents.trans_to(src.attached, transfer_amount) + update_icon() // Take blood - else if(mode == "take") + else var/amount = beaker.reagents.maximum_volume - beaker.reagents.total_volume amount = min(amount, 4) // If the beaker is full, ping @@ -134,34 +135,25 @@ usr << "\red You can't do that." return - if(mode == "give") - mode = "take" - usr << "The IV drip is now taking blood." - else if(mode == "take") - mode = "give" - usr << "The IV drip is now giving blood." + if(usr.stat) + return + + mode = !mode + usr << "The IV drip is now [mode ? "injecting" : "taking blood"]." /obj/machinery/iv_drip/examine() set src in view() ..() if (!(usr in view(2)) && usr!=src.loc) return - if(mode == "take") - usr << "The IV drip is taking blood." - else if(mode == "give") - usr << "The IV drip is injecting." + usr << "The IV drip is [mode ? "injecting" : "taking blood"]." if(beaker) - usr << "\blue Attached is \a [beaker] with:" if(beaker.reagents && beaker.reagents.reagent_list.len) - for(var/datum/reagent/R in beaker.reagents.reagent_list) - usr << "\blue [R.volume] units of [R.name]" + usr << "\blue Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid." else usr << "\blue Attached is an empty [beaker]." else usr << "\blue No chemicals are attached." - if(attached) - usr << "\blue [attached] is attached." - else - usr << "\blue No one is attached." \ No newline at end of file + usr << "\blue [attached ? attached : "No one"] is attached." \ No newline at end of file From 858d6d81312f2af58fc710fa59dd09c738905ce9 Mon Sep 17 00:00:00 2001 From: Segrain Date: Wed, 7 Aug 2013 02:56:21 +0300 Subject: [PATCH 4/4] Tape is not a lattice. --- code/WorkInProgress/Ported/policetape.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/WorkInProgress/Ported/policetape.dm b/code/WorkInProgress/Ported/policetape.dm index f5d17f81378..1160a8a6dcb 100644 --- a/code/WorkInProgress/Ported/policetape.dm +++ b/code/WorkInProgress/Ported/policetape.dm @@ -72,6 +72,8 @@ while (cur!=end && can_place) if(cur.density == 1) can_place = 0 + else if (istype(cur, /turf/space)) + can_place = 0 else for(var/obj/O in cur) if(!istype(O, /obj/item/tape) && O.density)