From a204f6f841fdb516455e32a994118715156ad05f Mon Sep 17 00:00:00 2001 From: Kevak Date: Fri, 6 Oct 2017 12:06:47 -0700 Subject: [PATCH 1/3] Fixing Broken Shit --- _maps/map_files/BoxStation/BoxStation.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 67f6208e52..f0ad6bc906 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2282,6 +2282,7 @@ }, /obj/docking_port/mobile/emergency{ name = "Box emergency shuttle"; + }, /obj/docking_port/stationary{ dir = 4; From ded9df3e1d4a5f29b8d99df162991dcf68ae0ed5 Mon Sep 17 00:00:00 2001 From: Kevak Date: Sat, 7 Oct 2017 23:54:23 -0700 Subject: [PATCH 2/3] Probably will fix the boxstation.dmm problem? Is up to date with cit master branch. --- _maps/map_files/BoxStation/BoxStation.dmm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index f0ad6bc906..15b9f0ff9e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2281,8 +2281,7 @@ name = "Emergency Shuttle Airlock" }, /obj/docking_port/mobile/emergency{ - name = "Box emergency shuttle"; - + name = "Box emergency shuttle" }, /obj/docking_port/stationary{ dir = 4; @@ -42529,14 +42528,14 @@ }, /area/maintenance/port/aft) "bTt" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/structure/closet/secure_closet/personal, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 4 }, -/obj/structure/closet/secure_closet/personal, /turf/open/floor/wood, /area/maintenance/port/aft) "bTu" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 4 }, /turf/closed/wall, @@ -42550,9 +42549,9 @@ /turf/open/floor/wood, /area/maintenance/port/aft) "bTw" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/machinery/light/small, /obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/manifold/general/hidden, /turf/open/floor/wood, /area/maintenance/port/aft) "bTx" = ( @@ -64126,19 +64125,19 @@ /turf/open/floor/wood, /area/maintenance/port/aft) "cUq" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, /obj/machinery/light/small, /obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 5 + }, /turf/open/floor/wood, /area/maintenance/port/aft) "cUr" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/structure/bed, /obj/item/bedsheet, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 4 + }, /turf/open/floor/wood, /area/maintenance/port/aft) "cUs" = ( From fb60efeacb9695c4b11c91d53868cd461512ce4a Mon Sep 17 00:00:00 2001 From: Kevak Date: Mon, 9 Oct 2017 22:45:02 -0700 Subject: [PATCH 3/3] Fixes shock collars getting stuck in pockets. --- code/game/objects/items/devices/radio/electropack.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 513ffb8d2b..108c561fc1 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -162,8 +162,9 @@ Code: /obj/item/device/electropack/shockcollar/attack_hand(mob/user) if(loc == user) if(slot_flags == SLOT_NECK) - to_chat(user, "The collar is fastened tight! You'll need help taking this off!") - return + if(user.get_item_by_slot(slot_neck)) + to_chat(user, "The collar is fastened tight! You'll need help taking this off!") + return ..() /obj/item/device/electropack/shockcollar/receive_signal(datum/signal/signal)