Revert "12/21 modernizations from TG live"

This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
+6 -7
View File
@@ -8,6 +8,7 @@
var/safety_warning = "For safety reasons the automated supply shuttle \
cannot transport live organisms, classified nuclear weaponry or \
homing beacons."
light_color = LIGHT_COLOR_BROWN
/obj/machinery/computer/cargo/request
name = "supply request console"
@@ -61,7 +62,7 @@
"name" = P.group,
"packs" = list()
)
if((P.hidden && !emagged) || (P.contraband && !contraband) || (P.special && !P.special_enabled))
if((P.hidden && !emagged) || (P.contraband && !contraband))
continue
data["supplies"][P.group]["packs"] += list(list(
"name" = P.name,
@@ -96,7 +97,7 @@
return
switch(action)
if("send")
if(!SSshuttle.supply.canMove())
if(SSshuttle.supply.canMove())
say(safety_warning)
return
if(SSshuttle.supply.getDockedId() == "supply_home")
@@ -113,11 +114,10 @@
if("loan")
if(!SSshuttle.shuttle_loan)
return
else if(SSshuttle.supply.mode != SHUTTLE_IDLE)
if(SSshuttle.supply.canMove())
say(safety_warning)
return
else if(SSshuttle.supply.getDockedId() != "supply_away")
return
else
else if(SSshuttle.supply.mode == SHUTTLE_IDLE)
SSshuttle.shuttle_loan.loan_shuttle()
say("The supply shuttle has been loaned to Centcom.")
. = TRUE
@@ -198,4 +198,3 @@
status_signal.data["command"] = command
frequency.post_signal(src, status_signal)