Merge branch 'master' into upstream-merge-26776

code/modules/shuttle/elevator.dm

@@ -0,0 +1,10 @@
+/obj/docking_port/mobile/elevator
+	name = "elevator"
+	id = "elevator"
+	dwidth = 3
+	width = 7
+	height = 7
+	knockdown = FALSE
+
+/obj/docking_port/mobile/elevator/request(obj/docking_port/stationary/S) //No transit, no ignition, just a simple up/down platform
+	dock(S, TRUE)

code/modules/shuttle/emergency.dm

@@ -104,12 +104,8 @@
 
 	authorized += ID
 
-	message_admins("[key_name_admin(user.client)] \
-		(<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) \
-		(<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) \
-		has authorized early shuttle launch", 0, 1)
-	log_game("[key_name(user)] has authorized early shuttle launch in \
-		([x],[y],[z])")
+	message_admins("[ADMIN_LOOKUPFLW(user)] has authorized early shuttle launch", 0, 1)
+	log_game("[key_name(user)] has authorized early shuttle launch in [COORD(src)]")
 	// Now check if we're on our way
 	. = TRUE
 	process()

code/modules/shuttle/ferry.dm

@@ -30,4 +30,4 @@
 			return
 		last_request = world.time
 		to_chat(usr, "<span class='notice'>Your request has been recieved by Centcom.</span>")
-		to_chat(GLOB.admins, "<b>FERRY: <font color='blue'>[key_name_admin(usr)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[usr]'>FLW</A>) (<A HREF='?_src_=holder;secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")
+		to_chat(GLOB.admins, "<b>FERRY: <font color='blue'>[ADMIN_LOOKUPFLW(usr)] (<A HREF='?_src_=holder;secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")

code/modules/shuttle/on_move.dm

@@ -3,7 +3,7 @@
 	return
 
 // Called when shuttle attempts to move an atom.
-/atom/movable/proc/onShuttleMove(turf/T1, rotation)
+/atom/movable/proc/onShuttleMove(turf/T1, rotation, knockdown = TRUE)
 	if(rotation)
 		shuttleRotate(rotation)
 	loc = T1
@@ -47,11 +47,11 @@
 		else
 			shake_camera(src, 7, 1)
 
-/mob/living/carbon/onShuttleMove()
+/mob/living/carbon/onShuttleMove(turf/T1, rotation, knockdown = TRUE)
 	. = ..()
 	if(!.)
 		return
-	if(!buckled)
+	if(!buckled && knockdown)
 		Weaken(3)
 
 /obj/effect/abstract/proximity_checker/onShuttleMove()

code/modules/shuttle/shuttle.dm

@@ -217,6 +217,8 @@
 
 	var/launch_status = NOLAUNCH
 
+	var/knockdown = TRUE //Will it knock down mobs when it docks?
+
 	// A timid shuttle will not register itself with the shuttle subsystem
 	// All shuttle templates are timid
 	var/timid = FALSE
@@ -517,7 +519,7 @@
 
 			//move mobile to new location
 			for(var/atom/movable/AM in T0)
-				if(AM.onShuttleMove(T1, rotation))
+				if(AM.onShuttleMove(T1, rotation, knockdown))
 					moved_atoms += AM
 
 		if(rotation)
@@ -578,10 +580,7 @@
 					if(M.pulledby)
 						M.pulledby.stop_pulling()
 					M.stop_pulling()
-					M.visible_message("<span class='warning'>[M] is hit by \
-							a hyperspace ripple!</span>",
-							"<span class='userdanger'>You feel an immense \
-							crushing pressure as the space around you ripples.</span>")
+					M.visible_message("<span class='warning'>[src] slams into [M]!</span>")
 					if(M.key || M.get_ghost(TRUE))
 						SSblackbox.add_details("shuttle_gib", "[type]")
 					else