Skip to content

Commit

Permalink
Renames UPP survivor synth from combat to support synth (#4703)
Browse files Browse the repository at this point in the history
# About the pull request

Renames UPP Trijent Nightmare synthvivor from UPP Combat Synth to UPP
Support Synthetic.
It wasn't a combat synth in the first place.

# Explain why it's good for the game

Its not a combat synth and this round that just ended by time of
creation I saw a friendly synth get killed and cremated because its ID
said combat synthetic, so its obviously causing problems; and I'm going
out on a limb and going to guess these problems were not intended.


# 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:
spellcheck: UPP Synth Survivor on the Trijent Dam nightmare is now
called a Support Synthetic instead of a Combat Synthetic, as its not a
combat synthetic
/:cl:
  • Loading branch information
CapCamIII authored Oct 20, 2023
1 parent 504e741 commit dff3a75
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_UPP_GENERAL "UPP Army General"

#define JOB_UPP_COMBAT_SYNTH "UPP Combat Synthetic"
#define JOB_UPP_SUPPORT_SYNTH "UPP Support Synthetic"

#define UPP_JOB_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_LT_OFFICER, JOB_UPP_LT_DOKTOR, JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_KOL_OFFICER, JOB_UPP_COMBAT_SYNTH)
#define UPP_JOB_GRUNT_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_CREWMAN)
Expand Down
2 changes: 2 additions & 0 deletions code/datums/factions/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
hud_icon_state = "co"
if(JOB_UPP_COMBAT_SYNTH)
hud_icon_state = "synth"
if(JOB_UPP_SUPPORT_SYNTH)
hud_icon_state = "synth"
if(JOB_UPP_COMMANDO)
hud_icon_state = "com"
if(JOB_UPP_COMMANDO_MEDIC)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@
name = "Survivor - Synthetic - UPP Synth"
flags = EQUIPMENT_PRESET_EXTRA
languages = ALL_SYNTH_LANGUAGES_UPP
assignment = JOB_UPP_COMBAT_SYNTH
rank = JOB_UPP_COMBAT_SYNTH
assignment = JOB_UPP_SUPPORT_SYNTH
rank = JOB_UPP_SUPPORT_SYNTH
faction = FACTION_UPP
faction_group = list(FACTION_UPP, FACTION_SURVIVOR)
skills = /datum/skills/colonial_synthetic
Expand Down

0 comments on commit dff3a75

Please sign in to comment.