Skip to content

Commit

Permalink
Tweak for meatpackers ruin turrets (ParadiseSS13#27422)
Browse files Browse the repository at this point in the history
* fix turrets

* (not)new type of a turret
  • Loading branch information
kyunkyunkyun authored Dec 22, 2024
1 parent 7511539 commit 5c549ad
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 17 deletions.
20 changes: 3 additions & 17 deletions _maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down
6 changes: 6 additions & 0 deletions code/game/machinery/portable_turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5c549ad

Please sign in to comment.