From c23bf908b2adac095d37cdcaac37525e21cfe8e7 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Fri, 5 Feb 2016 01:27:28 +0100 Subject: [PATCH 1/8] You can now hide papers and cards in vents --- .../components/unary_devices/vent_pump.dm | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index e6731d4ea17..61dc5a9fdb8 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -339,6 +339,39 @@ else user << "You need more welding fuel to complete this task." return 1 + if(istype(W, /obj/item/weapon/screwdriver)) + if(!welded) + if(open) + user << "\blue Now closing the vent." + if (do_after(user, 20, target = src)) + open = 0 + user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.") + else + user << "\blue Now opening the vent." + if (do_after(user, 20, target = src)) + open = 1 + user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.") + return + if(istype(W, /obj/item/weapon/paper/)) + if(!welded) + if(open) + user.drop_item(W) + W.loc = src + if(!open) + user << "You can't shove that down there when it is closed" + else + user << "The vent is welded." + return + if(istype(W, /obj/item/weapon/card)) + if(!welded) + if(open) + user.drop_item(W) + W.loc = src + if(!open) + user << "You can't shove that down there when it is closed" + else + user << "The vent is welded." + return if(istype(W, /obj/item/device/multitool)) update_multitool_menu(user) return 1 @@ -349,6 +382,12 @@ return ..() +/obj/machinery/atmospherics/unary/vent_pump/attack_hand() + if(!welded) + if(open) + for(var/obj/item/weapon/W in src) + W.loc = src.loc + /obj/machinery/atmospherics/unary/vent_pump/examine(mob/user) ..(user) From 20a679f61d31ca80a2cc0ffa7eec64c85ed6016c Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Fri, 5 Feb 2016 01:29:05 +0100 Subject: [PATCH 2/8] Forgot a var --- code/ATMOSPHERICS/components/unary_devices/vent_pump.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 61dc5a9fdb8..360bba856bd 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -12,6 +12,7 @@ use_power = 1 can_unwrench = 1 + var/open = 0 var/area/initial_loc var/area_uid From 3f0b117924d04de2c88f6897e6d88b0d1cf3dc4e Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Fri, 5 Feb 2016 03:09:40 +0100 Subject: [PATCH 3/8] Span classes --- code/ATMOSPHERICS/components/unary_devices/vent_pump.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 360bba856bd..414af471416 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -343,12 +343,12 @@ if(istype(W, /obj/item/weapon/screwdriver)) if(!welded) if(open) - user << "\blue Now closing the vent." + user << " Now closing the vent." if (do_after(user, 20, target = src)) open = 0 user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.") else - user << "\blue Now opening the vent." + user << " Now opening the vent." if (do_after(user, 20, target = src)) open = 1 user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.") From 8edfd0cf8e7b8b7d47a972dee6fd2e0d65de6483 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Fri, 5 Feb 2016 04:07:36 +0100 Subject: [PATCH 4/8] Removes a forward slash --- code/ATMOSPHERICS/components/unary_devices/vent_pump.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 414af471416..6830ec8a418 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -353,7 +353,7 @@ open = 1 user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.") return - if(istype(W, /obj/item/weapon/paper/)) + if(istype(W, /obj/item/weapon/paper)) if(!welded) if(open) user.drop_item(W) From d262014ee48fbb9c8babce02d550ac1419d6238f Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 7 Feb 2016 23:13:51 +0100 Subject: [PATCH 5/8] update to forcemove --- code/ATMOSPHERICS/components/unary_devices/vent_pump.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 6830ec8a418..d278d77c818 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -367,7 +367,7 @@ if(!welded) if(open) user.drop_item(W) - W.loc = src + W.forceMove(src) if(!open) user << "You can't shove that down there when it is closed" else From 512e524780f96217e8c0f54c97a507fc82c19e48 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Mon, 8 Feb 2016 00:35:07 +0100 Subject: [PATCH 6/8] forceMove --- code/ATMOSPHERICS/components/unary_devices/vent_pump.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index d278d77c818..9bc8adac013 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -387,7 +387,7 @@ if(!welded) if(open) for(var/obj/item/weapon/W in src) - W.loc = src.loc + W.forceMove(get_turf(src)) /obj/machinery/atmospherics/unary/vent_pump/examine(mob/user) From 3dc79d31f7575d2d907123aec2a4d35b9cd91e39 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Mon, 8 Feb 2016 00:35:46 +0100 Subject: [PATCH 7/8] Forgot a forceMove somehow???? --- code/ATMOSPHERICS/components/unary_devices/vent_pump.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 9bc8adac013..a7240c8d64e 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -357,7 +357,7 @@ if(!welded) if(open) user.drop_item(W) - W.loc = src + W.forceMove(src) if(!open) user << "You can't shove that down there when it is closed" else From 85173af08f02bbcd63f0863e8fa3d6b60c61856a Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Tue, 16 Feb 2016 21:54:07 +0100 Subject: [PATCH 8/8] Removes ability to hide papers. --- .../ATMOSPHERICS/components/unary_devices/vent_pump.dm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index a7240c8d64e..3366777a081 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -363,16 +363,6 @@ else user << "The vent is welded." return - if(istype(W, /obj/item/weapon/card)) - if(!welded) - if(open) - user.drop_item(W) - W.forceMove(src) - if(!open) - user << "You can't shove that down there when it is closed" - else - user << "The vent is welded." - return if(istype(W, /obj/item/device/multitool)) update_multitool_menu(user) return 1