Skip to content

Commit

Permalink
conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed Jul 30, 2024
1 parent f3de9e9 commit f9a7bbf
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/gear_presets/uscm_event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@
faction_group = FACTION_LIST_ARES_MARINE
assignment = JOB_AI_TECH
rank = JOB_AI_TECH
paygrade = PAY_SHORT_MO2
paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_1, PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_3)
role_comm_title = "AIST"
skills = /datum/skills/CE
languages = list(LANGUAGE_ENGLISH, LANGUAGE_RUSSIAN, LANGUAGE_JAPANESE, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_CHINESE)
Expand Down

0 comments on commit f9a7bbf

Please sign in to comment.