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

[Needs TM] Repaths and sorts outfits into factional files, Factional SecHud Icons #2628

Merged
merged 18 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin)
"ac" = (
/obj/effect/mob_spawn/human/engineer/rig,
/obj/effect/mob_spawn/human/engineer,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/overmap_encounter/planetoid/ice/explored)
"ad" = (
Expand Down Expand Up @@ -1199,7 +1199,7 @@
/turf/open/floor/plating/ice/icemoon,
/area/overmap_encounter/planetoid/ice/explored)
"cU" = (
/obj/effect/mob_spawn/human/engineer/rig,
/obj/effect/mob_spawn/human/engineer,
/obj/structure/cable{
icon_state = "4-8"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@
/obj/effect/mob_spawn/human/corpse/assistant{
oxy_damage = 200;
name = "Dungeon Master";
outfit = /datum/outfit/job/curator/dungeonmaster;
outfit = /datum/outfit/job/curator;
backpack_contents = null
},
/obj/effect/decal/cleanable/blood,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_paradise.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6481,7 +6481,7 @@
/turf/open/water/jungle,
/area/overmap_encounter/planetoid/cave/explored)
"Pe" = (
/obj/effect/mob_spawn/human/miner/old,
/obj/effect/mob_spawn/human/miner,
/obj/effect/decal/cleanable/vomit/old{
pixel_x = 13;
pixel_y = 6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
/turf/open/floor/pod/dark,
/area/ruin/powered)
"q" = (
/obj/effect/mob_spawn/human/miner/explorer{
/obj/effect/mob_spawn/human/miner{
brute_damage = 150;
oxy_damage = 50
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
/area/ruin/unpowered)
"Qo" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/mob_spawn/human/miner/explorer,
/obj/effect/mob_spawn/human/miner,
/obj/item/pickaxe,
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomRuins/SpaceRuins/corporate_mining.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -579,12 +579,12 @@
dir = 1
},
/obj/effect/decal/cleanable/blood/gibs/bubblegum,
/obj/effect/mob_spawn/human/miner/rig,
/obj/effect/mob_spawn/human/miner,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
"ns" = (
/obj/item/pickaxe/drill,
/obj/effect/mob_spawn/human/miner/rig,
/obj/effect/mob_spawn/human/miner,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
"nu" = (
Expand Down Expand Up @@ -635,7 +635,7 @@
/turf/closed/wall/rust,
/area/ruin/space/has_grav/corporatemine/crewquarters)
"ol" = (
/obj/effect/mob_spawn/human/miner/rig,
/obj/effect/mob_spawn/human/miner,
/obj/item/shovel,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
Expand Down Expand Up @@ -758,7 +758,7 @@
/area/ruin/space/has_grav/corporatemine/bridge)
"rh" = (
/obj/effect/decal/cleanable/blood/old,
/obj/effect/mob_spawn/human/miner/rig,
/obj/effect/mob_spawn/human/miner,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
"rk" = (
Expand Down Expand Up @@ -1177,7 +1177,7 @@
/turf/open/floor/plasteel/grimy,
/area/ruin/space/has_grav/corporatemine/crewquarters)
"Bp" = (
/obj/effect/mob_spawn/human/miner/rig,
/obj/effect/mob_spawn/human/miner,
/obj/effect/decal/cleanable/blood,
/obj/item/gun/energy/kinetic_accelerator,
/turf/open/floor/plating/asteroid/airless,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/ntfacility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@
/area/ruin/powered)
"rY" = (
/obj/effect/mob_spawn/human/corpse/assistant{
outfit = /datum/outfit/job/doctor/surgeon
outfit = /datum/outfit/job/doctor
},
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/dirt/dust,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/power_puzzle.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,7 @@
},
/obj/effect/turf_decal/corner/transparent/grey/diagonal,
/obj/effect/mob_spawn/human/corpse/cargo_tech{
outfit = /datum/outfit/job/engineer/nt
outfit = /datum/outfit/job/nanotrasen/engineer
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/powerpuzzle/engineering)
Expand Down Expand Up @@ -2493,7 +2493,7 @@
dir = 9
},
/obj/effect/mob_spawn/human/corpse/cargo_tech{
outfit = /datum/outfit/job/engineer/nt
outfit = /datum/outfit/job/nanotrasen/engineer
},
/obj/item/wirecutters{
pixel_y = 15
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/scav_mining.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space/has_grav)
"rl" = (
/obj/effect/mob_spawn/human/miner/explorer,
/obj/effect/mob_spawn/human/miner,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space/has_grav)
"rH" = (
Expand Down Expand Up @@ -550,12 +550,12 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/scav_mining/core)
"LT" = (
/obj/effect/mob_spawn/human/miner/explorer,
/obj/effect/mob_spawn/human/miner,
/turf/open/floor/plating,
/area/ruin/space/has_grav/scav_mining/dorm)
"MZ" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/mob_spawn/human/miner/explorer,
/obj/effect/mob_spawn/human/miner,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space/has_grav)
"No" = (
Expand Down
18 changes: 9 additions & 9 deletions _maps/configs/independent_beluga.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Beluga-class Transport",
"prefix": "ISV",
"prefix": "SV",
"namelists": ["CRUISE", "NATURAL"],
"map_short_name": "Beluga-class",
"map_path": "_maps/shuttles/independent/independent_beluga.dmm",
Expand All @@ -16,37 +16,37 @@
"roundstart": true,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain",
"outfit": "/datum/outfit/job/independent/captain",
"officer": true,
"slots": 1
},
"First Officer": {
"outfit": "/datum/outfit/job/head_of_personnel/beluga",
"outfit": "/datum/outfit/job/independent/hop",
"officer": true,
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/engineer",
"outfit": "/datum/outfit/job/independent/engineer",
"slots": 1
},
"Private Security Officer": {
"outfit": "/datum/outfit/job/security/inteq/beluga",
"outfit": "/datum/outfit/job/inteq/security/beluga",
"slots": 2
},
"High-Class Passenger": {
"outfit": "/datum/outfit/job/lawyer/passenger",
"outfit": "/datum/outfit/job/independent/lawyer",
"slots": 4
},
"Bartender": {
"outfit": "/datum/outfit/job/bartender",
"outfit": "/datum/outfit/job/independent/bartender",
"slots": 1
},
"Janitor": {
"outfit": "/datum/outfit/job/janitor",
"outfit": "/datum/outfit/job/independent/janitor",
"slots": 1
},
"Assistant": {
"outfit": "/datum/outfit/job/assistant",
"outfit": "/datum/outfit/job/independent/assistant",
"slots": 2
}
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/configs/independent_box.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@
"SPACE",
"NATURAL"
],
"prefix": "ISV",
"prefix": "IMV",
"job_slots": {
"Chief Medical Officer": {
"outfit": "/datum/outfit/job/cmo",
"outfit": "/datum/outfit/job/independent/cmo",
"slots": 1
},
"Medical Doctor": {
"outfit": "/datum/outfit/job/doctor",
"outfit": "/datum/outfit/job/independent/doctor",
"slots": 3
},
"Paramedic": {
"outfit": "/datum/outfit/job/paramedic",
"outfit": "/datum/outfit/job/independent/paramedic",
"slots": 2
},
"Assistant": {
"outfit": "/datum/outfit/job/assistant",
"outfit": "/datum/outfit/job/independent/assistant",
"slots": 3
}
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/configs/independent_boyardee.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@
"map_path": "_maps/shuttles/independent/independent_boyardee.dmm",
"job_slots": {
"Bartender": {
"outfit": "/datum/outfit/job/bartender",
"outfit": "/datum/outfit/job/independent/bartender",
"slots": 1
},
"Cook": {
"outfit": "/datum/outfit/job/cook",
"outfit": "/datum/outfit/job/independent/cook",
"slots": 3
},
"Botanist": {
"outfit": "/datum/outfit/job/botanist",
"outfit": "/datum/outfit/job/independent/botanist",
"slots": 2
},
"Janitor": {
"outfit": "/datum/outfit/job/janitor",
"outfit": "/datum/outfit/job/independent/janitor",
"slots": 1
},
"Waiter": {
"outfit": "/datum/outfit/job/assistant/waiter",
"outfit": "/datum/outfit/job/independent/assistant/waiter",
"slots": 2
}
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/configs/independent_bubble.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain",
"outfit": "/datum/outfit/job/independent/captain",
"slots": 1
},
"Scientist": {
"outfit": "/datum/outfit/job/scientist",
"outfit": "/datum/outfit/job/independent/scientist",
"slots": 1
},
"Station Engineer": {
"outfit": "/datum/outfit/job/engineer",
"outfit": "/datum/outfit/job/independent/engineer",
"slots": 1
},
"Shaft Miner": {
"outfit": "/datum/outfit/job/miner",
"outfit": "/datum/outfit/job/independent/miner",
"slots": 1
},
"Assistant": {
"outfit": "/datum/outfit/job/assistant",
"outfit": "/datum/outfit/job/independent/assistant",
"slots": 3
}
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/configs/independent_byo.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"prefix": "ISV",
"job_slots": {
"Architect": {
"outfit": "/datum/outfit/job/engineer/hazard",
"outfit": "/datum/outfit/job/independent/ce",
"slots": 1
},
"Maso-Mechanic": {
"outfit": "/datum/outfit/job/engineer/hazard",
"outfit": "/datum/outfit/job/independent/engineer",
"slots": 4
}
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/configs/independent_caravan.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,28 @@
"roundstart": true,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/western",
"outfit": "/datum/outfit/job/independent/captain/western",
"officer": true,
"slots": 1
},
"Ship's Doctor": {
"outfit": "/datum/outfit/job/doctor",
"outfit": "/datum/outfit/job/independent/doctor",
"slots": 1
},
"Engine Technician": {
"outfit": "/datum/outfit/job/atmos",
"outfit": "/datum/outfit/job/independent/atmos",
"slots": 1
},
"Asteroid Miner": {
"outfit": "/datum/outfit/job/miner/hazard",
"outfit": "/datum/outfit/job/independent/miner",
"slots": 1
},
"Fauna Researcher": {
"outfit": "/datum/outfit/job/scientist",
"outfit": "/datum/outfit/job/independent/scientist",
"slots": 1
},
"Assistant": {
"outfit": "/datum/outfit/job/assistant",
"outfit": "/datum/outfit/job/independent/assistant",
"slots": 1
}
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/configs/independent_dwayne.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/western",
"outfit": "/datum/outfit/job/independent/captain/western",
"officer": true,
"slots": 1
},
"Foreman": {
"outfit": "/datum/outfit/job/quartermaster/western",
"outfit": "/datum/outfit/job/independent/quartermaster/western",
"slots": 1
},
"Ship's Doctor": {
"outfit": "/datum/outfit/job/doctor",
"outfit": "/datum/outfit/job/independent/doctor",
"slots": 1
},
"Ship's Engineer": {
"outfit": "/datum/outfit/job/engineer/hazard",
"outfit": "/datum/outfit/job/independent/engineer",
"slots": 1
},
"Asteroid Miner": {
"outfit": "/datum/outfit/job/miner/hazard",
"outfit": "/datum/outfit/job/independent/miner/hazard",
"slots": 2
},
"Deckhand": {
"outfit": "/datum/outfit/job/assistant",
"outfit": "/datum/outfit/job/independent/assistant",
"slots": 3
}
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/configs/independent_halftrack.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
"map_path": "_maps/shuttles/independent/independent_halftrack.dmm",
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain",
"outfit": "/datum/outfit/job/independent/captain",
"slots": 1
},
"IRMG Vanguard": {
"outfit": "/datum/outfit/job/captain/inteq",
"outfit": "/datum/outfit/job/inteq/captain",
"officer": true,
"slots": 1
},
"IRMG Enforcer": {
"outfit": "/datum/outfit/job/security/inteq",
"outfit": "/datum/outfit/job/inteq/security",
"slots": 2
}
}
Expand Down
Loading