From b8ec725e6a6168d9b6c3cf0610300abc0135cb6e Mon Sep 17 00:00:00 2001 From: Mark Suckerberg Date: Wed, 27 Nov 2024 16:32:20 -0600 Subject: [PATCH] Fixes controllers and bullet damage --- .../machinery/porta_turret/portable_turret.dm | 1 + .../porta_turret/portable_turret_control.dm | 15 ++++----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 6ee4006057e5..9a5de4d6ced2 100644 --- 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 index 075a0b2ad540..f276b6ad7c53 100644 --- 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()