Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Eastwoodification #103

Merged
merged 12 commits into from
Apr 20, 2024
Merged

Eastwoodification #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4f07a65
assimilates nash and oasis into eastwood
xTrainx Apr 19, 2024
a55590d
Texarkana > pahrump
xTrainx Apr 19, 2024
2a8f5fd
adds radio host
xTrainx Apr 20, 2024
90f04fb
small fixes for radio host
xTrainx Apr 20, 2024
f3fbe99
fix prospector access
xTrainx Apr 20, 2024
d4b1891
linter fix maybe
xTrainx Apr 20, 2024
a61c7f3
linter missing an icon
xTrainx Apr 20, 2024
df05ce0
why can nothing be easy
xTrainx Apr 20, 2024
f409d5f
fuuck
xTrainx Apr 20, 2024
04d03b0
oops
xTrainx Apr 20, 2024
a72c7bc
Merge branch 'master' of https://github.com/Foundation-19/Hail-Mary i…
xTrainx Apr 20, 2024
fac6934
Merge branch 'master' of https://github.com/Foundation-19/Hail-Mary i…
xTrainx Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 79 additions & 79 deletions _maps/map_files/Fortress Nash/FortNash1.dmm
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions _maps/map_files/Fortress Nash/FortNashLower.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27445,7 +27445,7 @@
"uqE" = (
/obj/structure/ladder/unbreakable{
height = 1;
id = "Nashsewers"
id = "Eastwoodsewers"
},
/turf/open/floor/f13{
icon_state = "neutralrustyfull"
Expand Down Expand Up @@ -29818,7 +29818,7 @@
/area/f13/caves)
"woc" = (
/mob/living/simple_animal/hostile/raider/ranged/biker{
name = "Texarkana Timothy"
name = "Pahrump Timothy"
},
/turf/open/floor/f13{
icon_state = "greenrustyfull"
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/Fortress Nash/FortNashUpper1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2645,7 +2645,7 @@
/obj/structure/nest/randomized{
randomizer_difficulty = 1;
randomizer_kind = "mid level mobs";
randomizer_tag = "Texarkana Tigers"
randomizer_tag = "Pahrump Tigers"
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood_common,
Expand Down Expand Up @@ -11049,7 +11049,7 @@
/obj/structure/nest/randomized{
randomizer_difficulty = 1;
randomizer_kind = "mid level mobs";
randomizer_tag = "Texarkana Tigers"
randomizer_tag = "Pahrump Tigers"
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood_common,
Expand Down Expand Up @@ -13176,7 +13176,7 @@
/obj/structure/nest/randomized{
randomizer_difficulty = 1;
randomizer_kind = "mid level mobs";
randomizer_tag = "Texarkana Tigers"
randomizer_tag = "Pahrump Tigers"
},
/obj/machinery/light/small/broken{
dir = 1
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Fortress Nash/FortNashUpper2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,8 +1281,8 @@
/area/f13/building)
"CQ" = (
/obj/effect/landmark/vertibird{
id = "Nash - Christus Saint Michaels Hospital - Rooftop";
name = "Nash - Christus Saint Michaels Hospital - Rooftop"
id = "Eastwood - Christus Saint Michaels Hospital - Rooftop";
name = "Eastwood - Christus Saint Michaels Hospital - Rooftop"
},
/turf/open/floor/plasteel/f13/vault_floor/dark{
icon_state = "darkdirty"
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/Pahrump-AB/Dungeons.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42714,7 +42714,7 @@
},
/area/f13/brotherhood/offices1st)
"vpe" = (
/obj/machinery/light/sign/oasis{
/obj/machinery/light/sign/eastwood{
density = 0;
pixel_x = -27
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25970,7 +25970,7 @@
"uqE" = (
/obj/structure/ladder/unbreakable{
height = 1;
id = "Nashsewers"
id = "Eastwoodsewers"
},
/turf/open/floor/f13{
icon_state = "neutralrustyfull"
Expand Down Expand Up @@ -28305,7 +28305,7 @@
/area/f13/tunnel)
"woc" = (
/mob/living/simple_animal/hostile/raider/ranged/biker{
name = "Texarkana Timothy"
name = "Pahrump Timothy"
},
/turf/open/floor/f13{
icon_state = "greenrustyfull"
Expand Down
Loading
Loading