Skip to content

Commit

Permalink
Map Frontiersmen Turrets Onto Ruins (#3679)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds the frontiersmen turrets onto the 2 beach frontiersmen ruins with
turrets
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Content that is fitting for the factions used in places where you'd
expect it to be used
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Some frontiersmen ruins have been updated to have frontiersmen
turrets

/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Erikafox authored Nov 3, 2024
1 parent 877ec44 commit cd8ced3
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 35 deletions.
64 changes: 37 additions & 27 deletions _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
/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;
faction = list("Frontiersmen","Turret")
},
/turf/open/floor/concrete/reinforced,
/area/ruin/beach)
"bs" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
Expand Down Expand Up @@ -139,12 +147,9 @@
/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;
faction = list("Frontiersmen","Turret")
},
/turf/open/floor/concrete/reinforced,
/area/ruin/beach)
Expand Down Expand Up @@ -259,6 +264,14 @@
},
/turf/open/water/beach/deep,
/area/overmap_encounter/planetoid/beachplanet/explored)
"lT" = (
/obj/machinery/light/floor,
/obj/machinery/porta_turret/ship/frontiersmen{
dir = 5;
faction = list("Frontiersmen","Turret")
},
/turf/open/floor/concrete/reinforced,
/area/ruin/beach)
"lX" = (
/obj/effect/turf_decal/weather/sand{
dir = 1
Expand Down Expand Up @@ -383,6 +396,14 @@
},
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"pd" = (
/obj/machinery/light/floor,
/obj/machinery/porta_turret/ship/frontiersmen{
dir = 9;
faction = list("Frontiersmen","Turret")
},
/turf/open/floor/concrete/reinforced,
/area/ruin/beach)
"pe" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -478,6 +499,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" = (
Expand Down Expand Up @@ -657,9 +679,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" = (
Expand Down Expand Up @@ -840,9 +860,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" = (
Expand Down Expand Up @@ -1032,9 +1050,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" = (
Expand Down Expand Up @@ -1108,9 +1124,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" = (
Expand Down Expand Up @@ -1223,9 +1237,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" = (
Expand Down Expand Up @@ -1305,9 +1317,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" = (
Expand Down Expand Up @@ -1673,7 +1683,7 @@ Fr
Fr
Fr
sG
hd
pd
Fq
Fr
QQ
Expand Down Expand Up @@ -2260,7 +2270,7 @@ Fr
Fr
Fr
sG
hd
lT
Fq
QQ
ut
Expand Down Expand Up @@ -2356,7 +2366,7 @@ YL
ID
Fr
sG
hd
bl
Fq
Fr
Fr
Expand Down
12 changes: 4 additions & 8 deletions _maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1365,16 +1365,12 @@
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;
faction = list("Frontiersmen","Turret")
},
/turf/open/floor/plating,
/area/ruin/beach/piratecrash)
"PH" = (
Expand Down

0 comments on commit cd8ced3

Please sign in to comment.