From f024aba1a5500699f667152e488671a103c8f5a9 Mon Sep 17 00:00:00 2001 From: "ryantennessee@yahoo.com" Date: Fri, 16 Dec 2011 15:08:59 +0000 Subject: [PATCH] Quarxink update flip mode eyewitness news - Stopped an exploit to get to centcom (for justice) - Added 5 second cooldown to printing requisition to stop spam (also for justice) - Atmos pipes are now backpackable and do damage because they're FUCKING PIPES (not really for justice but just a pet peeve) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2700 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/pipe/construction.dm | 3 ++- code/game/supplyshuttle.dm | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index f3190658e99..20e9147ee27 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -24,11 +24,12 @@ Buildable meters var/pipe_type = 0 //var/pipe_dir = 0 var/pipename + force = 7 icon = 'pipe-item.dmi' icon_state = "simple" item_state = "buildpipe" flags = TABLEPASS|FPRINT - w_class = 4 + w_class = 3 level = 2 /obj/item/pipe/New(var/loc, var/pipe_type as num, var/dir as num, var/obj/machinery/atmospherics/make_from = null) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 6e5f00878ae..c69f9e59f85 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -136,9 +136,11 @@ var/ordernum=0 //if((locate(/mob/living) in T) && (!locate(/mob/living/carbon/monkey) in T)) return 0 //old check for living excluded monkeys if((locate(/mob/living) in T)) return 0 if((locate(/obj/item/device/radio/beacon) in T)) return 0 + if((locate(/obj/mecha) in T)) return 0 for(var/atom/ATM in T) if((locate(/mob/living) in ATM)) return 0 if((locate(/obj/item/device/radio/beacon) in ATM)) return 0 + if((locate(/obj/mecha ) in ATM)) return 0 return 1 @@ -401,7 +403,7 @@ var/ordernum=0 if(!supply_shuttle_at_station || supply_shuttle_moving) return if (!supply_can_move()) - usr << "\red The supply shuttle can not transport station employees or homing beacons." + usr << "\red The supply shuttle can not transport station employees, exosuits, or homing beacons." return src.temp = "Shuttle sent.

OK"