Core

Adds, the map, the json map config, the jobs.
Foundation-19 · Sep 22, 2024 · 4dcdbc6 · 4dcdbc6
1 parent 1393133
commit 4dcdbc6
Show file tree

Hide file tree

Showing 11 changed files with 157,536 additions and 0 deletions.
diff --git a/_maps/map_files/Mexico/Mexico-Above.dmm b/_maps/map_files/Mexico/Mexico-Above.dmm
diff --git a/_maps/map_files/Mexico/Mexico-Surface.dmm b/_maps/map_files/Mexico/Mexico-Surface.dmm
diff --git a/_maps/map_files/Mexico/Mexico-Underground.dmm b/_maps/map_files/Mexico/Mexico-Underground.dmm
diff --git a/_maps/map_files/Mexico/job_changes.dm b/_maps/map_files/Mexico/job_changes.dm
@@ -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)
+
+
diff --git a/_maps/mexico.json b/_maps/mexico.json
@@ -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"
+	]
+}
diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
@@ -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)
 
@@ -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
@@ -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))
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
@@ -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"
+	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"
+