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

2025-12-11 10:43:20 +00:00 · 2015-02-26 08:22:25 +01:00
parent 586ab164f8 f14922f1f8
commit e7653e1ed5
97 changed files with 1252 additions and 1109 deletions
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -67,7 +67,7 @@

 /obj/machinery/mineral/processing_unit_console/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 	usr.set_machine(src)
 	src.add_fingerprint(usr)

--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -43,7 +43,7 @@

 /obj/machinery/mineral/stacking_unit_console/Topic(href, href_list)
 	if(..())
-		return
+		return 1

 	if(href_list["change_stack"])
 		var/choice = input("What would you like to set the stack amount to?") as null|anything in list(1,5,10,20,50)
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -116,7 +116,7 @@

 /obj/machinery/mineral/mint/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(processing==1)
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -62,7 +62,7 @@

 /obj/item/weapon/moneybag/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(href_list["remove"])