diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 0ab436eed9f5..ed8369db4889 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -1115,10 +1115,6 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r item_state = "backpack_large" max_storage_space = 26 -/obj/item/storage/backpack/rmc/heavy/black //alt backpack, unused - icon_state = "black_backpack_large" - item_state = "black_backpack_large" - /obj/item/storage/backpack/rmc/medium name = "\improper standard RMC backpack" desc = "A TWE military standard-carry RMC combat pack MK3." @@ -1127,10 +1123,6 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r worn_accessible = TRUE max_storage_space = 25 -/obj/item/storage/backpack/rmc/medium/black //alt backpack, unused - icon_state = "black_backpack_medium" - item_state = "black_backpack_medium" - /obj/item/storage/backpack/rmc/light name = "\improper lightweight RMC backpack" desc = "A TWE military light-carry RMC combat pack MK3." @@ -1139,10 +1131,6 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r worn_accessible = TRUE max_storage_space = 23 -/obj/item/storage/backpack/rmc/light/black //alt backpack, unused - icon_state = "black_backpack_small" - item_state = "black_backpack_small" - /obj/item/storage/backpack/rmc/frame //One sorry sod should have to lug this about spawns in their shuttle currently name = "\improper RMC carry-frame" desc = "A backpack specifically designed to hold equipment for commandos." diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index f20967e22eed..09c84b9b4d40 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -191,4 +191,4 @@ name = "\improper L6 pattern combat gloves" desc = "Standard issue tactical gloves used by the royal marines." icon_state = "rmc_gloves" - flags_atom = NO_NAME_OVERRIDE + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 83d58587a4ad..a7d16798f734 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -1262,7 +1262,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( flags_inventory = BLOCKSHARPOBJ flags_inv_hide = NO_FLAGS flags_marine_helmet = NO_FLAGS - flags_atom = NO_NAME_OVERRIDE + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE /obj/item/clothing/head/helmet/marine/veteran/royal_marine/breacher name = "L5A3 ballistic helmet" diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm index 30689c431355..f4e4123bca83 100644 --- a/code/modules/clothing/shoes/marine_shoes.dm +++ b/code/modules/clothing/shoes/marine_shoes.dm @@ -220,14 +220,8 @@ items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol) flags_atom = NO_NAME_OVERRIDE -/obj/item/clothing/shoes/royal_marine/snow - icon_state = "s_rmc_boots" - /obj/item/clothing/shoes/royal_marine/knife /obj/item/clothing/shoes/royal_marine/knife/Initialize(mapload, ...) . = ..() stored_item = new /obj/item/attachable/bayonet/rmc(src) update_icon() - -/obj/item/clothing/shoes/royal_marine/knife/snow - icon_state = "s_rmc_boots" diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 025f764fa5da..8847b70ff173 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -1735,7 +1735,7 @@ desc = "A customizable personal armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." icon_state = "rmc_light" item_state = "rmc_light" - flags_atom = NO_NAME_OVERRIDE + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE storage_slots = 3 allowed = list( /obj/item/weapon/gun, diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index c8ad246f0c04..f5735c8bce19 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -941,7 +941,7 @@ desc = "The field uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment" icon_state = "rmc_uniform" worn_state = "rmc_uniform" - flags_atom = NO_NAME_OVERRIDE + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE contained_sprite = TRUE icon = 'icons/mob/humans/onmob/contained/royal_marines_commando.dmi' diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index ffc950d35536..82674d09cb14 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/contained/royal_marines_commando.dmi b/icons/mob/humans/onmob/contained/royal_marines_commando.dmi index 2e9f72d4b2ed..4e9891fe65e9 100644 Binary files a/icons/mob/humans/onmob/contained/royal_marines_commando.dmi and b/icons/mob/humans/onmob/contained/royal_marines_commando.dmi differ diff --git a/icons/mob/humans/onmob/feet.dmi b/icons/mob/humans/onmob/feet.dmi index 93dfd5d9e0cb..dbbed31b1e19 100644 Binary files a/icons/mob/humans/onmob/feet.dmi and b/icons/mob/humans/onmob/feet.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index 264dc543e456..c444b1fa8c43 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index 2a9b1d518c92..c26894b60343 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 0201dcdbe2d2..2e3d4d2e4171 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/mob/humans/onmob/mask.dmi b/icons/mob/humans/onmob/mask.dmi index 1a9f85254084..badd31ad722c 100644 Binary files a/icons/mob/humans/onmob/mask.dmi and b/icons/mob/humans/onmob/mask.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 1b577e78d1fe..fa09121cdb11 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/obj/items/clothing/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi index d1194442616d..f9c06fca4437 100644 Binary files a/icons/obj/items/clothing/backpacks.dmi and b/icons/obj/items/clothing/backpacks.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index 399460fbefd6..66a42bf694ba 100644 Binary files a/icons/obj/items/clothing/cm_hats.dmi and b/icons/obj/items/clothing/cm_hats.dmi differ diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi index 1486e99b4751..3d8b92e3a12c 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/icons/obj/items/clothing/gloves.dmi b/icons/obj/items/clothing/gloves.dmi index 07aeb40700b1..b6aa7935f6c9 100644 Binary files a/icons/obj/items/clothing/gloves.dmi and b/icons/obj/items/clothing/gloves.dmi differ diff --git a/icons/obj/items/clothing/masks.dmi b/icons/obj/items/clothing/masks.dmi index 90a1e3bfd892..e4d8c4c03c11 100644 Binary files a/icons/obj/items/clothing/masks.dmi and b/icons/obj/items/clothing/masks.dmi differ diff --git a/icons/obj/items/clothing/shoes.dmi b/icons/obj/items/clothing/shoes.dmi index 88ee2caa9474..66fab7cc8843 100644 Binary files a/icons/obj/items/clothing/shoes.dmi and b/icons/obj/items/clothing/shoes.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/twe_ammo.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/twe_ammo.dmi index 87c15e297799..2e8a3d18724d 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/twe_ammo.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/twe_ammo.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/twe_guns.dmi b/icons/obj/items/weapons/guns/guns_by_faction/twe_guns.dmi index 243e1b39d617..1976bcf8832d 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/twe_guns.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/twe_guns.dmi differ