Merge remote-tracking branch 'upstream/dev-freeze' into ert-lights2

code/game/gamemodes/endgame/supermatter_cascade/universe.dm

@@ -79,10 +79,9 @@ The access requirements on the Asteroid Shuttles' consoles have now been revoked
 				C.req_access = list()
 				C.req_one_access = list()
 
-		sleep(5 MINUTES)
-		ticker.station_explosion_cinematic(0,null) // TODO: Custom cinematic
-
-		universe_has_ended = 1
+		spawn(5 MINUTES)
+			ticker.station_explosion_cinematic(0,null) // TODO: Custom cinematic
+			universe_has_ended = 1
 		return
 
 /datum/universal_state/supermatter_cascade/proc/AreaSet()

code/game/machinery/computer/security.dm

@@ -5,7 +5,7 @@
 	desc = "Used to view, edit and maintain security records"
 	icon_state = "security"
 	light_color = "#a91515"
-	req_one_access = list(access_security, access_forensics_lockers)
+	req_one_access = list(access_security, access_forensics_lockers, access_lawyer)
 	circuit = "/obj/item/weapon/circuitboard/secure_data"
 	var/obj/item/weapon/card/id/scan = null
 	var/authenticated = null

code/game/objects/effects/chem/foam.dm

@@ -39,6 +39,8 @@
 	if(!metal && reagents)
 		var/turf/T = get_turf(src)
 		reagents.touch_turf(T)
+		for(var/obj/O in T)
+			reagents.touch_obj(O)
 
 /obj/effect/effect/foam/process()
 	if(--amount < 0)

code/game/objects/items.dm

@@ -65,9 +65,10 @@
 /obj/item/Destroy()
 	if(ismob(loc))
 		var/mob/m = loc
-		m.unEquip(src, 1)
+		m.drop_from_inventory(src)
 		m.update_inv_r_hand()
 		m.update_inv_l_hand()
+		src.loc = null
 	return ..()
 
 /obj/item/device
@@ -604,4 +605,4 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 
 
 /obj/item/proc/pwr_drain()
-	return 0 // Process Kill
+	return 0 // Process Kill

code/game/objects/items/weapons/cards_ids.dm

@@ -145,9 +145,10 @@
 	..()
 	spawn(30)
 	if(istype(loc, /mob/living/carbon/human))
-		blood_type = loc:dna:b_type
-		dna_hash = loc:dna:unique_enzymes
-		fingerprint_hash = md5(loc:dna:uni_identity)
+		var/mob/living/carbon/human/H = loc
+		blood_type = H.dna.b_type
+		dna_hash = H.dna.unique_enzymes
+		fingerprint_hash = md5(H.dna.uni_identity)
 
 /obj/item/weapon/card/id/attack_self(mob/user as mob)
 	for(var/mob/O in viewers(user, null))

code/game/objects/structures/morgue.dm

@@ -20,6 +20,12 @@
 	var/obj/structure/m_tray/connected = null
 	anchored = 1.0
 
+/obj/structure/morgue/Destroy()
+	if(connected)
+		qdel(connected)
+		connected = null
+	return ..()
+
 /obj/structure/morgue/proc/update()
 	if (src.connected)
 		src.icon_state = "morgue0"
@@ -63,8 +69,8 @@
 			if (!( A.anchored ))
 				A.loc = src
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
-		//src.connected = null
 		qdel(src.connected)
+		src.connected = null
 	else
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		src.connected = new /obj/structure/m_tray( src.loc )
@@ -79,8 +85,8 @@
 			src.connected.icon_state = "morguet"
 			src.connected.set_dir(src.dir)
 		else
-			//src.connected = null
 			qdel(src.connected)
+			src.connected = null
 	src.add_fingerprint(user)
 	update()
 	return
@@ -112,11 +118,10 @@
 		src.icon_state = "morgue0"
 		for(var/atom/movable/A as mob|obj in src)
 			A.loc = src.connected.loc
-			//Foreach goto(106)
 		src.connected.icon_state = "morguet"
 	else
-		//src.connected = null
 		qdel(src.connected)
+		src.connected = null
 	return
 
 
@@ -134,6 +139,12 @@
 	anchored = 1
 	throwpass = 1
 
+/obj/structure/m_tray/Destroy()
+	if(connected && connected.connected == src)
+		connected.connected = null
+	connected = null
+	return ..()
+
 /obj/structure/m_tray/attack_hand(mob/user as mob)
 	if (src.connected)
 		for(var/atom/movable/A as mob|obj in src.loc)
@@ -179,6 +190,12 @@
 	var/id = 1
 	var/locked = 0
 
+/obj/structure/crematorium/Destroy()
+	if(connected)
+		qdel(connected)
+		connected = null
+	return ..()
+
 /obj/structure/crematorium/proc/update()
 	if (src.connected)
 		src.icon_state = "crema0"
@@ -278,11 +295,10 @@
 		src.icon_state = "crema0"
 		for(var/atom/movable/A as mob|obj in src)
 			A.loc = src.connected.loc
-			//Foreach goto(106)
 		src.connected.icon_state = "cremat"
 	else
-		//src.connected = null
 		qdel(src.connected)
+		src.connected = null
 	return
 
 /obj/structure/crematorium/proc/cremate(atom/A, mob/user as mob)

code/modules/nano/modules/alarm_monitor.dm

@@ -44,13 +44,12 @@
 
 	return all_alarms
 
-/obj/nano_module/alarm_monitor/ai/Topic(ref, href_list)
+/obj/nano_module/alarm_monitor/Topic(ref, href_list)
 	if(..())
 		return 1
 	if(href_list["switchTo"])
 		var/obj/machinery/camera/C = locate(href_list["switchTo"]) in cameranet.cameras
 		if(!C)
-
 			return
 
 		usr.switch_to_camera(C)

code/modules/reagents/Chemistry-Recipes.dm

@@ -1459,10 +1459,10 @@
 	required_reagents = list("rum" = 2, "cola" = 1)
 	result_amount = 3
 
-/datum/chemical_reaction/classicmartini
+/datum/chemical_reaction/martini
 	name = "Classic Martini"
-	id = "classicmartini"
-	result = "classicmartini"
+	id = "martini"
+	result = "martini"
 	required_reagents = list("gin" = 2, "vermouth" = 1)
 	result_amount = 3