Skip to content

Commit

Permalink
Revert "Ship Operations Synthetic (#7743)"
Browse files Browse the repository at this point in the history 
This reverts commit f98918d.
  • Loading branch information
InsaneRed committed Jan 15, 2025
1 parent dc3f2b9 commit 49bfb1c
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 99 deletions.
1 change: 0 additions & 1 deletion code/__DEFINES/job.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST)

#define JOB_MESS_SERGEANT "Mess Technician"
#define JOB_SYNTH "Synthetic"
#define JOB_SHIP_SYNTH "Ship Operations Synthetic"
#define JOB_SYNTH_K9 "Synthetic K9"
#define JOB_WORKING_JOE "Working Joe"

Expand Down
4 changes: 2 additions & 2 deletions code/__DEFINES/mode.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@
GLOBAL_LIST_INIT(ROLES_COMMAND, list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN))

//Marine roles
#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_SHIP_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
GLOBAL_LIST_INIT(ROLES_CIC, list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO))
GLOBAL_LIST_INIT(ROLES_CIC_ANTAG, list(JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_CO_OFFICER, JOB_UPP_COMMISSAR))
GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT, list(JOB_AUXILIARY_OFFICER, JOB_SEA, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_TANK_CREW, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT))
GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT_ANTAG, list(JOB_UPP_CREWMAN, JOB_UPP_PILOT))
GLOBAL_LIST_INIT(ROLES_MISC, list(JOB_SYNTH, JOB_SHIP_SYNTH, JOB_WORKING_JOE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH))
GLOBAL_LIST_INIT(ROLES_MISC, list(JOB_SYNTH, JOB_WORKING_JOE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH))
GLOBAL_LIST_INIT(ROLES_MISC_ANTAG, list(JOB_UPP_COMBAT_SYNTH, JOB_UPP_SUPPORT_SYNTH, JOB_UPP_JOE))
GLOBAL_LIST_INIT(ROLES_POLICE, list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE))
GLOBAL_LIST_INIT(ROLES_POLICE_ANTAG, list(JOB_UPP_POLICE))
Expand Down
51 changes: 0 additions & 51 deletions code/game/jobs/job/civilians/support/synthetic.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,54 +50,3 @@
name = JOB_SYNTH
icon_state = "syn_spawn"
job = /datum/job/civilian/synthetic


// ship synthetic

/datum/job/civilian/synthetic/ship
title = JOB_SHIP_SYNTH
total_positions = 1
spawn_positions = 1
supervisors = "the acting commanding officer"
selection_class = "job_ship_synth"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN
flags_whitelist = WHITELIST_SYNTHETIC
gear_preset = /datum/equipment_preset/synth/uscm/ship
entry_message_body = "You are a <a href='"+WIKI_PLACEHOLDER+"'>Synthetic!</a> You may not deploy outside of specific circumstances. You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all USCM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commanding officer. Special circumstances may change this!"

/datum/job/civilian/synthetic/ship/New()
. = ..()
gear_preset_whitelist = list(
"[JOB_SHIP_SYNTH][WHITELIST_NORMAL]" = /datum/equipment_preset/synth/uscm/ship,
"[JOB_SHIP_SYNTH][WHITELIST_COUNCIL]" = /datum/equipment_preset/synth/uscm/councillor/ship,
"[JOB_SHIP_SYNTH][WHITELIST_LEADER]" = /datum/equipment_preset/synth/uscm/councillor/ship
)

/datum/job/civilian/synthetic/ship/get_whitelist_status(client/player)
. = ..()
if(!.)
return

if(player.check_whitelist_status(WHITELIST_SYNTHETIC_LEADER))
return get_desired_status(player.prefs.synth_status, WHITELIST_LEADER)
if(player.check_whitelist_status(WHITELIST_SYNTHETIC_COUNCIL|WHITELIST_SYNTHETIC_COUNCIL_LEGACY))
return get_desired_status(player.prefs.synth_status, WHITELIST_COUNCIL)
if(player.check_whitelist_status(WHITELIST_SYNTHETIC))
return get_desired_status(player.prefs.synth_status, WHITELIST_NORMAL)

/obj/effect/landmark/start/synthetic/ship
name = JOB_SHIP_SYNTH
icon_state = "syn_spawn"
job = /datum/job/civilian/synthetic/ship

/datum/job/civilian/synthetic/ship/get_total_positions(latejoin = FALSE)
// No scaling
var/positions = latejoin ? total_positions : spawn_positions
total_positions_so_far = positions

// Survivor synth eats up this slot
var/survivor_synth = GLOB.RoleAuthority.roles_by_path[/datum/job/civilian/survivor/synth]
if(survivor_synth)
var/datum/job/civilian/survivor/synth/survivor = survivor_synth
positions -= survivor.current_positions
return max(positions, 0)
4 changes: 2 additions & 2 deletions code/game/machinery/vending/vendor_types/crew/synthetic.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
name = "\improper ColMarTech Synthetic Equipment Rack"
desc = "An automated rack hooked up to a colossal storage of various equipment. Can be accessed only by synthetic units."
req_access = list(ACCESS_MARINE_SYNTH)
vendor_role = list(JOB_SYNTH, JOB_SHIP_SYNTH, JOB_SYNTH_SURVIVOR, JOB_UPP_SUPPORT_SYNTH, JOB_CMB_SYN, JOB_CMB_RSYN, JOB_PMC_SYNTH)
vendor_role = list(JOB_SYNTH, JOB_SYNTH_SURVIVOR, JOB_UPP_SUPPORT_SYNTH, JOB_CMB_SYN, JOB_CMB_RSYN, JOB_PMC_SYNTH)

/obj/structure/machinery/cm_vending/clothing/synth/get_listed_products(mob/user)
return GLOB.cm_vending_clothing_synth
Expand Down Expand Up @@ -372,7 +372,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
use_snowflake_points = TRUE
vendor_theme = VENDOR_THEME_COMPANY
req_access = list(ACCESS_MARINE_SYNTH)
vendor_role = list(JOB_SYNTH, JOB_SHIP_SYNTH, JOB_SYNTH_SURVIVOR, JOB_WORKING_JOE, JOB_UPP_SUPPORT_SYNTH, JOB_CMB_SYN, JOB_CMB_RSYN, JOB_PMC_SYNTH)
vendor_role = list(JOB_SYNTH, JOB_SYNTH_SURVIVOR, JOB_WORKING_JOE, JOB_UPP_SUPPORT_SYNTH, JOB_CMB_SYN, JOB_CMB_RSYN, JOB_PMC_SYNTH)

vend_delay = 1 SECONDS

Expand Down
4 changes: 2 additions & 2 deletions code/modules/client/preferences.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ GLOBAL_LIST_INIT(bgstate_options, list(
* * width - Screen' width.
* * height - Screen's height.
*/
/datum/preferences/proc/SetChoices(mob/user, limit = 22, list/splitJobs = list(JOB_CHIEF_REQUISITION, JOB_WO_CMO), width = 950, height = 750)
/datum/preferences/proc/SetChoices(mob/user, limit = 21, list/splitJobs = list(JOB_CHIEF_REQUISITION, JOB_WO_CMO), width = 950, height = 750)
if(!GLOB.RoleAuthority)
return

Expand Down Expand Up @@ -791,7 +791,7 @@ GLOBAL_LIST_INIT(bgstate_options, list(
* * width - Screen' width.
* * height - Screen's height.
*/
/datum/preferences/proc/set_job_slots(mob/user, limit = 22, list/splitJobs = list(JOB_CHIEF_REQUISITION, JOB_WO_CMO), width = 950, height = 750)
/datum/preferences/proc/set_job_slots(mob/user, limit = 21, list/splitJobs = list(JOB_CHIEF_REQUISITION, JOB_WO_CMO), width = 950, height = 750)
if(!GLOB.RoleAuthority)
return

Expand Down
11 changes: 5 additions & 6 deletions code/modules/cm_marines/marines_consoles.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -932,12 +932,11 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
// 20-29: Aux Command
JOB_AUXILIARY_OFFICER = 20,
JOB_SYNTH = 21,
JOB_SHIP_SYNTH = 22,
JOB_CAS_PILOT = 23,
JOB_DROPSHIP_PILOT = 24,
JOB_DROPSHIP_CREW_CHIEF = 25,
JOB_INTEL = 26,
JOB_TANK_CREW = 27,
JOB_CAS_PILOT = 22,
JOB_DROPSHIP_PILOT = 23,
JOB_DROPSHIP_CREW_CHIEF = 24,
JOB_INTEL = 25,
JOB_TANK_CREW = 26,
// 30-39: Security
JOB_CHIEF_POLICE = 30,
JOB_PROVOST_TML = 30,
Expand Down
37 changes: 10 additions & 27 deletions code/modules/gear_presets/synths.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,25 +62,16 @@
minimap_icon = "synth"

/datum/equipment_preset/synth/uscm/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)

/datum/equipment_preset/synth/uscm/ship

name = "USCM Synthetic - Ship Operations"
assignment = JOB_SHIP_SYNTH
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/industrial

/datum/equipment_preset/synth/uscm/ship/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/leather(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

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

Expand All @@ -94,24 +85,16 @@
role_comm_title = "Syn"

/datum/equipment_preset/synth/uscm/councillor/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/councillor(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)

/datum/equipment_preset/synth/uscm/councillor/ship
name = "USCM Synthetic Councillor - Ship Operations"
assignment = JOB_SHIP_SYNTH
var/back_item = /obj/item/storage/backpack/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/industrial

/datum/equipment_preset/synth/uscm/councillor/ship/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/councillor(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/leather(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

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

Expand Down
3 changes: 0 additions & 3 deletions code/modules/mob/new_player/preferences_setup.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,6 @@
if(JOB_SYNTH)
var/datum/job/J = GLOB.RoleAuthority.roles_by_name[JOB_SYNTH]
return J.gear_preset_whitelist["[JOB_SYNTH][J.get_whitelist_status(owner)]"]
if(JOB_SHIP_SYNTH)
var/datum/job/J = GLOB.RoleAuthority.roles_by_name[JOB_SHIP_SYNTH]
return J.gear_preset_whitelist["[JOB_SHIP_SYNTH][J.get_whitelist_status(owner)]"]
if(JOB_WORKING_JOE)
return /datum/equipment_preset/synth/working_joe
if(JOB_POLICE)
Expand Down
6 changes: 1 addition & 5 deletions html/browser/common.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,12 +443,8 @@ a.purple:hover {
background-color: #7cd115;
}

.job_ship_synth {
background-color: #7cd115;
}

.job_working_joe {
background-color: #6eba12;
background-color: #7cd115;
}

.job_command {
Expand Down

0 comments on commit 49bfb1c

Please sign in to comment.