From f9a7bbf894eac479432c3bd45c632c25142ba721 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Tue, 30 Jul 2024 21:55:25 +0100 Subject: [PATCH] conflict --- code/modules/gear_presets/uscm_event.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index 4d595d3f724e..dbae1d8e40e2 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -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)