Skip to content

Commit

Permalink
Allows midshipmen that are not assigned to important departments to b…
Browse files Browse the repository at this point in the history
…e in squads. (#2732)
  • Loading branch information
someone543 authored Jan 3, 2025
1 parent 8309c95 commit 2544d1c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
13 changes: 13 additions & 0 deletions nsv13/code/modules/jobs/job_types/marine/midshipman.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,16 @@ 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(!ishuman(H)) //Nope
return

var/list/disallowed_access = list(ACCESS_ENGINE, ACCESS_MEDICAL, ACCESS_MUNITIONS) //If these departments are disallowed squads, so are the midshipmen assigned to them
var/obj/item/card/id/I = H.get_idcard()
if(!I)
return
for(var/access in disallowed_access)
if(access in I.access)
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 2544d1c

Please sign in to comment.