diff --git a/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm index 4462eda61b..38f6d1b81c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm @@ -29,4 +29,3 @@ if(has_cryo_gear) new /obj/item/clothing/under/marine(src) new /obj/item/clothing/shoes/marine/knife(src) - new /obj/item/device/radio/headset/almayer/marine(src) diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index bc014d60e1..09561c00c3 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -77,11 +77,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/cryo name = "USCM Cryo Squad Rifleman" @@ -125,11 +120,6 @@ paygrade = "ME3" /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 @@ -151,11 +141,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/cryo name = "USCM Cryo Squad Smartgunner" @@ -193,11 +178,6 @@ paygrade = "ME5" /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" @@ -235,11 +215,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" @@ -425,11 +400,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/cryo name = "USCM Cryo Squad Hospital Corpsman" @@ -467,11 +437,6 @@ paygrade = "ME5" /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" @@ -491,11 +456,6 @@ 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/cryo name = "USCM Cryo Squad Sergeant" @@ -526,11 +486,6 @@ paygrade = "ME6" /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) /*****************************************************************************************************/ @@ -550,11 +505,6 @@ utility_under = list(/obj/item/clothing/under/marine/engineer) /datum/equipment_preset/uscm/engineer/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/tech - - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/engineer/cryo name = "USCM Cryo Squad Combat Technician" @@ -580,11 +530,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/cryo name = "USCM Cryo Platoon Sergeant" @@ -621,11 +566,6 @@ paygrade = "ME8" /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 5644e8c515..e7d6d876c5 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -562,7 +562,7 @@ 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/storage/belt/gun/m4a3/mod88(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 /obj/item/clothing/head/marine/peaked/service(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index d2ae9e83cf..cda1c4e08a 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -4933,7 +4933,8 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/under/marine/officer/boiler, +/obj/item/clothing/head/cmcap/bridge, /turf/open/floor/almayer{ dir = 4; icon_state = "cargo_arrow"