module things, jfc

This commit is contained in:
Poojawa
2018-09-11 07:51:01 -05:00
parent 8b9ef1e400
commit 284e9d0325
695 changed files with 11343 additions and 5661 deletions
+8 -5
View File
@@ -28,6 +28,13 @@
else
obj_flags &= ~EMAGGED
/obj/machinery/computer/cargo/proc/get_export_categories()
var/cat = EXPORT_CARGO
if(contraband)
cat |= EXPORT_CONTRABAND
if(obj_flags & EMAGGED)
cat |= EXPORT_EMAG
/obj/machinery/computer/cargo/emag_act(mob/user)
if(obj_flags & EMAGGED)
return
@@ -115,11 +122,7 @@
say(blockade_warning)
return
if(SSshuttle.supply.getDockedId() == "supply_home")
if (obj_flags & EMAGGED)
SSshuttle.supply.obj_flags |= EMAGGED
else
SSshuttle.supply.obj_flags = (SSshuttle.supply.obj_flags & ~EMAGGED)
SSshuttle.supply.contraband = contraband
SSshuttle.supply.export_categories = get_export_categories()
SSshuttle.moveShuttle("supply", "supply_away", TRUE)
say("The supply shuttle is departing.")
investigate_log("[key_name(usr)] sent the supply shuttle away.", INVESTIGATE_CARGO)