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

Syndicate-ing #2221

Merged
merged 17 commits into from
Nov 13, 2023
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
54 changes: 2 additions & 52 deletions _maps/RandomRuins/SpaceRuins/lab4071.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -231,17 +231,6 @@
/turf/open/floor/plasteel/mono/white,
/area/ruin/space/has_grav/crazylab/crew)
"dO" = (
/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{
assignedrole = "Unlicensed Chemist";
dir = 4;
flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options.";
id_job = "Unlicensed Chemist";
important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim.";
mob_name = "unlicensed chemist";
name = "Unlicensed Chemist";
outfit = /datum/outfit/job/chemist/juniorchemist;
short_desc = "You are a chemist in an illegal laboratory."
},
/obj/machinery/button/door{
id = 64;
name = "Dorm Shutters";
Expand All @@ -254,34 +243,6 @@
/obj/structure/bookcase/random/reference,
/turf/open/floor/plasteel/grimy,
/area/ruin/space/has_grav/crazylab/crew)
"eh" = (
/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{
assignedrole = "Unlicensed Chemist";
dir = 4;
flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options.";
id_job = "Unlicensed Chemist";
important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim.";
mob_name = "unlicensed chemist";
name = "Unlicensed Chemist";
outfit = /datum/outfit/job/chemist/juniorchemist;
short_desc = "You are a chemist in an illegal laboratory."
},
/turf/open/floor/plasteel/grimy,
/area/ruin/space/has_grav/crazylab/crew)
"et" = (
/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{
assignedrole = "Unlicensed Chemist";
dir = 8;
flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options.";
id_job = "Unlicensed Chemist";
important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim.";
mob_name = "unlicensed chemist";
name = "Unlicensed Chemist";
outfit = /datum/outfit/job/chemist/juniorchemist;
short_desc = "You are a chemist in an illegal laboratory."
},
/turf/open/floor/plasteel/grimy,
/area/ruin/space/has_grav/crazylab/crew)
"eA" = (
/obj/structure/bookcase/random/nonfiction,
/turf/open/floor/plasteel/grimy,
Expand Down Expand Up @@ -570,17 +531,6 @@
/area/ruin/space/has_grav/crazylab/crew)
"jL" = (
/obj/machinery/light/directional/south,
/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{
assignedrole = "Unlicensed Chemist";
dir = 4;
flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options.";
id_job = "Unlicensed Chemist";
important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim.";
mob_name = "unlicensed chemist";
name = "Unlicensed Chemist";
outfit = /datum/outfit/job/chemist/juniorchemist;
short_desc = "You are a chemist in an illegal laboratory."
},
/turf/open/floor/plasteel/grimy,
/area/ruin/space/has_grav/crazylab/crew)
"jO" = (
Expand Down Expand Up @@ -4957,7 +4907,7 @@ GV
GV
ao
cq
eh
gP
gV
jG
lN
Expand Down Expand Up @@ -4995,7 +4945,7 @@ GV
GV
ao
cq
et
gP
hf
jO
lS
Expand Down
14 changes: 7 additions & 7 deletions _maps/configs/syndicate_aegis.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,38 +18,38 @@
],
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/syndicate",
"outfit": "/datum/outfit/job/syndicate/captain",
"officer": true,
"slots": 1
},

"Lead Doctor": {
"outfit": "/datum/outfit/job/cmo/syndicate/nsv",
"outfit": "/datum/outfit/job/syndicate/cmo/suns",
"slots": 1
},

"Ship Doctor":{
"outfit": "/datum/outfit/job/doctor/syndicate/nsv",
"outfit": "/datum/outfit/job/syndicate/doctor/suns",
"slots": 2
},

"Mechanic": {
"outfit": "/datum/outfit/job/engineer/syndicate",
"outfit": "/datum/outfit/job/syndicate/engineer",
"slots": 1
},

"Deck Service Assistant": {
"outfit": "/datum/outfit/job/botanist/syndicate/nsv",
"outfit": "/datum/outfit/job/syndicate/botanist/suns",
"slots": 2
},

"Ship Psychologist": {
"outfit": "/datum/outfit/job/psychologist/syndicate/nsv",
"outfit": "/datum/outfit/job/syndicate/psychologist/suns",
"slots": 1
},

"Long Term Patient": {
"outfit": "/datum/outfit/job/prisoner/syndicatepatient",
"outfit": "/datum/outfit/job/syndicate/patient",
"slots": 2
}
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/configs/syndicate_cybersun_kansatsu.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@
"map_path": "_maps/shuttles/shiptest/syndicate_cybersun_kansatsu.dmm",
"map_id": "cybersun_kansatsu",
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/syndicate/cybersun",
"Commander": {
"outfit": "/datum/outfit/job/syndicate/captain/cybersun",
"officer": true,
"slots": 1
},
"Intelligence Officer": {
"outfit": "/datum/outfit/job/head_of_personnel/syndicate/intel",
"outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun",
"officer": true,
"slots": 1
},
"Engineer": {
"outfit": "/datum/outfit/job/engineer/syndicate/cybersun",
"outfit": "/datum/outfit/job/syndicate/engineer/cybersun",
"slots": 1
},
"Field Agent": {
"outfit": "/datum/outfit/job/miner/syndicate/cybersun",
"outfit": "/datum/outfit/job/syndicate/miner/cybersun",
"slots": 2
},
"Junior Agent": {
"outfit": "/datum/outfit/job/assistant/syndicate/cyberagent",
"outfit": "/datum/outfit/job/syndicate/assistant/cybersun",
"slots": 2
}
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/configs/syndicate_gorlex_hyena.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@
"map_path": "_maps/shuttles/shiptest/syndicate_gorlex_hyena.dmm",
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/syndicate/gorlex",
"outfit": "/datum/outfit/job/syndicate/captain/gorlex",
"officer": true,
"slots": 1
},
"Foreman": {
"outfit": "/datum/outfit/job/ce/syndicate/gorlex",
"outfit": "/datum/outfit/job/syndicate/ce/gorlex",
"officer": true,
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/engineer/syndicate/gorlex",
"outfit": "/datum/outfit/job/syndicate/engineer/gorlex",
"slots": 1
},
"Wrecker": {
"outfit": "/datum/outfit/job/miner/syndicate/gorlex",
"outfit": "/datum/outfit/job/syndicate/miner/gorlex",
"slots": 2
},
"Junior Agent": {
"outfit": "/datum/outfit/job/assistant/syndicate/gorlex",
"outfit": "/datum/outfit/job/syndicate/assistant/gorlex",
"slots": 2
}
},
Expand Down
14 changes: 7 additions & 7 deletions _maps/configs/syndicate_gorlex_komodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,33 @@
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/syndicate/gorlex",
"outfit": "/datum/outfit/job/syndicate/captain/gorlex",
"officer": true,
"slots": 1
},
"Sergeant": {
"outfit": "/datum/outfit/job/hos/syndicate",
"outfit": "/datum/outfit/job/syndicate/hos/gorlex",
"officer": true,
"slots": 1
},
"Medic": {
"outfit": "/datum/outfit/job/doctor/syndicate_komodo",
"outfit": "/datum/outfit/job/syndicate/doctor/gorlex",
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/engineer/syndicate/gorlex",
"outfit": "/datum/outfit/job/syndicate/miner/gorlex",
"slots": 1
},
"Trooper": {
"outfit": "/datum/outfit/job/security/syndicate/gorlex",
"outfit": "/datum/outfit/job/syndicate/security/gorlex",
"slots": 3
},
"Deck assistant": {
"outfit": "/datum/outfit/job/assistant/syndicate/gorlex",
"outfit": "/datum/outfit/job/syndicate/assistant/gorlex",
"slots": 2
},
"Bridge officer": {
"outfit": "/datum/outfit/job/head_of_personnel/syndicate",
"outfit": "/datum/outfit/job/syndicate/head_of_personnel",
"slots": 1
}
},
Expand Down
18 changes: 9 additions & 9 deletions _maps/configs/syndicate_lugol.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,28 @@
"limit": 2,
"job_slots": {
"Project Overseer": {
"outfit": "/datum/outfit/job/ce/gec",
"outfit": "/datum/outfit/job/syndicate/ce/gec",
"slots": 1,
"officer": true
},
"GEC Engineer": {
"outfit": "/datum/outfit/job/engineer/gec",
"GEC Engineering": {
"outfit": "/datum/outfit/job/syndicate/engineer/gec",
"slots": 3
},
"Atmospheric Technician": {
"outfit": "/datum/outfit/job/atmos/gec",
"GEC Atmospherics": {
"outfit": "/datum/outfit/job/syndicate/atmos/gec",
"slots": 3
},
"Beverage Specialist": {
"outfit": "/datum/outfit/job/bartender/syndicate",
"outfit": "/datum/outfit/job/syndicate/bartender",
"slots": 1
},
"Shaft Miner": {
"outfit": "/datum/outfit/job/miner/syndicate/gec",
"GEC Miner": {
"outfit": "/datum/outfit/job/syndicate/miner/gec",
"slots": 1
},
"GEC Apprentice": {
"outfit": "/datum/outfit/job/assistant/syndicate/gec",
"outfit": "/datum/outfit/job/syndicate/assistant/gec",
"slots": 2
}
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/configs/syndicate_luxembourg.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
"starting_funds": 6000,
"job_slots": {
"Manager": {
"outfit": "/datum/outfit/job/quartermaster/donk",
"outfit": "/datum/outfit/job/syndicate/quartermaster/donk",
"slots": 1
},
"Customer Service Representative": {
"outfit": "/datum/outfit/job/cargo_tech/donk",
"outfit": "/datum/outfit/job/syndicate/cargo_tech/donk",
"slots": 5
},
"Food and Beverage Specialist": {
"outfit": "/datum/outfit/job/bartender/syndicate",
"outfit": "/datum/outfit/job/syndicate/bartender",
"slots": 1
},
"GEC Contracted Engineer": {
"outfit": "/datum/outfit/job/engineer/gec",
"outfit": "/datum/outfit/job/syndicate/engineer/gec",
"slots": 1
}
},
Expand Down
16 changes: 8 additions & 8 deletions _maps/configs/syndicate_twinkleshine.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,37 @@
"map_path": "_maps/shuttles/shiptest/syndicate_twinkleshine.dmm",
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/syndicate/sbc",
"outfit": "/datum/outfit/job/syndicate/captain/twink",
"officer": true,
"slots": 1
},
"Lieutenant": {
"outfit": "/datum/outfit/job/warden/syndicate/sbc",
"outfit": "/datum/outfit/job/syndicate/hos/twink",
"officer": true,
"slots": 1
},
"Medic": {
"outfit": "/datum/outfit/job/brig_phys/syndicate/sbc",
"outfit": "/datum/outfit/job/syndicate/paramedic/twink",
"slots": 2
},
"Engineer": {
"outfit": "/datum/outfit/job/engineer/syndicate/sbc",
"outfit": "/datum/outfit/job/syndicate/engineer/twink",
"slots": 2
},
"Operative": {
"outfit": "/datum/outfit/job/security/syndicate/sbc",
"outfit": "/datum/outfit/job/syndicate/security/twink",
"slots": 5
},
"Bartender": {
"outfit": "/datum/outfit/job/bartender/syndicate/sbc",
"outfit": "/datum/outfit/job/syndicate/bartender/twink",
"slots": 1
},
"Miner": {
"outfit": "/datum/outfit/job/miner/syndicate/sbc",
"outfit": "/datum/outfit/job/syndicate/miner/twink",
"slots": 1
},
"Deck Assistant": {
"outfit": "/datum/outfit/job/assistant/syndicate/sbc",
"outfit": "/datum/outfit/job/syndicate/assistant/twink",
"slots": 2
}
},
Expand Down
10 changes: 0 additions & 10 deletions code/__DEFINES/atmospherics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -292,16 +292,6 @@
#define INCINERATOR_ATMOS_AIRLOCK_INTERIOR "atmos_incinerator_airlock_interior"
#define INCINERATOR_ATMOS_AIRLOCK_EXTERIOR "atmos_incinerator_airlock_exterior"

//Syndicate lavaland base incinerator (lavaland_surface_syndicate_base1.dmm)
#define INCINERATOR_SYNDICATELAVA_IGNITER "syndicatelava_igniter"
#define INCINERATOR_SYNDICATELAVA_MAINVENT "syndicatelava_mainvent"
#define INCINERATOR_SYNDICATELAVA_AUXVENT "syndicatelava_auxvent"
#define INCINERATOR_SYNDICATELAVA_DP_VENTPUMP "syndicatelava_airlock_pump"
#define INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR "syndicatelava_airlock_sensor"
#define INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER "syndicatelava_airlock_controller"
#define INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR "syndicatelava_airlock_interior"
#define INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR "syndicatelava_airlock_exterior"

//MULTIPIPES
//IF YOU EVER CHANGE THESE CHANGE SPRITES TO MATCH.
#define PIPING_LAYER_MIN 1
Expand Down
6 changes: 6 additions & 0 deletions code/__DEFINES/factions.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
//"Antag" factions
// anything with these factions should be hostile to the average player.
#define FACTION_ANTAG_SYNDICATE "Syndicate"

//Player Factions
#define FACTION_PLAYER_SYNDICATE "playerSyndicate"
Loading