Merge pull request #8288 from mwerezak/topicfix

Topic Fixes
2026-02-02 04:10:42 +00:00 · 2015-02-26 16:28:56 +10:30
parent a9d23df3ff 6d15809768
commit f14922f1f8
40 changed files with 43 additions and 42 deletions
--- a/code/modules/projectiles/guns/energy/temperature.dm
+++ b/code/modules/projectiles/guns/energy/temperature.dm
@@ -42,7 +42,7 @@

 /obj/item/weapon/gun/energy/temperature/Topic(href, href_list)
 	if (..())
-		return
+		return 1
 	usr.set_machine(src)
 	src.add_fingerprint(usr)

--- a/code/modules/projectiles/guns/projectile/dartgun.dm
+++ b/code/modules/projectiles/guns/projectile/dartgun.dm
@@ -165,6 +165,7 @@
 	return 0

 /obj/item/weapon/gun/projectile/dartgun/Topic(href, href_list)
+	if(..()) return 1
 	src.add_fingerprint(usr)
 	if(href_list["stop_mix"])
 		var/index = text2num(href_list["stop_mix"])