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
@@ -5,6 +5,7 @@
shuttleId = "laborcamp"
possible_destinations = "laborcamp_home;laborcamp_away"
req_access = list(access_brig)
light_color = LIGHT_COLOR_CYAN
/obj/machinery/computer/shuttle/labor/one_way
@@ -24,4 +25,4 @@
if(S && S.name == "laborcamp_away")
usr << "<span class='warning'>Shuttle is already at the outpost!</span>"
return 0
..()
..()
@@ -74,14 +74,14 @@
switch(action)
if("handle_id")
if(inserted_id)
if(!usr.get_active_held_item())
if(!usr.get_active_hand())
usr.put_in_hands(inserted_id)
inserted_id = null
else
inserted_id.forceMove(get_turf(src))
inserted_id = null
else
var/obj/item/I = usr.get_active_held_item()
var/obj/item/I = usr.get_active_hand()
if(istype(I, /obj/item/weapon/card/id/prisoner))
if(!usr.drop_item())
return