cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@732 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
musketstgstation@gmail.com
2010-12-29 01:45:27 +00:00
parent 7b65e65b9c
commit 5b51da92e5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/defines/obj/supplypacks.dm
View File

@@ -70,6 +70,7 @@
containertype = "/obj/crate/freezer" containertype = "/obj/crate/freezer"
containername = "Food crate" containername = "Food crate"
/* DO NOT UNCOMMENT THIS, ORDERING THEM WILL BREAK THE SHUTTLE
/datum/supply_packs/monkey /datum/supply_packs/monkey
name = "Monkey crate" name = "Monkey crate"
contains = list("/mob/living/carbon/monkey", contains = list("/mob/living/carbon/monkey",
@@ -79,7 +80,7 @@
"/mob/living/carbon/monkey") "/mob/living/carbon/monkey")
cost = 20 cost = 20
containertype = "/obj/crate/freezer" containertype = "/obj/crate/freezer"
containername = "Monkey crate" containername = "Monkey crate" */
/datum/supply_packs/engineering /datum/supply_packs/engineering
name = "Engineering crate" name = "Engineering crate"

5
code/game/supplyshuttle.dm
View File

@@ -129,10 +129,11 @@ var/ordernum=0
var/shuttleat = supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE var/shuttleat = supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE
for(var/turf/T in get_area_turfs(shuttleat) ) 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 if((locate(/obj/item/device/radio/beacon) in T)) return 0
for(var/atom/ATM in T) 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 if((locate(/obj/item/device/radio/beacon) in ATM)) return 0
return 1 return 1