Skip to content

Commit

Permalink
increases ranks of personnel, makes sure we only get slots we want
Browse files Browse the repository at this point in the history
  • Loading branch information
morrowwolf committed Oct 11, 2023
1 parent 78396b7 commit 07fc1bd
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 10 deletions.
6 changes: 6 additions & 0 deletions code/game/jobs/job/command/cic/staffofficer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,9 @@ AddTimelock(/datum/job/command/bridge, list(
/datum/job/command/bridge/ai
total_positions = 1
spawn_positions = 1

/datum/job/command/bridge/ai/set_spawn_positions(count)
return spawn_positions

/datum/job/command/bridge/ai/get_total_positions(latejoin = 0)
return latejoin ? total_positions : spawn_positions
6 changes: 6 additions & 0 deletions code/game/jobs/job/marine/squad/medic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,9 @@ AddTimelock(/datum/job/marine/medic, list(
/datum/job/marine/medic/ai
total_positions = 1
spawn_positions = 1

/datum/job/marine/medic/ai/set_spawn_positions(count)
return spawn_positions

/datum/job/marine/medic/ai/get_total_positions(latejoin=0)
return latejoin ? total_positions : spawn_positions
6 changes: 6 additions & 0 deletions code/game/jobs/job/marine/squad/smartgunner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,9 @@ AddTimelock(/datum/job/marine/smartgunner, list(
/datum/job/marine/smartgunner/ai
total_positions = 2
spawn_positions = 2

/datum/job/marine/smartgunner/ai/set_spawn_positions(count)
return spawn_positions

/datum/job/marine/smartgunner/ai/get_total_positions(latejoin = 0)
return latejoin ? total_positions : spawn_positions
3 changes: 3 additions & 0 deletions code/game/jobs/job/marine/squad/standard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,6 @@
/datum/job/marine/standard/ai
total_positions = 4
spawn_positions = 4

/datum/job/marine/standard/ai/set_spawn_positions(count)
return spawn_positions
12 changes: 3 additions & 9 deletions code/modules/gear_presets/uscm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/pfc/load_rank(mob/living/carbon/human/new_human)
if(new_human.client)
if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1)
return "ME1"
return paygrade

/datum/equipment_preset/uscm/pfc/cryo
name = "USCM Cryo Squad Rifleman"
auto_squad_name = SQUAD_MARINE_CRYO
Expand All @@ -101,7 +95,7 @@
access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP)
assignment = JOB_SQUAD_SMARTGUN
rank = JOB_SQUAD_SMARTGUN
paygrade = "ME3"
paygrade = "ME4"
role_comm_title = "SG"
skills = /datum/skills/smartgunner

Expand Down Expand Up @@ -297,7 +291,7 @@
access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP)
assignment = JOB_SQUAD_TEAM_LEADER
rank = JOB_SQUAD_TEAM_LEADER
paygrade = "ME4"
paygrade = "ME5"
role_comm_title = "FTL"
skills = /datum/skills/tl

Expand Down Expand Up @@ -359,7 +353,7 @@
access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP)
assignment = JOB_SQUAD_LEADER
rank = JOB_SQUAD_LEADER
paygrade = "ME5"
paygrade = "ME7"
role_comm_title = "SL"
minimum_age = 27
skills = /datum/skills/SL
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/uscm_ship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@
access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY)
assignment = JOB_SO
rank = JOB_SO
paygrade = "MO1"
paygrade = "MO2"
role_comm_title = "SO"
minimum_age = 25
skills = /datum/skills/SO
Expand Down

0 comments on commit 07fc1bd

Please sign in to comment.