Last fixes

This commit is contained in:
Tigercat2000
2015-12-17 18:38:13 -08:00
parent b085bf8bab
commit 1ff3d20075
5 changed files with 10 additions and 16 deletions
-2
View File
@@ -246,8 +246,6 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
if(!object)
return
world << "Supply order [src] creating object [object] at atom [_loc]."
//create the crate
var/atom/Crate = new object.containertype(_loc)
Crate.name = "[object.containername] [comment ? "([comment])":"" ]"
@@ -69,15 +69,11 @@
emptyTurfs += T
world << "Supply shuttle buying items. emptyTurfs.len = [emptyTurfs.len]"
for(var/datum/supply_order/SO in shuttle_master.shoppinglist)
if(!SO.object)
throw EXCEPTION("Supply Order [SO] has no object associated with it.")
continue
world << "Supply shuttle buying [SO], [SO.object]."
var/turf/T = pick_n_take(emptyTurfs) //turf we will place it in
if(!T)
shuttle_master.shoppinglist.Cut(1, shuttle_master.shoppinglist.Find(SO))