From 60f90be524eee0f2b2962befca1ade278cad77a9 Mon Sep 17 00:00:00 2001 From: BonniePandora Date: Sun, 5 Jan 2025 02:32:17 +0000 Subject: [PATCH] Comm title fixes & other things --- code/modules/gear_presets/usa.dm | 25 +++++++++--------- code/modules/gear_presets/usasf.dm | 36 +++++++++++++------------- code/modules/gear_presets/uscm.dm | 2 +- code/modules/gear_presets/uscm_ship.dm | 6 ++--- 4 files changed, 34 insertions(+), 35 deletions(-) diff --git a/code/modules/gear_presets/usa.dm b/code/modules/gear_presets/usa.dm index b8f81b46ffe..4c169c8a4ff 100644 --- a/code/modules/gear_presets/usa.dm +++ b/code/modules/gear_presets/usa.dm @@ -86,11 +86,10 @@ spawn_army_fluff_items(new_human) /datum/equipment_preset/usa/trooper/grenadier - name = parent_type::name + " (grenadier)" name = "Army Grenadier" assignment = JOB_ARMY_PROPIPE rank = JOB_ARMY_PROPIPE - role_comm_title = "GRNDR" + role_comm_title = "GRDR" /datum/equipment_preset/usa/trooper/grenadier/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/grenade/army, WEAR_WAIST) @@ -114,7 +113,7 @@ assignment = JOB_ARMY_MARKSMAN rank = JOB_ARMY_MARKSMAN paygrades = list(PAY_SHORT_AE3 = JOB_PLAYTIME_TIER_0) - role_comm_title = "MRKMN" + role_comm_title = "DM" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/trooper //Trooper but with a scoped rifle @@ -156,7 +155,7 @@ assignment = JOB_ARMY_GUNNER rank = JOB_ARMY_GUNNER paygrades = list(PAY_SHORT_AE3 = JOB_PLAYTIME_TIER_0) - role_comm_title = "LGNR" + role_comm_title = "L-Gnr" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/trooper //trooper with a big gun, no fancy skills @@ -194,7 +193,7 @@ assignment = JOB_ARMY_SMARTGUNNER rank = JOB_ARMY_SMARTGUNNER paygrades = list(PAY_SHORT_AE4E = JOB_PLAYTIME_TIER_0) - role_comm_title = "HGNR" + role_comm_title = "H-Gnr" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/heavygunner @@ -229,7 +228,7 @@ assignment = JOB_ARMY_ATFIRE rank = JOB_ARMY_ATFIRE paygrades = list(PAY_SHORT_AE4E = JOB_PLAYTIME_TIER_0) - role_comm_title = "AT GNR." + role_comm_title = "AT-Gnr" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/trooper //Trooper with a toob, nothing fancy needed @@ -262,7 +261,7 @@ assignment = JOB_ARMY_ATLOAD rank = JOB_ARMY_ATLOAD paygrades = list(PAY_SHORT_AE3 = JOB_PLAYTIME_TIER_0) - role_comm_title = "AT LDR." + role_comm_title = "AT-Ldr" /datum/equipment_preset/usa/ATgunner/loader/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) @@ -320,7 +319,7 @@ assignment = JOB_ARMY_MT rank = JOB_ARMY_MT paygrades = list(PAY_SHORT_AE5 = JOB_PLAYTIME_TIER_0) - role_comm_title = "T. Eng." + role_comm_title = "TechEng" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/mainttech @@ -354,7 +353,7 @@ assignment = JOB_ARMY_CT rank = JOB_ARMY_CT paygrades = list(PAY_SHORT_AE4E = JOB_PLAYTIME_TIER_0) - role_comm_title = "Logi. Spec." + role_comm_title = "LogiSpc" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/cargotech @@ -499,7 +498,7 @@ assignment = JOB_ARMY_LT rank = JOB_ARMY_LT paygrades = list(PAY_SHORT_AO2 = JOB_PLAYTIME_TIER_0) - role_comm_title = "Plt. Off." + role_comm_title = "PltOff" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/lt @@ -540,7 +539,7 @@ assignment = JOB_ARMY_INTEL rank = JOB_ARMY_INTEL paygrades = list(PAY_SHORT_AO2 = JOB_PLAYTIME_TIER_0) - role_comm_title = "Intel Off." + role_comm_title = "IntelOff" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/lt @@ -583,7 +582,7 @@ assignment = JOB_ARMY_RESEARCHER rank = JOB_ARMY_RESEARCHER paygrades = list(PAY_SHORT_AO3 = JOB_PLAYTIME_TIER_0) - role_comm_title = "Science Off." + role_comm_title = "SciOff" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/lt idtype = /obj/item/card/id/silver @@ -616,7 +615,7 @@ assignment = JOB_ARMY_QM rank = JOB_ARMY_QM paygrades = list(PAY_SHORT_AO2 = JOB_PLAYTIME_TIER_0) - role_comm_title = "Logi. Off." + role_comm_title = "LogiOff" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/cargoofficer diff --git a/code/modules/gear_presets/usasf.dm b/code/modules/gear_presets/usasf.dm index 4ad8e051773..dfb784b5c5d 100644 --- a/code/modules/gear_presets/usasf.dm +++ b/code/modules/gear_presets/usasf.dm @@ -84,20 +84,20 @@ #define USAF_HANDLER_CREW "USASF Flight-Deck Handler Crewman" /datum/equipment_preset/usasf/crew/flight/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp/marinepilot, WEAR_HEAD) - var/flight_deck_vest = pick(USAF_ORDNANCE_CREW ,USAF_MAINT_CREW,USAF_FUEL_CREW,USAF_SAFETY_CREW,USAF_HANDLER_CREW) - switch(flight_deck_vest) - if(USAF_ORDNANCE_CREW) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/usasf, WEAR_JACKET) - if(USAF_MAINT_CREW) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/usasf/green, WEAR_JACKET) - if(USAF_FUEL_CREW) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/usasf/purple, WEAR_JACKET) - if(USAF_SAFETY_CREW) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/usasf/white, WEAR_JACKET) - if(USAF_HANDLER_CREW) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/usasf/blue, WEAR_JACKET) - ..() + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/upp/marinepilot, WEAR_HEAD) + var/flight_deck_vest = pick(USAF_ORDNANCE_CREW ,USAF_MAINT_CREW,USAF_FUEL_CREW,USAF_SAFETY_CREW,USAF_HANDLER_CREW) + switch(flight_deck_vest) + if(USAF_ORDNANCE_CREW) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/usasf, WEAR_JACKET) + if(USAF_MAINT_CREW) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/usasf/green, WEAR_JACKET) + if(USAF_FUEL_CREW) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/usasf/purple, WEAR_JACKET) + if(USAF_SAFETY_CREW) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/usasf/white, WEAR_JACKET) + if(USAF_HANDLER_CREW) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/usasf/blue, WEAR_JACKET) + ..() #undef USAF_ORDNANCE_CREW #undef USAF_MAINT_CREW #undef USAF_FUEL_CREW @@ -275,7 +275,7 @@ assignment = JOB_NAVY_SO rank = JOB_NAVY_SO paygrades = list(PAY_SHORT_NO3) - role_comm_title = "Duty Off." + role_comm_title = "DutyOff" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/officer idtype = /obj/item/card/id/silver @@ -321,7 +321,7 @@ assignment = JOB_NAVY_CHIEF_ENGINEER rank = JOB_NAVY_CHIEF_ENGINEER paygrades = list(PAY_SHORT_NO4) - role_comm_title = "LCDR." + role_comm_title = "EngDO" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/navycengi idtype = /obj/item/card/id/silver @@ -348,7 +348,7 @@ assignment = JOB_NAVY_CO rank = JOB_NAVY_CO paygrades = list(PAY_SHORT_NO6) - role_comm_title = "CAPT." + role_comm_title = "CAPT" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/navycommander idtype = /obj/item/card/id/gold @@ -369,4 +369,4 @@ /datum/equipment_preset/usasf/CO/lesser_rank name = parent_type::name + " (Lesser Rank)" paygrades = list(PAY_SHORT_NO5 = JOB_PLAYTIME_TIER_0) - role_comm_title = "CDR." + role_comm_title = "CDR" diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 2c52a004400..a6ef97e12f7 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -707,7 +707,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP) assignment = "Rocketeer" rank = JOB_SQUAD_SPECIALIST - paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) //Gives them reason as to why they'll have a loader to boss about without impinging on overall rank structure of a section role_comm_title = "Spc" skills = /datum/skills/pfc diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 5bcf3533276..65c8189ab33 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -425,7 +425,7 @@ assignment = JOB_CHIEF_REQUISITION rank = JOB_CHIEF_REQUISITION paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_1) - role_comm_title = "Logi. Off." + role_comm_title = "LO" skills = /datum/skills/RO minimap_background = MINIMAP_ICON_BACKGROUND_CIC @@ -461,7 +461,7 @@ paygrades = list(PAY_SHORT_MW2 = JOB_PLAYTIME_TIER_0) assignment = JOB_CARGO_CHIEF rank = JOB_CARGO_CHIEF - role_comm_title = "Logi. Chief" + role_comm_title = "LC" /datum/equipment_preset/uscm_ship/qm/lesser_rank/load_gear(mob/living/carbon/human/new_human) @@ -488,7 +488,7 @@ assignment = JOB_CARGO_TECH rank = JOB_CARGO_TECH paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) - role_comm_title = "Logi. Spec." + role_comm_title = "LogiSpc" skills = /datum/skills/CT minimap_icon = "ct"