Skip to content

Commit 5c549ad

Browse files
authored
Tweak for meatpackers ruin turrets (#27422)
* fix turrets * (not)new type of a turret
1 parent 7511539 commit 5c549ad

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919
/turf/simulated/floor/engine,
2020
/area/ruin/unpowered/bmp_ship/delta)
2121
"af" = (
22-
/obj/machinery/porta_turret{
23-
installation = /obj/item/gun/energy/gun;
24-
lethal = 1;
25-
name = "ship defense turret"
26-
},
22+
/obj/machinery/porta_turret/meatpacker_ship,
2723
/turf/simulated/floor/engine,
2824
/area/ruin/unpowered/bmp_ship/delta)
2925
"ag" = (
@@ -1827,12 +1823,7 @@
18271823
/turf/simulated/floor/plasteel,
18281824
/area/ruin/unpowered/bmp_ship/aft)
18291825
"go" = (
1830-
/obj/machinery/porta_turret{
1831-
check_synth = 1;
1832-
installation = /obj/item/gun/energy/gun;
1833-
lethal = 1;
1834-
name = "ship defense turret"
1835-
},
1826+
/obj/machinery/porta_turret/meatpacker_ship,
18361827
/turf/simulated/floor/engine,
18371828
/area/ruin/unpowered/bmp_ship/fore)
18381829
"gp" = (
@@ -2118,12 +2109,7 @@
21182109
/turf/simulated/floor/engine,
21192110
/area/ruin/unpowered/bmp_ship/aft)
21202111
"hp" = (
2121-
/obj/machinery/porta_turret{
2122-
check_synth = 1;
2123-
installation = /obj/item/gun/energy/gun;
2124-
lethal = 1;
2125-
name = "ship defense turret"
2126-
},
2112+
/obj/machinery/porta_turret/meatpacker_ship,
21272113
/turf/simulated/floor/engine,
21282114
/area/ruin/unpowered/bmp_ship/aft)
21292115
"hq" = (

code/game/machinery/portable_turret.dm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,3 +1225,9 @@ GLOBAL_LIST_EMPTY(turret_icons)
12251225

12261226
/obj/machinery/porta_turret/inflatable_turret/CanPathfindPass(to_dir, datum/can_pass_info/pass_info)
12271227
return ((stat & BROKEN) || !pass_info.is_living)
1228+
1229+
// Meatpackers' ruin turret
1230+
/obj/machinery/porta_turret/meatpacker_ship
1231+
name = "ship defense turret"
1232+
lethal = TRUE
1233+
check_synth = TRUE

0 commit comments

Comments
 (0)