Skip to content

Commit

Permalink
Midshipman assigned to non-essential departments get squads
Browse files Browse the repository at this point in the history
  • Loading branch information
someone543 committed Dec 17, 2024
1 parent 16fab68 commit 31bfd02
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
10 changes: 9 additions & 1 deletion nsv13/code/modules/jobs/job_types/marine/midshipman.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Marine & all their unique stuff!
display_order = JOB_DISPLAY_ORDER_ASSISTANT
departments = DEPARTMENT_BITFLAG_SERVICE
rpg_title = "Lout"
var/assign_squad = FALSE //If an assigned department is not essential to the ship, they get added to a squad instead

species_outfits = list(
SPECIES_PLASMAMAN = /datum/outfit/plasmaman
Expand Down Expand Up @@ -75,7 +76,7 @@ Marine & all their unique stuff!
var/department = M?.client?.prefs?.active_character?.preferred_security_department
if(department == "None")
to_chat(M, "<b>You have not been assigned to any department. Help in any way you can!</b>")
return
assign_squad = TRUE
else if(!(department in GLOB.available_depts))
department = pick(GLOB.available_depts)

Expand All @@ -87,6 +88,7 @@ Marine & all their unique stuff!
ears = /obj/item/radio/headset/headset_cargo
dep_access = list(ACCESS_MAILSORTING, ACCESS_CARGO)
accessory = /obj/item/clothing/accessory/armband/cargo
assign_squad = TRUE
if(SEC_DEPT_ENGINEERING)
ears = /obj/item/radio/headset/headset_eng
dep_access = list(ACCESS_CONSTRUCTION, ACCESS_ENGINE, ACCESS_AUX_BASE)
Expand All @@ -99,6 +101,7 @@ Marine & all their unique stuff!
ears = /obj/item/radio/headset/headset_sci
dep_access = list(ACCESS_RESEARCH)
accessory = /obj/item/clothing/accessory/armband/science
assign_squad = TRUE
if(SEC_DEPT_MUNITIONS)
ears = /obj/item/radio/headset/munitions/munitions_tech
dep_access = list(ACCESS_MUNITIONS, ACCESS_MUNITIONS_STORAGE)
Expand All @@ -116,3 +119,8 @@ Marine & all their unique stuff!
W.access |= dep_access

to_chat(M, "<b>You have been assigned to [department]!</b>")

/datum/job/assistant/register_squad(mob/living/H)
if(assign_squad == FALSE)
return
. = ..()
3 changes: 1 addition & 2 deletions nsv13/code/modules/squads/squad_datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
/datum/job/master_at_arms, /datum/job/pilot, /datum/job/munitions_tech, /datum/job/air_traffic_controller, \
/datum/job/head_of_security, /datum/job/warden, /datum/job/security_officer, \
/datum/job/chief_medical_officer, /datum/job/medical_doctor, /datum/job/paramedic, /datum/job/brig_physician, \
/datum/job/chief_engineer, /datum/job/station_engineer, /datum/job/atmospheric_technician, \
/datum/job/assistant)
/datum/job/chief_engineer, /datum/job/station_engineer, /datum/job/atmospheric_technician)
var/list/allowed_jobs = null
var/datum/component/simple_teamchat/radio_dependent/squad/squad_channel = null
var/squad_channel_type
Expand Down

0 comments on commit 31bfd02

Please sign in to comment.