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:
@@ -270,8 +270,11 @@ All ShuttleMove procs go here
|
||||
|
||||
/obj/item/storage/pod/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
|
||||
. = ..()
|
||||
unlocked = TRUE
|
||||
// If the pod was launched, the storage will always open.
|
||||
// If the pod was launched, the storage will always open. The CentCom check
|
||||
// ignores the movement of the shuttle from the staging area on CentCom to
|
||||
// the station as it is loaded in.
|
||||
if (oldT && !is_centcom_level(oldT.z))
|
||||
unlocked = TRUE
|
||||
|
||||
/************************************Mob move procs************************************/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user