diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm index 1c7281114c01..bcebad4661b0 100644 --- a/code/modules/cm_marines/Donator_Items.dm +++ b/code/modules/cm_marines/Donator_Items.dm @@ -126,6 +126,9 @@ /obj/item/storage/backpack/marine/fluff xeno_types = null +/obj/item/storage/backpack/marine/satchel/fluff + xeno_types = null + /obj/item/clothing/gloves/marine/fluff //MARINE GLOVES TEMPLATE name = "ITEM NAME" desc = "ITEM DESCRIPTION. DONOR ITEM" //Add UNIQUE if Unique @@ -211,10 +214,10 @@ item_state = "armor_reflec" /obj/item/clothing/suit/storage/marine/fluff/sas_juggernaut //CKEY=sasoperative (UNIQUE) - name = "Juggernaut Armor" + name = "juggernaut armor" desc = "Some fancy looking armor. DONOR ITEM" - icon_state = "rig-syndi" - item_state = "syndie_hardsuit" + icon_state = "skinnerarmor" + item_state = "skinnerarmor" /obj/item/clothing/suit/storage/marine/fluff/penguin //CKEY=tophatpenguin name = "Trenchcoat" @@ -589,8 +592,8 @@ flags_inv_hide = HIDEEARS|HIDEALLHAIR /obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut //CKEY=sasoperative (UNIQUE) - name = "Juggernaut Helmet" - icon_state = "rig0-syndi" + name = "juggernaut helmet" + icon_state = "skinnerhelmet" desc = "A red helmet, for pairing with JuggerNaut Armor. DONOR ITEM" /obj/item/clothing/head/helmet/marine/fluff/tristan //CKEY=tristan63 @@ -613,13 +616,6 @@ flags_inventory = BLOCKSHARPOBJ flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR -/obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut_alt //CKEY=sasoperative (UNIQUE) - name = "Juggernaut Helmet" - icon_state = "ncrhelmet" - desc = "A red helmet, for pairing with JuggerNaut Armor. DONOR ITEM" - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR - /obj/item/clothing/head/helmet/marine/fluff/sadokist //CKEY=sadokist name = "Tanya's Beret" desc = "A bright red beret, owned by Tanya Edenia." @@ -1366,6 +1362,12 @@ icon_state = "securitypack" item_state = "securitypack" +/obj/item/storage/backpack/marine/satchel/fluff/sas_juggernaut //CKEY=sasoperative (UNIQUE) + name = "tactical radiopack" + desc = "A Radio backpack for use with the Juggernaut armor. DONOR ITEM" + icon_state = "skinnerpack" + item_state = "skinnerpack" + /obj/item/clothing/glasses/fluff/alexwarhammer name = "Black Jack's Dank Shades" desc = "+20 Badass points. Donor item" diff --git a/code/modules/cm_marines/Donator_Kits.dm b/code/modules/cm_marines/Donator_Kits.dm index 6c8347f3280e..01acf638c2cd 100644 --- a/code/modules/cm_marines/Donator_Kits.dm +++ b/code/modules/cm_marines/Donator_Kits.dm @@ -427,7 +427,7 @@ donor_key = "sasoperative" kit_variant = "Juggernaut" donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut_alt, + /obj/item/storage/backpack/marine/satchel/fluff/sas_juggernaut, /obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut, /obj/item/clothing/suit/storage/marine/fluff/sas_juggernaut, ) diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index 8a51050c03c3..a6e9ef72c010 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/head_0.dmi b/icons/mob/humans/onmob/head_0.dmi index ce576bdd9cc5..51cad85586e7 100644 Binary files a/icons/mob/humans/onmob/head_0.dmi and b/icons/mob/humans/onmob/head_0.dmi differ diff --git a/icons/mob/humans/onmob/suit_0.dmi b/icons/mob/humans/onmob/suit_0.dmi index d7dfd5394f0d..52f2c7f0a9cb 100644 Binary files a/icons/mob/humans/onmob/suit_0.dmi and b/icons/mob/humans/onmob/suit_0.dmi differ diff --git a/icons/obj/items/clothing/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi index f9c06fca4437..4119b32a09cf 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/hats.dmi b/icons/obj/items/clothing/hats.dmi index 7d2c45103ba6..a6a0e6fb9099 100644 Binary files a/icons/obj/items/clothing/hats.dmi and b/icons/obj/items/clothing/hats.dmi differ diff --git a/icons/obj/items/clothing/suits.dmi b/icons/obj/items/clothing/suits.dmi index d158d9f6bd1f..10fbfff30d7c 100644 Binary files a/icons/obj/items/clothing/suits.dmi and b/icons/obj/items/clothing/suits.dmi differ