From 6b98dcdf5050c95adc4969a4ca4d5f08cbb4113f Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Erikafox@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:47:03 -0400 Subject: [PATCH 1/2] map frontiersmen turrets in --- .../BeachRuins/beach_fishing_hut.dmm | 60 ++++++++++--------- .../BeachRuins/beach_pirate_crash.dmm | 11 +--- 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm index 6a81ff12aaac..f646692f324e 100644 --- a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm @@ -4,6 +4,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/ruin/beach) +"bl" = ( +/obj/machinery/light/floor, +/obj/machinery/porta_turret/ship/frontiersmen{ + dir = 6 + }, +/turf/open/floor/concrete/reinforced, +/area/ruin/beach) "bs" = ( /obj/effect/turf_decal/borderfloor{ dir = 1 @@ -139,12 +146,8 @@ /area/ruin/beach) "hd" = ( /obj/machinery/light/floor, -/obj/machinery/porta_turret/syndicate/energy{ - active_power_usage = 0; - faction = list("Frontiersmen","beach"); - idle_power_usage = 0; - reqpower = 0; - name = "Point defense anti-carp turret" +/obj/machinery/porta_turret/ship/frontiersmen{ + dir = 10 }, /turf/open/floor/concrete/reinforced, /area/ruin/beach) @@ -259,6 +262,13 @@ }, /turf/open/water/beach/deep, /area/overmap_encounter/planetoid/beachplanet/explored) +"lT" = ( +/obj/machinery/light/floor, +/obj/machinery/porta_turret/ship/frontiersmen{ + dir = 5 + }, +/turf/open/floor/concrete/reinforced, +/area/ruin/beach) "lX" = ( /obj/effect/turf_decal/weather/sand{ dir = 1 @@ -383,6 +393,13 @@ }, /turf/open/water/beach, /area/overmap_encounter/planetoid/beachplanet/explored) +"pd" = ( +/obj/machinery/light/floor, +/obj/machinery/porta_turret/ship/frontiersmen{ + dir = 9 + }, +/turf/open/floor/concrete/reinforced, +/area/ruin/beach) "pe" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/siding/wood{ @@ -478,6 +495,7 @@ /obj/machinery/light/small/directional/north{ light_color = "#694c12" }, +/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered, /turf/open/floor/carpet, /area/ruin/beach) "tj" = ( @@ -657,9 +675,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "Bg" = ( /obj/effect/turf_decal/corner/opaque/pink/diagonal, -/mob/living/simple_animal/hostile/human/frontier{ - faction = list("Frontiersmen","beach") - }, +/mob/living/simple_animal/hostile/human/frontier, /turf/open/floor/plastic, /area/ruin/beach) "Bo" = ( @@ -840,9 +856,7 @@ "GP" = ( /obj/structure/chair/sofa/brown/right/directional/south, /obj/effect/decal/cleanable/cobweb, -/mob/living/simple_animal/hostile/human/frontier{ - faction = list("Frontiersmen","beach") - }, +/mob/living/simple_animal/hostile/human/frontier, /turf/open/floor/carpet, /area/ruin/beach) "Hb" = ( @@ -1032,9 +1046,7 @@ /obj/structure/chair/plastic{ dir = 8 }, -/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered{ - faction = list("Frontiersmen","beach") - }, +/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered, /turf/open/floor/wood/ebony, /area/overmap_encounter/planetoid/beachplanet/explored) "Os" = ( @@ -1108,9 +1120,7 @@ /area/ruin/beach) "Rh" = ( /obj/structure/chair/sofa/brown/corner/directional/south, -/mob/living/simple_animal/hostile/human/frontier{ - faction = list("Frontiersmen","beach") - }, +/mob/living/simple_animal/hostile/human/frontier, /turf/open/floor/carpet, /area/ruin/beach) "RE" = ( @@ -1223,9 +1233,7 @@ pixel_x = 4; layer = 2.9 }, -/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered{ - faction = list("Frontiersmen","beach") - }, +/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered, /turf/open/floor/wood/ebony, /area/overmap_encounter/planetoid/beachplanet/explored) "Vm" = ( @@ -1305,9 +1313,7 @@ /turf/open/water/beach, /area/overmap_encounter/planetoid/beachplanet/explored) "ZJ" = ( -/mob/living/simple_animal/hostile/human/frontier{ - faction = list("Frontiersmen","beach") - }, +/mob/living/simple_animal/hostile/human/frontier, /turf/open/floor/wood, /area/ruin/beach) "ZV" = ( @@ -1673,7 +1679,7 @@ Fr Fr Fr sG -hd +pd Fq Fr QQ @@ -2260,7 +2266,7 @@ Fr Fr Fr sG -hd +lT Fq QQ ut @@ -2356,7 +2362,7 @@ YL ID Fr sG -hd +bl Fq Fr Fr diff --git a/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm b/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm index fddfa5bdc00f..2c849dc9ba35 100644 --- a/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm @@ -1365,16 +1365,11 @@ icon_state = "0-8" }, /obj/machinery/light/small/directional/east, -/obj/machinery/porta_turret/syndicate/pod{ - desc = "A turret built with substandard parts and run down further with age. Still capable of delivering lethal lasers to the odd space carp, but not much else."; - dir = 8; - faction = list("Frontiersmen"); - lethal_projectile = /obj/projectile/beam/weak/penetrator; - lethal_projectile_sound = 'sound/weapons/plasma_cutter.ogg'; - name = "laser turret" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/porta_turret/ship/frontiersmen/light{ + dir = 10 + }, /turf/open/floor/plating, /area/ruin/beach/piratecrash) "PH" = ( From 542ff2bbc94311cccdc47151fefab896d602cd12 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Erikafox@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:49:20 -0400 Subject: [PATCH 2/2] factionms --- _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm | 12 ++++++++---- _maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm index f646692f324e..d024e5ba7d51 100644 --- a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm @@ -7,7 +7,8 @@ "bl" = ( /obj/machinery/light/floor, /obj/machinery/porta_turret/ship/frontiersmen{ - dir = 6 + dir = 6; + faction = list("Frontiersmen","Turret") }, /turf/open/floor/concrete/reinforced, /area/ruin/beach) @@ -147,7 +148,8 @@ "hd" = ( /obj/machinery/light/floor, /obj/machinery/porta_turret/ship/frontiersmen{ - dir = 10 + dir = 10; + faction = list("Frontiersmen","Turret") }, /turf/open/floor/concrete/reinforced, /area/ruin/beach) @@ -265,7 +267,8 @@ "lT" = ( /obj/machinery/light/floor, /obj/machinery/porta_turret/ship/frontiersmen{ - dir = 5 + dir = 5; + faction = list("Frontiersmen","Turret") }, /turf/open/floor/concrete/reinforced, /area/ruin/beach) @@ -396,7 +399,8 @@ "pd" = ( /obj/machinery/light/floor, /obj/machinery/porta_turret/ship/frontiersmen{ - dir = 9 + dir = 9; + faction = list("Frontiersmen","Turret") }, /turf/open/floor/concrete/reinforced, /area/ruin/beach) diff --git a/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm b/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm index 2c849dc9ba35..d81eb0c511e2 100644 --- a/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm @@ -1368,7 +1368,8 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/porta_turret/ship/frontiersmen/light{ - dir = 10 + dir = 10; + faction = list("Frontiersmen","Turret") }, /turf/open/floor/plating, /area/ruin/beach/piratecrash)