Merge remote-tracking branch 'upstream/master' into more_ss_ports

# Conflicts:
#	code/modules/food_and_drinks/food/snacks.dm

code/modules/food_and_drinks/food/snacks.dm

@@ -1250,8 +1250,14 @@
 /obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
 	if(!QDELETED(src))
 		visible_message("<span class='notice'>[src] expands!</span>")
-		var/mob/living/carbon/human/H = new /mob/living/carbon/human(get_turf(src))
-		H.set_species(monkey_type)
+		if(fingerprintslast)
+			log_game("Cube ([monkey_type]) inflated, last touched by: " + fingerprintslast)
+		else
+			log_game("Cube ([monkey_type]) inflated, last touched by: NO_DATA")
+		var/mob/living/carbon/human/creature = new /mob/living/carbon/human(get_turf(src))
+		if(fingerprintshidden.len)
+			creature.fingerprintshidden = fingerprintshidden.Copy()
+		creature.set_species(monkey_type)
 		qdel(src)
 
 /obj/item/reagent_containers/food/snacks/monkeycube/farwacube

code/modules/mining/satchel_ore_boxdm.dm

@@ -6,26 +6,26 @@
 	icon_state = "orebox0"
 	name = "ore box"
 	desc = "A heavy wooden box, which can be filled with a lot of ores."
-	density = 1
-	pressure_resistance = 5*ONE_ATMOSPHERE
+	density = TRUE
+	pressure_resistance = 5 * ONE_ATMOSPHERE
 
-/obj/structure/ore_box/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/structure/ore_box/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/t_scanner/adv_mining_scanner))
 		attack_hand(user)
 		return
 	if(istype(W, /obj/item/ore))
 		if(!user.drop_item())
 			return
-		W.loc = src
+		W.forceMove(src)
 	if(istype(W, /obj/item/storage))
 		var/obj/item/storage/S = W
 		S.hide_from(usr)
 		for(var/obj/item/ore/O in S.contents)
 			S.remove_from_storage(O, src) //This will move the item to this item's contents
+			CHECK_TICK
 		to_chat(user, "<span class='notice'>You empty the satchel into the box.</span>")
-	return
 
-/obj/structure/ore_box/attack_hand(mob/user as mob)
+/obj/structure/ore_box/attack_hand(mob/user)
 	var/amt_gold = 0
 	var/amt_silver = 0
 	var/amt_diamond = 0
@@ -90,20 +90,19 @@
 	var/datum/browser/popup = new(user, "orebox", name, 400, 400)
 	popup.set_content(dat)
 	popup.open(0)
-	return
 
 /obj/structure/ore_box/Topic(href, href_list)
 	if(..())
 		return
 	usr.set_machine(src)
-	src.add_fingerprint(usr)
+	add_fingerprint(usr)
 	if(href_list["removeall"])
 		for(var/obj/item/ore/O in contents)
 			contents -= O
-			O.loc = src.loc
+			O.forceMove(loc)
+			CHECK_TICK
 		to_chat(usr, "<span class='notice'>You empty the box.</span>")
-	src.updateUsrDialog()
-	return
+	updateUsrDialog()
 
 obj/structure/ore_box/ex_act(severity, target)
 	if(prob(100 / severity) && severity < 3)
@@ -115,11 +114,11 @@ obj/structure/ore_box/ex_act(severity, target)
 	set category = "Object"
 	set src in view(1)
 
-	if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes.
+	if(!ishuman(usr)) //Only living, intelligent creatures with hands can empty ore boxes.
 		to_chat(usr, "<span class='warning'>You are physically incapable of emptying the ore box.</span>")
 		return
 
-	if( usr.stat || usr.restrained() )
+	if(usr.incapacitated())
 		return
 
 	if(!Adjacent(usr)) //You can only empty the box if you can physically reach it
@@ -134,7 +133,6 @@ obj/structure/ore_box/ex_act(severity, target)
 
 	for(var/obj/item/ore/O in contents)
 		contents -= O
-		O.loc = src.loc
-	to_chat(usr, "<span class='notice'>You empty the ore box.</span>")
-
-	return
+		O.forceMove(loc)
+		CHECK_TICK
+	to_chat(usr, "<span class='notice'>You empty the ore box.</span>")

code/modules/reagents/chemistry/recipes/pyrotechnics.dm

@@ -214,19 +214,18 @@ datum/chemical_reaction/flash_powder
 	var/datum/effect_system/smoke_spread/chem/S = new
 	S.attach(location)
 	playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
-	spawn(0)
-		if(S)
-			S.set_up(holder, 10, 0, location)
-			if(created_volume < 5)
-				S.start(1)
-			if(created_volume >=5 && created_volume < 10)
-				S.start(2)
-			if(created_volume >= 10 && created_volume < 15)
-				S.start(3)
-			if(created_volume >=15)
-				S.start(4)
-		if(holder && holder.my_atom)
-			holder.clear_reagents()
+	if(S)
+		S.set_up(holder, 10, 0, location)
+		if(created_volume < 5)
+			S.start(1)
+		if(created_volume >=5 && created_volume < 10)
+			S.start(2)
+		if(created_volume >= 10 && created_volume < 15)
+			S.start(3)
+		if(created_volume >=15)
+			S.start(4)
+	if(holder && holder.my_atom)
+		holder.clear_reagents()
 
 /datum/chemical_reaction/smoke/smoke_powder
 	name = "smoke_powder_smoke"

code/modules/research/designs/machine_designs.dm

@@ -452,16 +452,6 @@
 	build_path = /obj/item/circuitboard/arcade/orion_trail
 	category = list("Misc. Machinery")
 
-/datum/design/programmable
-	name = "Machine Board (Programmable Unloader)"
-	desc = "The circuit board for a Programmable Unloader."
-	id = "selunload"
-	req_tech = list("engineering" = 1, "programming" = 2)
-	build_type = IMPRINTER
-	materials = list(MAT_GLASS = 1000)
-	build_path = /obj/item/circuitboard/programmable
-	category = list("Misc. Machinery")
-
 /datum/design/pod
 	name = "Machine Board (Mass Driver and Pod Doors Control)"
 	desc = "Allows for the construction of circuit boards used to build a Mass Driver and Pod Doors Control."