Fixes controllers and bullet damage

shiptest-ss13 · Nov 27, 2024 · b8ec725 · b8ec725
1 parent 307e1f7
commit b8ec725
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
@@ -427,6 +427,7 @@
 	retaliating = TRUE
 
 /obj/machinery/porta_turret/bullet_act(obj/projectile/hitting_projectile)
+	. = ..()
 	if(ismob(hitting_projectile.firer))
 		retaliate(hitting_projectile.firer)
 

diff --git a/code/game/machinery/porta_turret/portable_turret_control.dm b/code/game/machinery/porta_turret/portable_turret_control.dm
@@ -147,34 +147,27 @@
 			return TRUE
 		if("power")
 			toggle_on(usr)
-			return TRUE
 		if("mode")
 			toggle_lethal(usr)
-			return TRUE
-
 		if("toggle_dangerous")
 			turret_flags ^= TURRET_FLAG_SHOOT_DANGEROUS_ONLY
-			return TRUE
 		if("toggle_retaliate")
 			turret_flags ^= TURRET_FLAG_SHOOT_RETALIATE
-			return TRUE
+
 
 		if("toggle_fauna")
 			turret_flags ^= TURRET_FLAG_SHOOT_FAUNA
-			return TRUE
 		if("toggle_humans")
 			turret_flags ^= TURRET_FLAG_SHOOT_HUMANS
-			return TRUE
 		if("toggle_silicons")
 			turret_flags ^= TURRET_FLAG_SHOOT_SILICONS
-			return TRUE
-
 		if("toggle_nonfaction")
 			turret_flags ^= TURRET_FLAG_SHOOT_NONFACTION
-			return TRUE
 		if("toggle_specificfaction")
 			turret_flags ^= TURRET_FLAG_SHOOT_SPECIFIC_FACTION
-			return TRUE
+
+		else
+			return
 
 	update_turrets()