Skip to content

Commit

Permalink
Equipped squad presets start with full stomachs (#4671)
Browse files Browse the repository at this point in the history
# About the pull request

Makes the equipped marine presets spawn with full food

# Explain why it's good for the game

Equipped presets should be ready for combat on spawn(hence the equipped
status)

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Equipped marine presets spawn with full food on spawn
/:cl:
  • Loading branch information
CapCamIII authored Oct 18, 2023
1 parent bf7f1ef commit 163f692
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions code/modules/gear_presets/uscm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,9 @@

minimap_icon = "private"

/datum/equipment_preset/uscm/private_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL

/datum/equipment_preset/uscm/private_equipped/load_rank(mob/living/carbon/human/new_human)
if(new_human.client)
if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1)
Expand Down Expand Up @@ -500,6 +503,9 @@
name = "USCM Squad Leader (Equipped)"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE

/datum/equipment_preset/uscm/leader_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL

access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP)
assignment = JOB_SQUAD_LEADER
rank = JOB_SQUAD_LEADER
Expand Down Expand Up @@ -539,6 +545,9 @@
name = "USCM Squad Smartgunner (Equipped)"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE

/datum/equipment_preset/uscm/smartgunner_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL

access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP)
assignment = JOB_SQUAD_SMARTGUN
rank = JOB_SQUAD_SMARTGUN
Expand Down Expand Up @@ -573,6 +582,9 @@
name = "USCM Squad Combat Technician (Equipped)"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE

/datum/equipment_preset/uscm/engineer_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL

access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING)
assignment = JOB_SQUAD_ENGI
rank = JOB_SQUAD_ENGI
Expand Down Expand Up @@ -616,6 +628,9 @@
name = "USCM Squad Hospital Corpsman (Equipped)"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE

/datum/equipment_preset/uscm/medic_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL

access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY)
assignment = JOB_SQUAD_MEDIC
rank = JOB_SQUAD_MEDIC
Expand Down Expand Up @@ -667,6 +682,9 @@
name = "USCM Squad Weapons Specialist (Equipped)"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE

/datum/equipment_preset/uscm/specialist_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL

access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP)
assignment = JOB_SQUAD_SPECIALIST
rank = JOB_SQUAD_SPECIALIST
Expand Down Expand Up @@ -734,6 +752,9 @@
name = "USCM Fireteam Leader (Equipped)"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE

/datum/equipment_preset/uscm/tl_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL

access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP)
assignment = JOB_SQUAD_TEAM_LEADER
rank = JOB_SQUAD_TEAM_LEADER
Expand Down

0 comments on commit 163f692

Please sign in to comment.