Skip to content

Adds Shipside Research Synthetics #12132

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

Open
Ammoniacres wants to merge 2 commits into
base: master
Choose a base branch
from
+23 −3
Open

Adds Shipside Research Synthetics #12132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8e2d1e
Adds research synthetic presets!
Ammoniacres Apr 19, 2026
e940983
Merge branch 'master' into ship-science-synth-preset
Ammoniacres Apr 26, 2026
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
1 change: 1 addition & 0 deletions code/__DEFINES/job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST)
#define JOB_SYNTH_INTEL "Intelligence Synthetic"
#define JOB_SYNTH_MP "Military Police Synthetic"
#define JOB_SYNTH_CMD "Command Support Synthetic"
#define JOB_SYNTH_SCI "Research Synthetic"

#define JOB_CO "Commanding Officer"
#define JOB_XO "Executive Officer"
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/mode.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ GLOBAL_LIST_INIT(ROLES_ENGINEERING, list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH,
GLOBAL_LIST_INIT(ROLES_ENGINEERING_ANTAG, list())
GLOBAL_LIST_INIT(ROLES_REQUISITION, list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION))
GLOBAL_LIST_INIT(ROLES_REQUISITION_ANTAG, list(JOB_UPP_SUPPLY))
GLOBAL_LIST_INIT(ROLES_MEDICAL, list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_FIELD_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR, JOB_SYNTH_MED))
GLOBAL_LIST_INIT(ROLES_MEDICAL, list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_FIELD_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR, JOB_SYNTH_MED, JOB_SYNTH_SCI))
GLOBAL_LIST_INIT(ROLES_MEDICAL_ANTAG, list(JOB_UPP_LT_DOKTOR))
GLOBAL_LIST_INIT(ROLES_MARINES, list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE))
GLOBAL_LIST_INIT(ROLES_MARINES_ANTAG, list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER))
Expand Down
6 changes: 6 additions & 0 deletions code/game/jobs/job/civilians/support/synthetic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@
"[JOB_SYNTH][WHITELIST_COUNCIL]" = /datum/equipment_preset/synth/uscm/command/council,
"[JOB_SYNTH][WHITELIST_LEADER]" = /datum/equipment_preset/synth/uscm/command/council
)
if("Research")
gear_preset_whitelist = list(
"[JOB_SYNTH][WHITELIST_NORMAL]" = /datum/equipment_preset/synth/uscm/research,
"[JOB_SYNTH][WHITELIST_COUNCIL]" = /datum/equipment_preset/synth/uscm/research/council,
"[JOB_SYNTH][WHITELIST_LEADER]" = /datum/equipment_preset/synth/uscm/research/council
)

/datum/job/civilian/synthetic/New()
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@ GLOBAL_LIST_INIT(be_special_flags, list(
if(new_synth_type)
synthetic_type = new_synth_type
if("synth_specialisation")
var/list/options = list("Generalised", "Engineering", "Medical", "Intel", "Military Police", "Command")
var/list/options = list("Generalised", "Engineering", "Medical", "Intel", "Military Police", "Command", "Research")

var/new_specialisation = tgui_input_list(user, "Choose your new Specialisation.", "Specialisation", options)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences_savefile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@

synthetic_name = synthetic_name ? sanitize_text(synthetic_name, initial(synthetic_name)) : initial(synthetic_name)
synthetic_type = sanitize_inlist(synthetic_type, PLAYER_SYNTHS, initial(synthetic_type))
synth_specialisation = sanitize_inlist(synth_specialisation, list("Generalised", "Engineering", "Medical", "Intel", "Military Police", "Command"), initial(synth_specialisation))
synth_specialisation = sanitize_inlist(synth_specialisation, list("Generalised", "Engineering", "Medical", "Intel", "Military Police", "Command", "Research"), initial(synth_specialisation))
predator_name = predator_name ? sanitize_text(predator_name, initial(predator_name)) : initial(predator_name)
predator_gender = sanitize_text(predator_gender, initial(predator_gender))
predator_age = sanitize_integer(predator_age, 100, 10000, initial(predator_age))
Expand Down
1 change: 1 addition & 0 deletions code/modules/cm_marines/marines_consoles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,7 @@ GLOBAL_LIST_EMPTY_TYPED(crew_monitor, /datum/crewmonitor)
JOB_FIELD_DOCTOR = 43,
JOB_SYNTH_MED = 44,
JOB_NURSE = 45,
JOB_SYNTH_SCI = 46,
// 50-59: Engineering
JOB_CHIEF_ENGINEER = 50,
JOB_SYNTH_ENG = 51,
Expand Down
12 changes: 12 additions & 0 deletions code/modules/gear_presets/uscm_synths.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,15 @@
is_council = TRUE

//*****************************************************************************************************/

/datum/equipment_preset/synth/uscm/research
name = "USCM Synthetic (Research)"
paygrades = list(PAY_SHORT_MWO = JOB_PLAYTIME_TIER_0)
subtype = "sci"
assignment = JOB_SYNTH_SCI
manifest_title = JOB_SYNTH_SCI

/datum/equipment_preset/synth/uscm/research/council
name = "USCM Synthetic Council (Research)"
paygrades = list(PAY_SHORT_MCWO = JOB_PLAYTIME_TIER_0)
is_council = TRUE
Binary file modified icons/mob/hud/factions/marine.dmi
View file
Open in desktop
Binary file not shown.
Loading