Merge branch 'master' into donoritemmodularization

code/game/objects/structures/ai_core.dm

@@ -185,7 +185,7 @@
 
 						if(brain.force_replace_ai_name)
 							A.fully_replace_character_name(A.name, brain.replacement_ai_name())
-						SSblackbox.inc("cyborg_ais_created",1)
+						SSblackbox.record_feedback("amount", "ais_created", 1)
 						qdel(src)
 					else
 						state = AI_READY_CORE

code/game/objects/structures/beds_chairs/alien_nest.dm

@@ -66,16 +66,16 @@
 			"<span class='italics'>You hear squelching...</span>")
 
 /obj/structure/bed/nest/post_buckle_mob(mob/living/M)
-	if(M in buckled_mobs)
-		M.pixel_y = 0
-		M.pixel_x = initial(M.pixel_x) + 2
-		M.layer = BELOW_MOB_LAYER
-		add_overlay(nest_overlay)
-	else
-		M.pixel_x = M.get_standard_pixel_x_offset(M.lying)
-		M.pixel_y = M.get_standard_pixel_y_offset(M.lying)
-		M.layer = initial(M.layer)
-		cut_overlay(nest_overlay)
+	M.pixel_y = 0
+	M.pixel_x = initial(M.pixel_x) + 2
+	M.layer = BELOW_MOB_LAYER
+	add_overlay(nest_overlay)
+
+/obj/structure/bed/nest/post_unbuckle_mob(mob/living/M)
+	M.pixel_x = M.get_standard_pixel_x_offset(M.lying)
+	M.pixel_y = M.get_standard_pixel_y_offset(M.lying)
+	M.layer = initial(M.layer)
+	cut_overlay(nest_overlay)
 
 /obj/structure/bed/nest/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
 	switch(damage_type)

code/game/objects/structures/beds_chairs/bed.dm

@@ -85,21 +85,21 @@
 		qdel(src)
 
 /obj/structure/bed/roller/post_buckle_mob(mob/living/M)
-	if(M in buckled_mobs)
-		density = TRUE
-		icon_state = "up"
-		M.pixel_y = initial(M.pixel_y)
-	else
-		density = FALSE
-		icon_state = "down"
-		M.pixel_x = M.get_standard_pixel_x_offset(M.lying)
-		M.pixel_y = M.get_standard_pixel_y_offset(M.lying)
+	density = TRUE
+	icon_state = "up"
+	M.pixel_y = initial(M.pixel_y)
 
 /obj/structure/bed/roller/Moved()
 	. = ..()
 	if(has_gravity())
 		playsound(src, 'sound/effects/roll.ogg', 100, 1)
 
+/obj/structure/bed/roller/post_unbuckle_mob(mob/living/M)
+	density = FALSE
+	icon_state = "down"
+	M.pixel_x = M.get_standard_pixel_x_offset(M.lying)
+	M.pixel_y = M.get_standard_pixel_y_offset(M.lying)
+
 /obj/item/roller
 	name = "roller bed"
 	desc = "A collapsed roller bed that can be carried around."

code/game/objects/structures/beds_chairs/chair.dm

@@ -91,7 +91,11 @@
 		layer = OBJ_LAYER
 
 /obj/structure/chair/post_buckle_mob(mob/living/M)
-	..()
+	. = ..()
+	handle_layer()
+
+/obj/structure/chair/post_unbuckle_mob()
+	. = ..()
 	handle_layer()
 
 /obj/structure/chair/proc/spin()
@@ -167,12 +171,18 @@
 	return ..()
 
 /obj/structure/chair/comfy/post_buckle_mob(mob/living/M)
-	..()
+	. = ..()
+	update_armrest()
+
+/obj/structure/chair/comfy/proc/update_armrest()
 	if(has_buckled_mobs())
 		add_overlay(armrest)
 	else
 		cut_overlay(armrest)
 
+/obj/structure/chair/comfy/post_unbuckle_mob()
+	. = ..()
+	update_armrest()
 
 /obj/structure/chair/comfy/brown
 	color = rgb(255,113,0)

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -6,7 +6,7 @@
 /obj/structure/closet/secure_closet/quartermaster/PopulateContents()
 	..()
 	new /obj/item/clothing/neck/cloak/qm(src)
-	new /obj/item/storage/lockbox/medal/cargo/(src)
+	new /obj/item/storage/lockbox/medal/cargo(src)
 	new /obj/item/clothing/under/rank/cargo(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/device/radio/headset/headset_cargo(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -188,7 +188,6 @@
 	new /obj/item/clothing/suit/armor/vest/det_suit(src)
 	new /obj/item/storage/belt/holster/full(src)
 	new /obj/item/pinpointer/crew(src)
-	new /obj/item/device/mass_spectrometer(src)
 
 /obj/structure/closet/secure_closet/injection
 	name = "lethal injections"

code/game/objects/structures/girders.dm

@@ -408,7 +408,7 @@
 
 /obj/structure/girder/cult/deconstruct(disassembled = TRUE)
 	if(!(flags_1 & NODECONSTRUCT_1))
-		new/obj/item/stack/sheet/runed_metal/(get_turf(src), 1)
+		new /obj/item/stack/sheet/runed_metal(drop_location(), 1)
 	qdel(src)
 
 /obj/structure/girder/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)

code/game/objects/structures/musician.dm

@@ -328,6 +328,8 @@
 	density = TRUE
 	var/datum/song/song
 
+/obj/structure/piano/unanchored
+	anchored = FALSE
 
 /obj/structure/piano/New()
 	..()

code/game/objects/structures/showcase.dm

@@ -40,14 +40,14 @@
 	icon_state = "pod_g"
 
 /obj/structure/showcase/machinery/oldpod
-	name = "damaged cyrogenic pod"
-	desc = "A damaged cyrogenic pod long since lost to time, including its former occupant..."
+	name = "damaged cryogenic pod"
+	desc = "A damaged cryogenic pod long since lost to time, including its former occupant..."
 	icon = 'icons/obj/cryogenic2.dmi'
 	icon_state = "sleeper-open"
 
 /obj/structure/showcase/machinery/oldpod/used
-	name = "opened cyrogenic pod"
-	desc = "Cyrogenic pod that has recently discharged its occupand. The pod appears non-functional."
+	name = "opened cryogenic pod"
+	desc = "A cryogenic pod that has recently discharged its occupant. The pod appears non-functional."
 
 /obj/structure/showcase/cyborg/old
 	name = "Cyborg Statue"

code/game/objects/structures/statues.dm

@@ -177,8 +177,8 @@
 	else
 		return ..()
 
-/obj/structure/statue/plasma/proc/PlasmaBurn()
-	atmos_spawn_air("plasma=400;TEMP=1000")
+/obj/structure/statue/plasma/proc/PlasmaBurn(exposed_temperature)
+	atmos_spawn_air("plasma=[oreAmount*10];TEMP=[exposed_temperature]")
 	deconstruct(FALSE)
 
 /obj/structure/statue/plasma/proc/ignite(exposed_temperature)

code/game/objects/structures/tables_racks.dm

@@ -411,6 +411,7 @@
 	desc = "Different from the Middle Ages version."
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "rack"
+	layer = TABLE_LAYER
 	density = TRUE
 	anchored = TRUE
 	pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density.