Skip to content

Commit

Permalink
Fix UPP & CLF Synth Skills (#5854)
Browse files Browse the repository at this point in the history
# About the pull request

This PR is a follow up to #5830 And also fixes the incorrect defines
(used for name) of colony synth gen 1 and 2.

# Explain why it's good for the game
Fixes #5853 

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


![image](https://github.com/cmss13-devs/cmss13/assets/76988376/c7c6bfb9-fc6c-4c38-a6c7-3941179c313f)

![image](https://github.com/cmss13-devs/cmss13/assets/76988376/5a9bf223-30db-4e7c-a821-f4f79a4e4313)

</details>


# Changelog
:cl: Drathek
fix: Fixed skills not getting set for UPP and CLF synths
spellcheck: Fixed naming of colony synth gen 1 and gen 2 being swapped
/:cl:
  • Loading branch information
Drulikar authored Mar 2, 2024
1 parent 58b50e0 commit 255bbc5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/__DEFINES/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@

//Synthetic Defines
#define SYNTH_COLONY "Third Generation Colonial Synthetic"
#define SYNTH_COLONY_GEN_TWO "First Generation Colonial Synthetic"
#define SYNTH_COLONY_GEN_ONE "Second Generation Colonial Synthetic"
#define SYNTH_COLONY_GEN_TWO "Second Generation Colonial Synthetic"
#define SYNTH_COLONY_GEN_ONE "First Generation Colonial Synthetic"
#define SYNTH_COMBAT "Combat Synthetic"
#define SYNTH_INFILTRATOR "Infiltrator Synthetic"
#define SYNTH_WORKING_JOE "Working Joe"
Expand Down
1 change: 1 addition & 0 deletions code/modules/gear_presets/clf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,7 @@
new_human.set_species(SYNTH_COLONY_GEN_ONE)

/datum/equipment_preset/clf/synth/load_skills(mob/living/carbon/human/new_human)
. = ..()
new_human.allow_gun_usage = FALSE

/datum/equipment_preset/clf/synth/load_gear(mob/living/carbon/human/new_human)
Expand Down
1 change: 1 addition & 0 deletions code/modules/gear_presets/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2638,6 +2638,7 @@
new_human.set_species(SYNTH_GEN_THREE)

/datum/equipment_preset/upp/synth/load_skills(mob/living/carbon/human/new_human)
. = ..()
new_human.allow_gun_usage = FALSE

/datum/equipment_preset/upp/synth/load_gear(mob/living/carbon/human/new_human)
Expand Down

0 comments on commit 255bbc5

Please sign in to comment.