From 5b51da92e5cefb5c0b55fee2ad4f20e8262bcaca Mon Sep 17 00:00:00 2001 From: "musketstgstation@gmail.com" Date: Wed, 29 Dec 2010 01:45:27 +0000 Subject: [PATCH] The supply shuttle can no longer transport monkeys. Monkey crates have therefore been removed, as ordering one would break the shuttle for the rest of the round. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@732 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/supplypacks.dm | 3 ++- code/game/supplyshuttle.dm | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index c606565735..f8d537af6c 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -70,6 +70,7 @@ containertype = "/obj/crate/freezer" containername = "Food crate" +/* DO NOT UNCOMMENT THIS, ORDERING THEM WILL BREAK THE SHUTTLE /datum/supply_packs/monkey name = "Monkey crate" contains = list("/mob/living/carbon/monkey", @@ -79,7 +80,7 @@ "/mob/living/carbon/monkey") cost = 20 containertype = "/obj/crate/freezer" - containername = "Monkey crate" + containername = "Monkey crate" */ /datum/supply_packs/engineering name = "Engineering crate" diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 323ca12e18..a34a646e84 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -129,10 +129,11 @@ var/ordernum=0 var/shuttleat = supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE for(var/turf/T in get_area_turfs(shuttleat) ) - if((locate(/mob/living) in T) && (!locate(/mob/living/carbon/monkey) in T)) return 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 for(var/atom/ATM in T) - if((locate(/mob/living) in ATM) && (!locate(/mob/living/carbon/monkey) in ATM)) return 0 + if((locate(/mob/living) in ATM)) return 0 if((locate(/obj/item/device/radio/beacon) in ATM)) return 0 return 1