fix the safety + misfiring

shiptest-ss13 · Oct 12, 2024 · 6016e7b · 6016e7b
1 parent 0b620b7
commit 6016e7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -963,7 +963,7 @@
 // for guns firing on their own without a user
 /obj/item/gun/proc/discharge(cause, seek_chance = 10)
 	var/target
-	if(!safety)
+	if(!safety && has_safety)
 		// someone is very unlucky and about to be shot
 		if(prob(seek_chance))
 			for(var/mob/living/target_mob in range(6, get_turf(src)))

diff --git a/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm b/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm
@@ -253,6 +253,7 @@
 	manufacturer = MANUFACTURER_IMPORT
 	slot_flags = ITEM_SLOT_BACK
 	has_safety = FALSE
+	safety = FALSE
 
 
 /obj/item/gun/ballistic/rocketlauncher/oneshot/Initialize()