From 76b76d9da05582f8515d2080796adf8d8029e51d Mon Sep 17 00:00:00 2001 From: DexterDude Date: Tue, 3 Sep 2024 18:30:27 -0400 Subject: [PATCH] Cryo loadout changes + locker stuff (#378) --- .../crates_lockers/closets/job_closets.dm | 13 -- code/modules/gear_presets/uscm.dm | 141 +----------------- code/modules/gear_presets/uscm_ship.dm | 52 ++++--- .../mob/new_player/preferences_setup.dm | 2 +- maps/map_files/chapaev/chapaev.dmm | 1 + maps/map_files/golden_arrow/golden_arrow.dmm | 1 + 6 files changed, 37 insertions(+), 173 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 2379837c97..f5fee64f1a 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -82,12 +82,6 @@ /obj/structure/closet/secure_closet/platoon_sergeant/Initialize() . = ..() - new /obj/item/weapon/gun/rifle/m41aMK1(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) new /obj/item/clothing/head/helmet/marine/leader(src) new /obj/item/device/binoculars/range/designator(src) new /obj/item/device/whistle(src) @@ -99,12 +93,6 @@ /obj/structure/closet/secure_closet/platoon_sergeant_forecon/Initialize() . = ..() - new /obj/item/weapon/gun/rifle/m41aMK1(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) new /obj/item/device/binoculars/range/designator(src) new /obj/item/device/whistle(src) @@ -115,7 +103,6 @@ /obj/structure/closet/secure_closet/squad_sergeant/Initialize() . = ..() - new /obj/item/clothing/head/helmet/marine/rto(src) new /obj/item/device/binoculars/range/designator(src) new /obj/item/device/whistle(src) diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index fc62b57eaf..5e86f81086 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -26,7 +26,7 @@ var/ert_squad = FALSE /datum/equipment_preset/uscm/load_status(mob/living/carbon/human/new_human) - new_human.nutrition = rand(NUTRITION_VERYLOW, NUTRITION_LOW) + new_human.nutrition = NUTRITION_VERYLOW /datum/equipment_preset/uscm/load_preset(mob/living/carbon/human/new_human, randomise, count_participant) . = ..() @@ -108,13 +108,6 @@ minimap_icon = "private" -/datum/equipment_preset/uscm/pfc/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/pfc/lesser_rank paygrade = "ME1" @@ -126,13 +119,6 @@ faction_group = list(FACTION_UPP) faction = FACTION_UPP -/datum/equipment_preset/uscm/pfc/upp/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/lightpack/upp - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/pfc/upp/lesser_rank paygrade = "UE1" @@ -141,14 +127,6 @@ paygrade = "ME3" skills = /datum/skills/pfc/recon -/datum/equipment_preset/uscm/pfc/forecon/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/standard - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/standard - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - - /datum/equipment_preset/uscm/pfc/forecon/lesser_rank paygrade = "ME2" @@ -167,14 +145,6 @@ minimap_icon = "smartgunner" -/datum/equipment_preset/uscm/sg/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - - /datum/equipment_preset/uscm/sg/lesser_rank paygrade = "ME3" @@ -188,13 +158,6 @@ faction_group = list(FACTION_UPP) faction = FACTION_UPP -/datum/equipment_preset/uscm/sg/upp/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/lightpack/upp - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/sg/upp/lesser_rank paygrade = "UE3" @@ -203,35 +166,11 @@ paygrade = "ME5" skills = /datum/skills/smartgunner/recon -/datum/equipment_preset/uscm/sg/forecon/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/standard - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/standard - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/sg/forecon/lesser_rank paygrade = "ME4" //*****************************************************************************************************/ -/datum/equipment_preset/uscm/sg/full - name = "USCM Squad Smartgunner" - flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE - -/datum/equipment_preset/uscm/sg/full/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - -/datum/equipment_preset/uscm/sg/full/load_status(mob/living/carbon/human/new_human) - return //No cryo munchies - /datum/equipment_preset/uscm/rto name = "USCM Radio Telephone Operator" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE @@ -245,13 +184,6 @@ minimap_icon = "rto" -/datum/equipment_preset/uscm/rto/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/rto/lesser_rank paygrade = "ME3" @@ -377,14 +309,6 @@ minimap_icon = "spec" -/datum/equipment_preset/uscm/spec/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(new_human), WEAR_HEAD) - /datum/equipment_preset/uscm/spec/cryo name = "USCM Cryo Squad Weapons Specialist" auto_squad_name = SQUAD_MARINE_CRYO @@ -435,13 +359,6 @@ utility_under = list(/obj/item/clothing/under/marine/medic) -/datum/equipment_preset/uscm/medic/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/medic - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/medic - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/medic/lesser_rank paygrade = "ME3" @@ -454,13 +371,6 @@ faction_group = list(FACTION_UPP) faction = FACTION_UPP -/datum/equipment_preset/uscm/medic/upp/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/lightpack/upp - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/medic/upp - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/medic/upp/lesser_rank paygrade = "UE3" @@ -470,13 +380,6 @@ paygrade = "ME5" skills = /datum/skills/combat_medic/recon -/datum/equipment_preset/uscm/medic/forecon/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/medic/standard - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/medic/standard - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/medic/forecon/lesser_rank paygrade = "ME4" @@ -494,13 +397,6 @@ skills = /datum/skills/tl minimap_icon = "tl" -/datum/equipment_preset/uscm/tl/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/tl/upp name = "UPP Squad Sergeant" paygrade = "UE5" @@ -509,13 +405,6 @@ faction_group = list(FACTION_UPP) faction = FACTION_UPP -/datum/equipment_preset/uscm/tl/upp/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/lightpack/upp - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/tl/forecon name = "FORECON Assistant Squad Leader" assignment = "Assistant Squad Leader" @@ -523,13 +412,6 @@ role_comm_title = "aSL" skills = /datum/skills/tl/recon -/datum/equipment_preset/uscm/tl/forecon/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/standard - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/standard - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /*****************************************************************************************************/ /datum/equipment_preset/uscm/engineer @@ -577,13 +459,6 @@ minimap_icon = "leader" -/datum/equipment_preset/uscm/leader/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/leader/lesser_rank paygrade = "ME6" @@ -595,13 +470,6 @@ faction_group = list(FACTION_UPP) faction = FACTION_UPP -/datum/equipment_preset/uscm/leader/upp/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/lightpack/upp - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/leader/upp/lesser_rank paygrade = "UE6" @@ -611,13 +479,6 @@ paygrade = "ME8" role_comm_title = "SL" -/datum/equipment_preset/uscm/leader/forecon/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/standard - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/standard - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - /datum/equipment_preset/uscm/leader/forecon/lesser_rank paygrade = "ME7" diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 9402b1be47..630669ad32 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -564,7 +564,7 @@ name = "USCM Platoon Commander (PltCo)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE - idtype = /obj/item/card/id/silver + idtype = /obj/item/card/id/dogtag assignment = JOB_SO rank = JOB_SO paygrade = "MO2" @@ -579,14 +579,32 @@ . = ..() access = get_access(access_list) -/datum/equipment_preset/uscm_ship/so/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/uscm_ship/so/load_status(mob/living/carbon/human/new_human, client/mob_client) + . = ..() + new_human.nutrition = NUTRITION_VERYLOW + if(!new_human.client) + return + + add_verb(new_human.client, /client/proc/commander_rename_platoon) + +/datum/equipment_preset/uscm_ship/so/lesser_rank + paygrade = "MO1" + +/datum/equipment_preset/uscm_ship/so/equipped + name = "USCM Platoon Commander (Equipped)" + flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE + +/datum/equipment_preset/uscm_ship/so/equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + +/datum/equipment_preset/uscm_ship/so/equipped/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp70(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/bridge(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) @@ -594,17 +612,6 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_HAND) -/datum/equipment_preset/uscm_ship/so/load_status(mob/living/carbon/human/new_human, client/mob_client) - . = ..() - - if(!new_human.client) - return - - add_verb(new_human.client, /client/proc/commander_rename_platoon) - -/datum/equipment_preset/uscm_ship/so/lesser_rank - paygrade = "MO1" - /datum/equipment_preset/uscm_ship/so/upp name = "UPP Platoon Commander (PltCo)" languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH) @@ -613,10 +620,20 @@ faction = FACTION_UPP access_list = ACCESS_LIST_UPP_PLATOON -/datum/equipment_preset/uscm_ship/so/upp/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/uscm_ship/so/upp/lesser_rank + paygrade = "UO1" + +/datum/equipment_preset/uscm_ship/so/upp/equipped + name = "UPP Platoon Commander (Equipped)" + flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE + +/datum/equipment_preset/uscm_ship/so/upp/equipped/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + +/datum/equipment_preset/uscm_ship/so/upp/equipped/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/officer(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/np92(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp(new_human), WEAR_BACK) @@ -624,9 +641,6 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_HAND) -/datum/equipment_preset/uscm_ship/so/upp/lesser_rank - paygrade = "UO1" - //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/sea diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index e040a2dac3..bbc70fdf1f 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -251,7 +251,7 @@ return J.gear_preset_whitelist["[JOB_CO][J.get_whitelist_status(RoleAuthority.roles_whitelist, owner)]"] return /datum/equipment_preset/uscm_ship/commander if(JOB_SO) - return /datum/equipment_preset/uscm_ship/so + return /datum/equipment_preset/uscm_ship/so/equipped if(JOB_XO) return /datum/equipment_preset/uscm_ship/xo if(JOB_AUXILIARY_OFFICER) diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm index 7e066872a1..61f68cb840 100644 --- a/maps/map_files/chapaev/chapaev.dmm +++ b/maps/map_files/chapaev/chapaev.dmm @@ -4342,6 +4342,7 @@ job = "Platoon Commander" }, /obj/item/clothing/under/marine/veteran/UPP/boiler, +/obj/item/clothing/under/marine/veteran/UPP/officer, /turf/open/floor/strata{ dir = 6; icon_state = "multi_tiles" diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 731a3337c3..3c70bcd776 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -8090,6 +8090,7 @@ /obj/item/clothing/under/marine/officer/boiler, /obj/item/clothing/suit/storage/jacket/marine/service, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber, +/obj/item/clothing/under/marine/officer/bridge, /turf/open/floor/almayer{ icon_state = "plate" },