Merge branch 'master' into upstream-merge-6762

code/datums/beam.dm

@@ -138,12 +138,8 @@
 	return
 
 /obj/effect/ebeam/deadly/Crossed(atom/A)
-	//VOREStation Edit begin: SHADEKIN
-	var/mob/SK = A
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
+	if(A.is_incorporeal())
+		return
 	..()
 	A.ex_act(1)
 
@@ -163,12 +159,8 @@
 		on_contact(A)
 
 /obj/effect/ebeam/reactive/Crossed(atom/A)
-	//VOREStation Edit begin: SHADEKIN
-	var/mob/SK = A
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
+	if(A.is_incorporeal())
+		return
 	..()
 	on_contact(A)
 

code/datums/observation/shuttle_added.dm

@@ -0,0 +1,22 @@
+//	Observer Pattern Implementation: Shuttle Added
+//		Registration type: /datum/shuttle (register for the global event only)
+//
+//		Raised when: After a shuttle is initialized.
+//
+//		Arguments that the called proc should expect:
+//			/datum/shuttle/shuttle: the new shuttle
+
+GLOBAL_DATUM_INIT(shuttle_added, /decl/observ/shuttle_added, new)
+
+/decl/observ/shuttle_added
+	name = "Shuttle Added"
+	expected_type = /datum/shuttle
+
+/*****************************
+*  Shuttle Added Handling *
+*****************************/
+
+/datum/controller/subsystem/shuttles/initialize_shuttle()
+	. = ..()
+	if(.)
+		GLOB.shuttle_added.raise_event(.)

code/datums/observation/shuttle_moved.dm

@@ -0,0 +1,38 @@
+//	Observer Pattern Implementation: Shuttle Moved
+//		Registration type: /datum/shuttle/autodock
+//
+//		Raised when: A shuttle has moved to a new landmark.
+//
+//		Arguments that the called proc should expect:
+//			/datum/shuttle/shuttle: the shuttle moving
+//			/obj/effect/shuttle_landmark/old_location: the old location's shuttle landmark
+//			/obj/effect/shuttle_landmark/new_location: the new location's shuttle landmark
+
+//	Observer Pattern Implementation: Shuttle Pre Move
+//		Registration type: /datum/shuttle/autodock
+//
+//		Raised when: A shuttle is about to move to a new landmark.
+//
+//		Arguments that the called proc should expect:
+//			/datum/shuttle/shuttle: the shuttle moving
+//			/obj/effect/shuttle_landmark/old_location: the old location's shuttle landmark
+//			/obj/effect/shuttle_landmark/new_location: the new location's shuttle landmark
+
+GLOBAL_DATUM_INIT(shuttle_moved_event, /decl/observ/shuttle_moved, new)
+
+/decl/observ/shuttle_moved
+	name = "Shuttle Moved"
+	expected_type = /datum/shuttle
+
+GLOBAL_DATUM_INIT(shuttle_pre_move_event, /decl/observ/shuttle_pre_move, new)
+
+/decl/observ/shuttle_pre_move
+	name = "Shuttle Pre Move"
+	expected_type = /datum/shuttle
+
+/*****************
+* Shuttle Moved/Pre Move Handling *
+*****************/
+
+// Located in modules/shuttle/shuttle.dm
+// Proc: /datum/shuttle/proc/attempt_move()