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.

Sign up for GitHub

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

Jump to bottom

Syndicate-ing #2221

Merged
merged 17 commits into from
Nov 13, 2023
Merged

Syndicate-ing #2221

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cfaf5ae
bye!
Bjarl Jul 31, 2023
64c09c9
scope creep
Bjarl Jul 31, 2023
cfd32a2
hahahahahahaha Fuck
Bjarl Jul 31, 2023
6a21cbd
Update syndicate.dm
Bjarl Aug 2, 2023
bba7540
Merge remote-tracking branch 'upstream/master' into rips-out-syndicat…
Bjarl Aug 2, 2023
61c7ad0
Merge remote-tracking branch 'upstream/master' into rips-out-syndicat…
Bjarl Aug 4, 2023
9548f22
Update atmospheric_technician.dm
Bjarl Aug 4, 2023
72fe05a
Update code/modules/clothing/outfits/syndicate.dm
Bjarl Aug 7, 2023
baf036e
Merge remote-tracking branch 'upstream/master' into rips-out-syndicat…
Bjarl Aug 12, 2023
9173bea
Update syndicate.dm
Bjarl Aug 12, 2023
4d81adb
Merge branch 'master' into pr/2221
Bjarl Sep 6, 2023
116eb1a
Merge branch 'master' into rips-out-syndicate-lavabase
Bjarl Sep 17, 2023
e0f252b
Merge branch 'master' into rips-out-syndicate-lavabase
Bjarl Sep 20, 2023
46ddbb0
Merge branch 'master' into rips-out-syndicate-lavabase
Bjarl Sep 28, 2023
a8afd68
faction defines
Bjarl Nov 3, 2023
6dac87a
Merge branch 'rips-out-syndicate-lavabase' of https://github.com/Bjar…
Bjarl Nov 3, 2023
2d338c4
list
Bjarl Nov 3, 2023
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
9,168 changes: 0 additions & 9,168 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FINALLY
FUCK THIS THING
NO FREE ANTAG

This file was deleted.

14 changes: 7 additions & 7 deletions _maps/configs/syndicate_aegis.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
8 changes: 0 additions & 8 deletions code/datums/ruins/lavaland.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@
Includes a unique(*) laser pistol display case, and the recently introduced I.C.E(tm)."
suffix = "lavaland_surface_biodome_winter.dmm"

/datum/map_template/ruin/lavaland/syndicate_base
name = "Syndicate Lava Base"
id = "lava-base"
description = "A secret base researching illegal bioweapons, it is closely guarded by an elite team of syndicate agents."
suffix = "lavaland_surface_syndicate_base1.dmm"
cost = 20
allow_duplicates = FALSE

/datum/map_template/ruin/lavaland/free_golem
name = "Free Golem Ship"
id = "golem-ship"
Expand Down
36 changes: 0 additions & 36 deletions code/game/area/areas/ruins/lavaland.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,42 +60,6 @@
name = "Cult Altar"
ambientsounds = SPOOKY

//Syndicate lavaland base

/area/ruin/unpowered/syndicate_lava_base/engineering
name = "Syndicate Lavaland Engineering"

/area/ruin/unpowered/syndicate_lava_base/medbay
name = "Syndicate Lavaland Medbay"

/area/ruin/unpowered/syndicate_lava_base/arrivals
name = "Syndicate Lavaland Arrivals"

/area/ruin/unpowered/syndicate_lava_base/bar
name = "Syndicate Lavaland Bar"

/area/ruin/unpowered/syndicate_lava_base/main
name = "Syndicate Lavaland Primary Hallway"
area_flags = HIDDEN_AREA | BLOBS_ALLOWED | UNIQUE_AREA // WS edit - Fix various startup runtimes

/area/ruin/unpowered/syndicate_lava_base/cargo
name = "Syndicate Lavaland Cargo Bay"

/area/ruin/unpowered/syndicate_lava_base/chemistry
name = "Syndicate Lavaland Chemistry"

/area/ruin/unpowered/syndicate_lava_base/virology
name = "Syndicate Lavaland Virology"

/area/ruin/unpowered/syndicate_lava_base/testlab
name = "Syndicate Lavaland Experimentation Lab"

/area/ruin/unpowered/syndicate_lava_base/dormitories
name = "Syndicate Lavaland Dormitories"

/area/ruin/unpowered/syndicate_lava_base/telecomms
name = "Syndicate Lavaland Telecommunications"

//Xeno Nest

/area/ruin/unpowered/xenonest
Expand Down
4 changes: 0 additions & 4 deletions code/game/machinery/airlock_control.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@
id_tag = INCINERATOR_ATMOS_AIRLOCK_SENSOR
master_tag = INCINERATOR_ATMOS_AIRLOCK_CONTROLLER

/obj/machinery/airlock_sensor/incinerator_syndicatelava
id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR
master_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER

/obj/machinery/airlock_sensor/update_icon_state()
if(on)
if(alert)
Expand Down
12 changes: 0 additions & 12 deletions code/game/machinery/buttons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,6 @@
id = INCINERATOR_ATMOS_AUXVENT
req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS)

/obj/machinery/button/door/incinerator_vent_syndicatelava_main
name = "turbine vent control"
id = INCINERATOR_SYNDICATELAVA_MAINVENT
req_access = list(ACCESS_SYNDICATE)

/obj/machinery/button/door/incinerator_vent_syndicatelava_aux
name = "Combustion Chamber Vent control"
id = INCINERATOR_SYNDICATELAVA_AUXVENT
req_access = list(ACCESS_SYNDICATE)

/obj/machinery/button/massdriver
name = "mass driver button"
Expand Down Expand Up @@ -258,9 +249,6 @@
/obj/machinery/button/ignition/incinerator/atmos
id = INCINERATOR_ATMOS_IGNITER

/obj/machinery/button/ignition/incinerator/syndicatelava
id = INCINERATOR_SYNDICATELAVA_IGNITER

/obj/machinery/button/flasher
name = "flasher button"
desc = "A remote control switch for a mounted flasher."
Expand Down
8 changes: 0 additions & 8 deletions code/game/machinery/doors/airlock_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,6 @@
req_access = list(ACCESS_SYNDICATE)
has_hatch = FALSE

/obj/machinery/door/airlock/glass/incinerator/syndicatelava_interior
name = "Turbine Interior Airlock"
id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR

/obj/machinery/door/airlock/glass/incinerator/syndicatelava_exterior
name = "Turbine Exterior Airlock"
id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR

/obj/machinery/door/airlock/command/glass
opacity = FALSE
glass = TRUE
Expand Down
7 changes: 0 additions & 7 deletions code/game/machinery/doors/poddoor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,6 @@
name = "Combustion Chamber Vent"
id = INCINERATOR_ATMOS_AUXVENT

/obj/machinery/door/poddoor/incinerator_syndicatelava_main
name = "turbine vent"
id = INCINERATOR_SYNDICATELAVA_MAINVENT

/obj/machinery/door/poddoor/incinerator_syndicatelava_aux
name = "Combustion Chamber Vent"
id = INCINERATOR_SYNDICATELAVA_AUXVENT

/obj/machinery/door/poddoor/Bumped(atom/movable/AM)
if(density)
Expand Down
Loading
Loading