From 5c549adeb68a710cb9dbbd9c428c5ea7ac7c85e5 Mon Sep 17 00:00:00 2001 From: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com> Date: Sun, 22 Dec 2024 21:55:04 +0500 Subject: [PATCH] Tweak for meatpackers ruin turrets (#27422) * fix turrets * (not)new type of a turret --- .../RandomRuins/SpaceRuins/meatpackers.dmm | 20 +++---------------- code/game/machinery/portable_turret.dm | 6 ++++++ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm index 4c19b607278..f63dd936248 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm @@ -19,11 +19,7 @@ /turf/simulated/floor/engine, /area/ruin/unpowered/bmp_ship/delta) "af" = ( -/obj/machinery/porta_turret{ - installation = /obj/item/gun/energy/gun; - lethal = 1; - name = "ship defense turret" - }, +/obj/machinery/porta_turret/meatpacker_ship, /turf/simulated/floor/engine, /area/ruin/unpowered/bmp_ship/delta) "ag" = ( @@ -1827,12 +1823,7 @@ /turf/simulated/floor/plasteel, /area/ruin/unpowered/bmp_ship/aft) "go" = ( -/obj/machinery/porta_turret{ - check_synth = 1; - installation = /obj/item/gun/energy/gun; - lethal = 1; - name = "ship defense turret" - }, +/obj/machinery/porta_turret/meatpacker_ship, /turf/simulated/floor/engine, /area/ruin/unpowered/bmp_ship/fore) "gp" = ( @@ -2118,12 +2109,7 @@ /turf/simulated/floor/engine, /area/ruin/unpowered/bmp_ship/aft) "hp" = ( -/obj/machinery/porta_turret{ - check_synth = 1; - installation = /obj/item/gun/energy/gun; - lethal = 1; - name = "ship defense turret" - }, +/obj/machinery/porta_turret/meatpacker_ship, /turf/simulated/floor/engine, /area/ruin/unpowered/bmp_ship/aft) "hq" = ( diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 77fec4620b9..dc292c44f28 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -1225,3 +1225,9 @@ GLOBAL_LIST_EMPTY(turret_icons) /obj/machinery/porta_turret/inflatable_turret/CanPathfindPass(to_dir, datum/can_pass_info/pass_info) return ((stat & BROKEN) || !pass_info.is_living) + +// Meatpackers' ruin turret +/obj/machinery/porta_turret/meatpacker_ship + name = "ship defense turret" + lethal = TRUE + check_synth = TRUE