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.

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
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
4dcdbc6
Core
DeltaDav Sep 22, 2024
ff10f07
Map updates + Slots for Rebels
DeltaDav Sep 22, 2024
59abdeb
Merge branch 'master' into mexico-standalone
DeltaDav Sep 23, 2024
f09fd4b
Corrections
DeltaDav Sep 23, 2024
dae81eb
file name fix
DeltaDav Sep 23, 2024
8f93dc1
Update mexico.json
DeltaDav Sep 23, 2024
e8f7c4b
Merge branch 'master' into mexico-standalone
DeltaDav Sep 23, 2024
b1e37fc
jjob change files
DeltaDav Sep 23, 2024
577632c
mexico json fix (wooops) and dme include new job
DeltaDav Sep 23, 2024
0184fc7
renaming file to dm
DeltaDav Sep 23, 2024
898ab4a
job fixes - loadout
DeltaDav Sep 23, 2024
546562d
attempt to fix run linters
DeltaDav Sep 24, 2024
b37386b
Update mexico.json
DeltaDav Sep 24, 2024
ef071ab
job changes, map adjustement (bugs fixes)
DeltaDav Sep 25, 2024
7946c58
map fixes
DeltaDav Sep 25, 2024
6e0c75b
fix the job changer
xTrainx Sep 29, 2024
7de4478
adds dungeons, and adds a new variation of sentry
DeltaDav Sep 29, 2024
8ec787b
fixes
DeltaDav Sep 29, 2024
bbd6912
Update mexico_surface.dmm
DeltaDav Sep 29, 2024
51ee3db
adds : bugs fixes, medic rebels 2 (slots) loadout for the governor
DeltaDav Oct 2, 2024
b7d711e
FORGOT FILES FOR THE MEDICS
DeltaDav Oct 2, 2024
9159a7e
bug fixes + gov loadout fixes
DeltaDav Oct 3, 2024
ab8472e
Update jobs.dm
DeltaDav Oct 3, 2024
b95d061
Removal of Zombie and put down ghouls instead.
DeltaDav Oct 5, 2024
2c1908f
zombie fix again
DeltaDav Oct 6, 2024
0be9ce6
Change to the rebels, adding a new dungeons
DeltaDav Oct 16, 2024
ebbcb13
map and job update
DeltaDav Oct 17, 2024
2c0d46e
Added dungeons
DeltaDav Oct 22, 2024
2725e28
Merge branch 'master' into mexico-standalone
DeltaDav Oct 22, 2024
108f28c
Water change , lavaboat change, map fix
DeltaDav Oct 22, 2024
69182e6
update
DeltaDav Oct 24, 2024
fcd2f20
Update rebels.dm
DeltaDav Oct 25, 2024
f026420
update - lil changes
DeltaDav Oct 25, 2024
dc41c40
Update ostia.dm
DeltaDav Oct 25, 2024
0221ff1
fixes
DeltaDav Oct 25, 2024
ee26dfc
Revert "fixes"
DeltaDav Oct 27, 2024
610df24
update map
DeltaDav Oct 27, 2024
c1050d9
map fixes
DeltaDav Oct 28, 2024
c8851c1
Update mexico_underground.dmm
DeltaDav Nov 9, 2024
329b10d
no more raiders + Vault work
DeltaDav Nov 9, 2024
da7b775
vault + raider
DeltaDav Nov 11, 2024
157536c
Update mexico_underground.dmm
DeltaDav Nov 11, 2024
f5bce8c
vault gun
DeltaDav Nov 11, 2024
309f92e
armor and rnd nerf
DeltaDav Nov 11, 2024
3ed9b25
ai test
DeltaDav Nov 11, 2024
737fc70
pa vault
DeltaDav Nov 11, 2024
4605986
AI vault changes
DeltaDav Nov 11, 2024
ee719ca
ai / mapping stuff,
DeltaDav Nov 11, 2024
2dbaf18
Revert "ai / mapping stuff,"
DeltaDav Nov 11, 2024
b37bd64
fix
DeltaDav Nov 11, 2024
18b217f
Merge branch 'master' into mexico-standalone
DeltaDav Nov 11, 2024
bedb69e
Update mexico_underground.dmm
DeltaDav Nov 11, 2024
199866d
rnd runtime fix I hope
DeltaDav Nov 11, 2024
80a4a4b
job and acces fix
DeltaDav Nov 12, 2024
fdfc741
Update rebels.dm
DeltaDav Nov 12, 2024
b1b1fca
Update rebels.dm
DeltaDav Nov 12, 2024
3694d78
makes people not spawn
DeltaDav Nov 12, 2024
f60cbc6
Update baltimore.json
DeltaDav Nov 12, 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
50,115 changes: 50,115 additions & 0 deletions _maps/map_files/Mexico/Mexico-Above.dmm

Large diffs are not rendered by default.

65,924 changes: 65,924 additions & 0 deletions _maps/map_files/Mexico/Mexico-Surface.dmm

Large diffs are not rendered by default.

40,937 changes: 40,937 additions & 0 deletions _maps/map_files/Mexico/Mexico-Underground.dmm

Large diffs are not rendered by default.

31 changes: 31 additions & 0 deletions _maps/map_files/Mexico/job_changes.dm
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)


77 changes: 77 additions & 0 deletions _maps/mexico.json
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"
]
}
22 changes: 22 additions & 0 deletions code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#define FACTION_SMUTANT "Super Mutants"
#define FACTION_ATLANTIC "Atlantic Cross"
#define FACTION_LOCUST "Locust Point town"
#define FACTION_REBEL "Rogue Wave Rebelion"
#define FACTION_LEGIONTOWN "Legion Port of Ostia"

#define ENGSEC (1<<0)

Expand Down Expand Up @@ -238,6 +240,18 @@
#define F13BALTIMOREPILOT (1<<12)
#define F13BALTIMORERADIOHOST (1<<13)

#define REBELS (1<<16)

#define F13REBELCAPTAIN (1<<0)
#define F13REBELSOLDIER (1<<1)

#define OSTIA (1<<17)

#define F13OSTIAGOVERNOR (1<<0)
#define F13OSTIASUBJECT (1<<1)
#define F13OSTIASHOPKEEP (1<<2)
#define F13OSTIARADIOHOST (1<<3)

#define JOB_AVAILABLE 0
#define JOB_UNAVAILABLE_GENERIC 1
#define JOB_UNAVAILABLE_BANNED 2
Expand Down Expand Up @@ -431,4 +445,12 @@

#define JOB_DISPLAY_ORDER_F13MINUTEMEN 154

#define JOB_DISPLAY_ORDER_F13REBELCAPTAIN 155
#define JOB_DISPLAY_ORDER_F13REBELSOLDIER 156

#define JOB_DISPLAY_ORDER_F13OSTIAGOVERNOR 157
#define JOB_DISPLAY_ORDER_F13OSTIASUBJECT 158
#define JOB_DISPLAY_ORDER_F13OSTIASHOPKEEP 159
#define JOB_DISPLAY_ORDER_F13OSTIARADIOHOST 160

GLOBAL_LIST_INIT(faction_list, list(FACTION_NCR, FACTION_LEGION, FACTION_BROTHERHOOD, FACTION_EASTWOOD, FACTION_ENCLAVE, FACTION_WASTELAND, FACTION_RAIDERS, FACTION_SMUTANT, FACTION_ATLANTIC, FACTION_LOCUST))
24 changes: 24 additions & 0 deletions code/game/objects/effects/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1044,4 +1044,28 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer
name = "Locust Point Priest"
icon_state = "Banker"

/obj/effect/landmark/start/f13/f13legionsubject
name = "Legion Subject"
icon_state = "Legionary"

/obj/effect/landmark/start/f13/f13governor
name = "Legion governor of Ostia"
Copy link
Contributor

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.

icon_state = "Legionary"

/obj/effect/landmark/start/f13/f13legionshopkeeper
name = "Ostia Shopkeeper"
icon_state = "Legionary"

/obj/effect/landmark/start/f13/f13legionradiohost
name = "Ostia Radio Host"
icon_state = "Legionary"

/obj/effect/landmark/start/f13/f13rebelsoldier
name = "Roguewave Rebel Soldier"
icon_state = "ussgt"

/obj/effect/landmark/start/f13/f13rebelcaptain
name = "Roguewave Rebel Captain"
icon_state = "ussgt"


Loading
Loading