Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

# Conflicts:
#	code/game/machinery/doors/airlock.dm

code/datums/cargoprofile.dm

@@ -643,9 +643,7 @@
 			//this is necessarily damaging
 			var/damage = rand(1,5)
 			to_chat(M, "<span class='danger'>The unloading machine grabs you with a hard metallic claw!</span>")
-			if(M.client)
-				M.client.eye = master
-				M.client.perspective = EYE_PERSPECTIVE
+			M.reset_perspective(master)
 			M.loc = master
 			master.types[M.type] = src
 			M.apply_damage(damage) // todo: ugly
@@ -699,10 +697,7 @@
 			//this is necessarily damaging
 			var/damage = rand(1,5)
 			to_chat(M, "<span class='danger'>The unloading machine grabs you with a hard metallic claw!</span>")
-			if(M.client)
-				M.client.eye = master
-				M.client.perspective = EYE_PERSPECTIVE
-			M.loc = master
+			M.forceMove(master)
 			master.types[M.type] = src
 			M.apply_damage(damage) // todo: ugly
 			M.visible_message("\red [M.name] gets pulled into the machine!")
@@ -710,11 +705,8 @@
 
 	outlet_reaction(var/atom/W,var/turf/D)
 		var/mob/living/M = W
-		M.loc = master.loc
+		M.forceMove(master.loc)
 		M.dir = master.outdir
-		if(M.client)
-			M.client.eye = M.client.mob
-			M.client.perspective = MOB_PERSPECTIVE
 
 		D = get_step(D,master.outdir) // throw attempt
 		eject_speed = rand(0,4)
@@ -796,4 +788,4 @@
 		var/punches = punch(M,remaining / PUNCH_WORK)
 		if(punches>1)master.sleep++
 		return punches * PUNCH_WORK
-#undef MAXCOIL
+#undef MAXCOIL

code/datums/datumvars.dm

@@ -1028,7 +1028,7 @@ body
 			to_chat(usr, "Mob doesn't exist anymore")
 			return
 
-		if(!(locateUID(rem_organ) in M.internal_organs))
+		if(!(rem_organ in M.internal_organs))
 			to_chat(usr, "Mob does not have that organ.")
 			return
 

code/datums/helper_datums/map_template.dm

@@ -113,6 +113,7 @@
 	if(!config.disable_space_ruins) // so we don't unnecessarily clutter start-up
 		preloadRuinTemplates()
 	preloadShelterTemplates()
+	preloadShuttleTemplates()
 
 /proc/preloadRuinTemplates()
 	// Still supporting bans by filename
@@ -152,3 +153,14 @@
 
 		shelter_templates[S.shelter_id] = S
 		map_templates[S.shelter_id] = S
+
+/proc/preloadShuttleTemplates()
+	for(var/item in subtypesof(/datum/map_template/shuttle))
+		var/datum/map_template/shuttle/shuttle_type = item
+		if(!initial(shuttle_type.suffix))
+			continue
+
+		var/datum/map_template/shuttle/S = new shuttle_type()
+
+		shuttle_templates[S.shuttle_id] = S
+		map_templates[S.shuttle_id] = S

code/datums/shuttles.dm

@@ -0,0 +1,106 @@
+/datum/map_template/shuttle
+	name = "Base Shuttle Template"
+	var/prefix = "_maps/map_files/shuttles/"
+	var/suffix
+	var/port_id
+	var/shuttle_id
+
+	var/description
+	var/admin_notes
+
+/datum/map_template/shuttle/New()
+	shuttle_id = "[port_id]_[suffix]"
+	mappath = "[prefix][shuttle_id].dmm"
+	. = ..()
+
+/datum/map_template/shuttle/emergency
+	port_id = "emergency"
+	name = "Base Shuttle Template (Emergency)"
+
+/datum/map_template/shuttle/cargo
+	port_id = "cargo"
+	name = "Base Shuttle Template (Cargo)"
+
+/datum/map_template/shuttle/ferry
+	port_id = "ferry"
+	name = "Base Shuttle Template (Ferry)"
+
+
+// Shuttles start here:
+
+/datum/map_template/shuttle/emergency/bar
+	suffix = "bar"
+	name = "The Emergency Escape Bar"
+	description = "Features include a bathroom, a quality lounge for the heads, and a \
+		small gambling table."
+
+
+/datum/map_template/shuttle/emergency/cyb
+	suffix = "cyb"
+	name = "emergency shuttle (Cyberiad)"
+
+/datum/map_template/shuttle/emergency/clown
+	suffix = "clown"
+	name = "Snappop(tm)!"
+	description = "Hey kids and grownups! Are you bored of DULL and TEDIOUS \
+		shuttle journeys after you're evacuating for probably BORING reasons. \
+		Well then order the Snappop(tm) today! We've got fun activities for \
+		everyone, an all access cockpit, and no boring security brig! Boo! \
+		Play dress up with your friends! Collect all the bedsheets before \
+		your neighbour does! Check if the AI is watching you with our patent \
+		pending \"Peeping Tom AI Multitool Detector\" or PEEEEEETUR for \
+		short. Have a fun ride!"
+	admin_notes = "Brig is replaced by anchored greentext book surrounded by \
+		lavaland chasms, stationside door has been removed to prevent \
+		accidental dropping."
+
+/datum/map_template/shuttle/emergency/cramped
+	suffix = "cramped"
+	name = "Secure Transport Vessel 5 (STV5)"
+	description = "Well, looks like Centcomm only had this ship in the area, \
+		they probably weren't expecting you to need evac for a while. \
+		Probably best if you don't rifle around in whatever equipment they \
+		were transporting. I hope you're friendly with your coworkers, \
+		because there is very little space in this thing.\n\
+		\n\
+		Contains contraband armory guns, maintenance loot, and abandoned \
+		crates!"
+	admin_notes = "Due to origin as a solo piloted secure vessel, has an \
+		active GPS onboard labeled STV5."
+
+/datum/map_template/shuttle/emergency/meta
+	suffix = "meta"
+	name = "emergency shuttle (Metastation)"
+
+/datum/map_template/shuttle/emergency/narnar
+	suffix = "narnar"
+	name = "Shuttle 667"
+	description = "Looks like this shuttle may have wandered into the \
+		darkness between the stars on route to the station. Let's not think \
+		too hard about where all the bodies came from."
+	admin_notes = "Contains inactive \
+		constructs. Put players in constructs if you want them to move. \
+		Cloning pods in 'medbay' area are showcases and nonfunctional."
+
+
+/datum/map_template/shuttle/emergency/old
+	suffix = "old"
+	name = "Retired Station shuttle."
+	description = "an older model of the station shuttle."
+
+/datum/map_template/shuttle/ferry/base
+	suffix = "base"
+	name = "transport ferry"
+	description = "Standard issue Box/Metastation Centcom ferry."
+
+/datum/map_template/shuttle/ferry/meat
+	suffix = "meat"
+	name = "\"meat\" ferry"
+	description = "Ahoy! We got all kinds o' meat aft here. Meat from plant \
+		people, people who be dark, not in a racist way, just they're dark \
+		black. Oh and lizard meat too,mighty popular that is. Definitely \
+		100% fresh, just ask this guy here. *person on meatspike moans* See? \
+		Definitely high quality meat, nothin' wrong with it, nothin' added, \
+		definitely no zombifyin' reagents!"
+	admin_notes = "Meat currently contains no zombifying reagents, people on \
+		meatspike must be spawned in."

code/datums/spell.dm

@@ -64,7 +64,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 		var/mob/living/carbon/human/caster = user
 		if(caster.remoteview_target)
 			caster.remoteview_target = null
-			caster.reset_view(0)
+			caster.reset_perspective(0)
 			return 0
 
 	if(is_admin_level(user.z) && (!centcom_cancast || ticker.mode.name == "ragin' mages")) //Certain spells are not allowed on the centcom zlevel

code/datums/uplink_item.dm

@@ -207,6 +207,7 @@ var/list/uplink_items = list()
 	item = /obj/item/weapon/caution/proximity_sign
 	cost = 4
 	job = list("Janitor")
+	surplus = 0
 
 //Medical