-
Notifications
You must be signed in to change notification settings - Fork 51
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.
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
The Mexico addon map but as a smaller, legion centric map. #218
Open
DeltaDav
wants to merge
58
commits into
Foundation-19:master
Choose a base branch
from
DeltaDav:mexico-standalone
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
58 commits
Select commit
Hold shift + click to select a range
4dcdbc6
Core
DeltaDav ff10f07
Map updates + Slots for Rebels
DeltaDav 59abdeb
Merge branch 'master' into mexico-standalone
DeltaDav f09fd4b
Corrections
DeltaDav dae81eb
file name fix
DeltaDav 8f93dc1
Update mexico.json
DeltaDav e8f7c4b
Merge branch 'master' into mexico-standalone
DeltaDav b1e37fc
jjob change files
DeltaDav 577632c
mexico json fix (wooops) and dme include new job
DeltaDav 0184fc7
renaming file to dm
DeltaDav 898ab4a
job fixes - loadout
DeltaDav 546562d
attempt to fix run linters
DeltaDav b37386b
Update mexico.json
DeltaDav ef071ab
job changes, map adjustement (bugs fixes)
DeltaDav 7946c58
map fixes
DeltaDav 6e0c75b
fix the job changer
xTrainx 7de4478
adds dungeons, and adds a new variation of sentry
DeltaDav 8ec787b
fixes
DeltaDav bbd6912
Update mexico_surface.dmm
DeltaDav 51ee3db
adds : bugs fixes, medic rebels 2 (slots) loadout for the governor
DeltaDav b7d711e
FORGOT FILES FOR THE MEDICS
DeltaDav 9159a7e
bug fixes + gov loadout fixes
DeltaDav ab8472e
Update jobs.dm
DeltaDav b95d061
Removal of Zombie and put down ghouls instead.
DeltaDav 2c1908f
zombie fix again
DeltaDav 0be9ce6
Change to the rebels, adding a new dungeons
DeltaDav ebbcb13
map and job update
DeltaDav 2c0d46e
Added dungeons
DeltaDav 2725e28
Merge branch 'master' into mexico-standalone
DeltaDav 108f28c
Water change , lavaboat change, map fix
DeltaDav 69182e6
update
DeltaDav fcd2f20
Update rebels.dm
DeltaDav f026420
update - lil changes
DeltaDav dc41c40
Update ostia.dm
DeltaDav 0221ff1
fixes
DeltaDav ee26dfc
Revert "fixes"
DeltaDav 610df24
update map
DeltaDav c1050d9
map fixes
DeltaDav c8851c1
Update mexico_underground.dmm
DeltaDav 329b10d
no more raiders + Vault work
DeltaDav da7b775
vault + raider
DeltaDav 157536c
Update mexico_underground.dmm
DeltaDav f5bce8c
vault gun
DeltaDav 309f92e
armor and rnd nerf
DeltaDav 3ed9b25
ai test
DeltaDav 737fc70
pa vault
DeltaDav 4605986
AI vault changes
DeltaDav ee719ca
ai / mapping stuff,
DeltaDav 2dbaf18
Revert "ai / mapping stuff,"
DeltaDav b37bd64
fix
DeltaDav 18b217f
Merge branch 'master' into mexico-standalone
DeltaDav bedb69e
Update mexico_underground.dmm
DeltaDav 199866d
rnd runtime fix I hope
DeltaDav 80a4a4b
job and acces fix
DeltaDav fdfc741
Update rebels.dm
DeltaDav b1b1fca
Update rebels.dm
DeltaDav 3694d78
makes people not spawn
DeltaDav f60cbc6
Update baltimore.json
DeltaDav File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
#define JOB_MODIFICATION_MAP_NAME "Central Pahrump" | ||
|
||
/datum/job/New() | ||
..() | ||
MAP_JOB_CHECK | ||
|
||
MAP_REMOVE_JOB(atlantic) | ||
MAP_REMOVE_JOB(f13followers) | ||
MAP_REMOVE_JOB(f13atlanticcap) | ||
MAP_REMOVE_JOB(f13atlanticdoc) | ||
MAP_REMOVE_JOB(f13atlanticsailor) | ||
MAP_REMOVE_JOB(f13atlanticmarines) | ||
MAP_REMOVE_JOB(locust_point) | ||
MAP_REMOVE_JOB(f13baltimoredockmaster) | ||
MAP_REMOVE_JOB(f13baltimorecouncil) | ||
MAP_REMOVE_JOB(f13baltimoreconstable) | ||
MAP_REMOVE_JOB(f13baltimorepolice) | ||
MAP_REMOVE_JOB(f13baltimorefarmer) | ||
MAP_REMOVE_JOB(f13baltimorebarkeep) | ||
MAP_REMOVE_JOB(baltimorecitizen) | ||
MAP_REMOVE_JOB(f13baltimoreradiohort) | ||
MAP_REMOVE_JOB(f13baltimorepreacher) | ||
MAP_REMOVE_JOB(f13baltimoremechanic) | ||
MAP_REMOVE_JOB(f13baltimoreshopclerc) | ||
MAP_REMOVE_JOB(f13baltimorepilot) | ||
MAP_REMOVE_JOB(f13minutemen) | ||
MAP_REMOVE_JOB(f13redwaterslave) | ||
MAP_REMOVE_JOB(watcher) | ||
MAP_REMOVE_JOB(resident) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
{ | ||
"map_name": "Mexico", | ||
"map_path": "map_files/Mexico", | ||
"map_file": [ | ||
"mexico_Surface.dmm", | ||
"mexico_Above.dmm", | ||
"mexico_Underground.dmm" | ||
], | ||
"station_ruin_budget":0, | ||
"space_ruin_levels":0, | ||
"space_empty_levels":0, | ||
"shuttles": { | ||
"cargo":"cargo_pahrump", | ||
"emergency": "emergency_pahrump", | ||
"ferry": "ferry_fancy" | ||
}, | ||
"traits":[ | ||
|
||
{ | ||
"Gravity": true, | ||
"Baseturf": "/turf/open/indestructible/ground/inside/mountain", | ||
"Up": 1, | ||
"Down": -1, | ||
"No Parallax": true, | ||
"Linkage" : "Cross", | ||
"Name": "Mexico Surface", | ||
"Force X": 2, | ||
"Force Y": 2, | ||
"Force Z": 1 | ||
}, | ||
|
||
{ | ||
"Gravity": true, | ||
"Baseturf": "/turf/open/indestructible/ground/inside/mountain", | ||
"Station": 1, | ||
"Up": 1, | ||
"Down": -1, | ||
"No Parallax": true, | ||
"Linkage" : "Cross", | ||
"Name": "Mexcio Underground", | ||
"Force X": 2, | ||
"Force Y": 2, | ||
"Force Z": 0 | ||
}, | ||
|
||
|
||
{ | ||
"Gravity": true, | ||
"Baseturf": "/turf/open/transparent/openspace", | ||
"Up": 1, | ||
"Down": -1, | ||
"No Parallax": true, | ||
"Linkage" : "Cross", | ||
"Above": true, | ||
"Name": "Mexico Upper", | ||
"Force X": 2, | ||
"Force Y": 2, | ||
"Force Z": 2 | ||
} | ||
|
||
], | ||
"minetype": "none", | ||
"added_jobs": [ | ||
"rebels.dm", | ||
"ostia.dm" | ||
], | ||
"removed_jobs": [ | ||
"eastwood.dm", | ||
"ncr.dm", | ||
"legion.dm", | ||
"enclave.dm", | ||
"bos.dm", | ||
"atlantic_cross.dm", | ||
"locust_point.dm", | ||
"vault.dm" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make sure to capitalize titles like Governor.