Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync * sync part 1 - underscore folders in code * controllers folder * datums folder * game folder * cmon, work * modules - admin to awaymissions * cargo to events * fields to lighting * mapping > ruins * rest of the code folder * rest of the folders in the root directory * DME * fixes compiling errors. it compiles so it works * readds map changes * fixes dogborg module select * fixes typo in moduleselect_alternate_icon filepath
This commit is contained in:
@@ -415,14 +415,15 @@
|
||||
|
||||
/obj/docking_port/mobile/pod/request()
|
||||
var/obj/machinery/computer/shuttle/S = getControlConsole()
|
||||
|
||||
if(GLOB.security_level == SEC_LEVEL_RED || GLOB.security_level == SEC_LEVEL_DELTA || (S && (S.obj_flags & EMAGGED)))
|
||||
if(!istype(S, /obj/machinery/computer/shuttle/pod))
|
||||
return ..()
|
||||
if(GLOB.security_level >= SEC_LEVEL_RED || (S && (S.obj_flags & EMAGGED)))
|
||||
if(launch_status == UNLAUNCHED)
|
||||
launch_status = EARLY_LAUNCHED
|
||||
return ..()
|
||||
else
|
||||
to_chat(usr, "<span class='warning'>Escape pods will only launch during \"Code Red\" security alert.</span>")
|
||||
return 1
|
||||
return TRUE
|
||||
|
||||
/obj/docking_port/mobile/pod/Initialize()
|
||||
. = ..()
|
||||
@@ -535,13 +536,24 @@
|
||||
new /obj/item/storage/toolbox/emergency(src)
|
||||
|
||||
/obj/item/storage/pod/attackby(obj/item/W, mob/user, params)
|
||||
return
|
||||
if (can_interact(user))
|
||||
return ..()
|
||||
|
||||
/obj/item/storage/pod/attack_hand(mob/user)
|
||||
if (can_interact(user))
|
||||
SendSignal(COMSIG_TRY_STORAGE_SHOW, user)
|
||||
return TRUE
|
||||
|
||||
/obj/item/storage/pod/MouseDrop(over_object, src_location, over_location)
|
||||
if(can_interact(usr))
|
||||
return ..()
|
||||
|
||||
/obj/item/storage/pod/can_interact(mob/user)
|
||||
if(!..())
|
||||
return FALSE
|
||||
if(GLOB.security_level == SEC_LEVEL_RED || GLOB.security_level == SEC_LEVEL_DELTA || unlocked)
|
||||
. = ..()
|
||||
else
|
||||
to_chat(usr, "The storage unit will only unlock during a Red or Delta security alert.")
|
||||
return TRUE
|
||||
to_chat(user, "The storage unit will only unlock during a Red or Delta security alert.")
|
||||
|
||||
/obj/docking_port/mobile/emergency/backup
|
||||
name = "backup shuttle"
|
||||
|
||||
Reference in New Issue
Block a user