Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support

code/datums/cache/crew.dm

@@ -57,7 +57,7 @@ GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new())
 
 		if(C.sensor_mode >= SUIT_SENSOR_TRACKING)
 			var/area/A = get_area(H)
-			crewmemberData["area"] = sanitize(A.name)
+			crewmemberData["area"] = sanitize_simple(A.name)
 			crewmemberData["x"] = pos.x
 			crewmemberData["y"] = pos.y
 

code/datums/datacore.dm

@@ -461,10 +461,6 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
 			clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "detective_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
 			clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "detective"), ICON_OVERLAY)
-		if("Security Pod Pilot")
-			clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "secred_s")
-			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
-			clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bomber"), ICON_OVERLAY)
 		if("Brig Physician")
 			clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "medical_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
@@ -484,10 +480,6 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
 			clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "atmos_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
 			clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
-		if("Mechanic")
-			clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "mechanic_s")
-			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY)
-			clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
 		if("Roboticist")
 			clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "robotics_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)

code/datums/diseases/transformation.dm

@@ -17,6 +17,7 @@
 	var/list/stage5 = list("Oh the humanity!")
 	var/transformation_text = null
 	var/new_form = /mob/living/carbon/human
+	var/job_role = null
 
 /datum/disease/transformation/stage_act()
 	..()
@@ -40,8 +41,8 @@
 	if(istype(affected_mob, /mob/living/carbon) && affected_mob.stat != DEAD)
 		if(stage5)
 			to_chat(affected_mob, pick(stage5))
-		if(jobban_isbanned(affected_mob, new_form))
-			affected_mob.death(1)
+		if(jobban_isbanned(affected_mob, job_role))
+			affected_mob.death()
 			return
 		if(affected_mob.notransform)
 			return
@@ -133,6 +134,7 @@
 	stage4	= list("<span class='danger'>Your skin feels very loose.</span>", "<span class='danger'>You can feel... something...inside you.</span>")
 	stage5	= list("<span class='danger'>Your skin feels as if it's about to burst off!</span>")
 	new_form = /mob/living/silicon/robot
+	job_role = "Cyborg"
 
 
 /datum/disease/transformation/robot/stage_act()
@@ -165,6 +167,7 @@
 	stage4	= list("<span class='danger'>Your skin feels very tight.</span>", "<span class='danger'>Your blood boils!</span>", "<span class='danger'>You can feel... something...inside you.</span>")
 	stage5	= list("<span class='danger'>Your skin feels as if it's about to burst off!</span>")
 	new_form = /mob/living/carbon/alien/humanoid/hunter
+	job_role = ROLE_ALIEN
 
 /datum/disease/transformation/xeno/stage_act()
 	..()
@@ -248,3 +251,4 @@
 	stage5	= list("<span class='danger'>You have become a morph.</span>")
 	transformation_text = "<span class='userdanger'>This transformation does NOT make you an antagonist if you were not one already. If you were not an antagonist, you should not eat any steal objectives or the contents of the armory.</span>"
 	new_form = /mob/living/simple_animal/hostile/morph
+	job_role = ROLE_MORPH

code/datums/mind.dm

@@ -85,6 +85,10 @@
 	original = null
 	return ..()
 
+/datum/mind/proc/get_display_key()
+	var/clientKey = current?.client.get_display_key()
+	return clientKey ? clientKey : key
+
 /datum/mind/proc/transfer_to(mob/living/new_character)
 	var/datum/atom_hud/antag/hud_to_transfer = antag_hud //we need this because leave_hud() will clear this list
 	var/mob/living/old_current = current

code/datums/spells/shapeshift.dm

@@ -96,10 +96,10 @@
 	invocation_type = "none"
 	action_icon_state = "vampire_bats"
 
-	shapeshift_type = /mob/living/simple_animal/hostile/scarybat/batswarm
-	current_shapes = list(/mob/living/simple_animal/hostile/scarybat/batswarm)
+	shapeshift_type = /mob/living/simple_animal/hostile/scarybat/adminvampire
+	current_shapes = list(/mob/living/simple_animal/hostile/scarybat/adminvampire)
 	current_casters = list()
-	possible_shapes = list(/mob/living/simple_animal/hostile/scarybat/batswarm)
+	possible_shapes = list(/mob/living/simple_animal/hostile/scarybat/adminvampire)
 
 /obj/effect/proc_holder/spell/targeted/shapeshift/hellhound
 	name = "Lesser Hellhound Form"

code/datums/supplypacks.dm

@@ -55,10 +55,6 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
 	var/list/announce_beacons = list() // Particular beacons that we'll notify the relevant department when we reach
 	var/special = FALSE //Event/Station Goals/Admin enabled packs
 	var/special_enabled = FALSE
-	/// The number of times one can order a cargo crate, before it becomes restricted. -1 for infinite
-	var/order_limit = -1
-	/// Number of times a crate has been ordered in a shift
-	var/times_ordered = 0
 	/// List of names for being done in TGUI
 	var/list/ui_manifest = list()
 
@@ -197,15 +193,6 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
 	containername = "special ops crate"
 	hidden = 1
 
-/datum/supply_packs/emergency/syndicate
-	name = "ERROR_NULL_ENTRY"
-	contains = list(/obj/item/storage/box/syndicate)
-	cost = 140
-	containertype = /obj/structure/closet/crate
-	containername = "crate"
-	hidden = 1
-	order_limit = 5
-
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Security ////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////