Skip to content

Commit

Permalink
Merge pull request #5354 from ARF-SS13/turnthatbitchover
Browse files Browse the repository at this point in the history
Turns off the needless jobs and towns
  • Loading branch information
Tk420634 authored Sep 22, 2024
2 parents b1603cf + edda46e commit b58825e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 16 deletions.
6 changes: 1 addition & 5 deletions _maps/map_files/coyote_bayou/Texarkana_underground.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -23014,10 +23014,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/f13/building/museum)
"qwv" = (
/obj/structure/simple_door/room,
/turf/closed/wall/f13/ruins,
/area/f13/caves)
"qwI" = (
/obj/structure/chair/f13chair1{
dir = 8
Expand Down Expand Up @@ -85175,7 +85171,7 @@ snM
xku
bOn
bOn
qwv
cdo
vUz
lqn
aaa
Expand Down
6 changes: 3 additions & 3 deletions code/datums/datacore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@
if(rank in GLOB.wasteland_positions)
waster[name] = rank
department = 1
if(rank in GLOB.den_positions)
den[name] = rank
department = 1
// if(rank in GLOB.den_positions)
// den[name] = rank
// department = 1
//if(rank in GLOB.gar_positions)
// garland[name] = rank
// department = 1
Expand Down
17 changes: 9 additions & 8 deletions code/modules/jobs/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ GLOBAL_LIST_INIT(oasis_positions, list(
"Texarkana Ranger",
"Adventurer"
))

/*
//Den Citizenship
GLOBAL_LIST_INIT(den_positions, list(
"Den Citizen",
Expand All @@ -197,7 +197,7 @@ GLOBAL_LIST_INIT(ashdown_positions, list(
"Ashdown Artiste",
"Ashdown Silvereye",
))

*/
//Gar Citizenship
//GLOBAL_LIST_INIT(gar_positions, list(
// "Garland Citizen",
Expand Down Expand Up @@ -276,7 +276,7 @@ GLOBAL_LIST_INIT(wasteland_positions, list(
"Wastelander",
"Character Testing Area"
))

/*
GLOBAL_LIST_INIT(redwater_positions, list(
"Redwater Prostitute",
"Redwater Outrider",
Expand All @@ -299,6 +299,7 @@ GLOBAL_LIST_INIT(tunnelrats_positions, list(
"Tunnel Rats Tart", //sex worker
"Tunnel Rats Digger", //miner
))
*/

GLOBAL_LIST_INIT(khan_positions, list(
"Noyan",
Expand Down Expand Up @@ -406,14 +407,14 @@ GLOBAL_LIST_INIT(position_categories, list(
//EXP_TYPE_BIKER = list("jobs" = biker_positions, "color" = "#eb872f"),
//EXP_TYPE_CLUB = list("jobs" = heavensnight_positions, "color" = "#c94b8a"),
//"debug" = list("jobs" = debug_positions, "color" = "#ff00ee"),
"Tunnel Rats" = list("jobs" = tunnelrats_positions, "color" = "#33FF22"),
"Redwater" = list("jobs" = redwater_positions, "color" = "#FF0000"),
"Ashdown" = list("jobs" = ashdown_positions, "color" = "#334488"),
"Den" = list("jobs" = den_positions, "color" = "#884488"),
// "Tunnel Rats" = list("jobs" = tunnelrats_positions, "color" = "#33FF22"),
// "Redwater" = list("jobs" = redwater_positions, "color" = "#FF0000"),
// "Ashdown" = list("jobs" = ashdown_positions, "color" = "#334488"),
// "Den" = list("jobs" = den_positions, "color" = "#884488"),
))

GLOBAL_LIST_INIT(exp_jobsmap, list(
EXP_TYPE_LIVING = list("titles" = tunnelrats_positions | redwater_positions | ashdown_positions | den_positions), // all living mobs
// EXP_TYPE_LIVING = list("titles" = tunnelrats_positions | redwater_positions | ashdown_positions | den_positions), // all living mobs
EXP_TYPE_CREW = list("titles" = command_positions | engineering_positions | medical_positions | science_positions | supply_positions | security_positions | civilian_positions | list("AI","Cyborg")), // crew positions
EXP_TYPE_COMMAND = list("titles" = command_positions),
EXP_TYPE_ENGINEERING = list("titles" = engineering_positions),
Expand Down

0 comments on commit b58825e

Please sign in to comment.