From b35ef49a09c6fcfd5331e10222305adcaa7ee40b Mon Sep 17 00:00:00 2001 From: "quartz235@gmail.com" Date: Sun, 18 Dec 2011 04:17:21 +0000 Subject: [PATCH] stop finding ways to centcom god damnit git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2729 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/magic/cultist/runes.dm | 2 +- code/game/supplyshuttle.dm | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/magic/cultist/runes.dm b/code/game/magic/cultist/runes.dm index 2298af13fd9..ccb75c5d0d4 100644 --- a/code/game/magic/cultist/runes.dm +++ b/code/game/magic/cultist/runes.dm @@ -12,7 +12,7 @@ var/list/sacrificed = list() for(var/obj/effect/rune/R in world) if(R == src) continue - if(R.word1 == wordtravel && R.word2 == wordself && R.word3 == key) + if(R.word1 == wordtravel && R.word2 == wordself && R.word3 == key && R.z != 2) index++ allrunesloc.len = index allrunesloc[index] = R.loc diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 833e84245fa..8e6446eb7e4 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -137,11 +137,17 @@ var/ordernum=0 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 + if((locate(/obj/structure/closet/body_bag) 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 - + if((locate(/obj/structure/closet/body_bag) in ATM)) return 0 + for(var/atom/ATMM in ATM) // okay jesus christ how many recursive packaging options are we going to have guys come on - Quarxink + if((locate(/mob/living) in ATMM)) return 0 + if((locate(/obj/item/device/radio/beacon) in ATMM)) return 0 + if((locate(/obj/mecha ) in ATMM)) return 0 + if((locate(/obj/structure/closet/body_bag) in ATMM)) return 0 return 1 /proc/sell_crates()