Skip to content

Correct sunnyvale buildings base now #54

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

Open
KillerGryphon wants to merge 17 commits into
base: maps/sunnyvale
Choose a base branch
from
Open

Correct sunnyvale buildings base now #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
81112fb
Legion sewers fix
Jul 2, 2022
6ca82f8
Merge remote-tracking branch 'upstream/maps/sunnyvale' into Legion-se…
Jul 2, 2022
d67d060
saving progress from the merge gods
Jul 2, 2022
d3e7bd1
Merge remote-tracking branch 'upstream/maps/sunnyvale' into Legion-se…
Jul 2, 2022
3884d1f
Merge gods appeased, also I forgot one legion mob whoops
Jul 2, 2022
d839d52
outline of factory
Jul 3, 2022
009dc51
Factory done
Jul 4, 2022
bc7ff78
Revert "Factory done"
Jul 4, 2022
3e1c697
Revert "Revert "Factory done""
Jul 4, 2022
1737dc8
Work done for now
Jul 5, 2022
90160d7
requested changes
Jul 5, 2022
5ee78f0
It's not over yet!
Jul 6, 2022
caf4ed0
Merge remote-tracking branch 'upstream/maps/sunnyvale' into Legion-se…
Jul 12, 2022
820b82a
decals, roofs, and a new map because sunny is big
Aug 7, 2022
deec88f
Merge branch 'Legion-sewers-fix' into Sunnyvale-surface-buildings
Aug 7, 2022
5968a07
Roof placement fix
Aug 9, 2022
2c54653
id quotations fix
Aug 9, 2022
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
3 changes: 0 additions & 3 deletions _maps/map_files/Pahrump/Dungeons.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13662,7 +13662,6 @@
"qFe" = (
/obj/machinery/door/airlock/security/glass{
name = "NCR No Mans Land Entrance";
req_access = null;
req_access_txt = "121"
},
/turf/open/floor/f13{
Expand Down Expand Up @@ -14624,7 +14623,6 @@
/area/f13/bunker)
"rFH" = (
/mob/living/simple_animal/hostile/supermutant/nightkin/elitemutant{
color = null;
desc = "Not to be confused with the other super mutant of similar name.";
extra_projectiles = 1;
health = 750;
Expand Down Expand Up @@ -16793,7 +16791,6 @@
/area/f13/bunker)
"uua" = (
/mob/living/simple_animal/hostile/supermutant/nightkin/elitemutant{
color = null;
desc = "A poor man consumed by his own folly.";
extra_projectiles = 1;
health = 750;
Expand Down
2 changes: 0 additions & 2 deletions _maps/map_files/Sunnyvale/Dungeons.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@
dwidth = 1;
height = 3;
id = "enclavefort_elevator_down";
json_key = null;
name = "enclave fort elevator down";
roundstart_template = null;
width = 4
},
/turf/open/floor/plasteel/elevatorshaft,
Expand Down
Loading