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

# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme

code/datums/diseases/critical.dm

@@ -19,7 +19,7 @@
 	spread_text = "The patient is in shock"
 	max_stages = 3
 	spread_flags = SPECIAL
-	cure_text = "Saline Solution"
+	cure_text = "Saline-Glucose Solution"
 	cures = list("salglu_solution")
 	cure_chance = 10
 	viable_mobtypes = list(/mob/living/carbon/human)
@@ -80,7 +80,7 @@
 	spread_text = "The patient is having a cardiac emergency"
 	max_stages = 3
 	spread_flags = SPECIAL
-	cure_text = "Cardiac Stimulants"
+	cure_text = "Atropine or Epinephrine"
 	cures = list("atropine", "epinephrine")
 	cure_chance = 10
 	needs_all_cures = FALSE

code/datums/mind.dm

@@ -29,6 +29,7 @@
 	var/memory
 
 	var/assigned_role //assigned role is what job you're assigned to when you join the station.
+	var/playtime_role //if set, overrides your assigned_role for the purpose of playtime awards. Set by IDcomputer when your ID is changed.
 	var/special_role //special roles are typically reserved for antags or roles like ERT. If you want to avoid a character being automatically announced by the AI, on arrival (becuase they're an off station character or something); ensure that special_role and assigned_role are equal.
 	var/offstation_role = FALSE //set to true for ERT, deathsquad, abductors, etc, that can go from and to z2 at will and shouldn't be antag targets
 	var/list/restricted_roles = list()