diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm index e534997ddd42..f8f2e61b8a37 100644 --- a/code/modules/cm_marines/Donator_Items.dm +++ b/code/modules/cm_marines/Donator_Items.dm @@ -244,11 +244,12 @@ icon_state = "tristan_armor" item_state = "tristan_armor" -/obj/item/clothing/suit/storage/marine/fluff/sas_legion //CKEY=sasoperative (UNIQUE) - name = "Legion Armor" - desc = "This armor was custom-made to resemble the small growing Legion within the galaxy started by one man slowly making its way to becoming a larger Corporation. DONOR ITEM." - item_state = "ncrjacket" - icon_state = "ncrjacket" +/obj/item/clothing/suit/storage/marine/light/fluff/sas_legion //CKEY=sasoperative (UNIQUE) + name = "M3 Ranger Armor" + desc = "A set of M3 Pattern Ranger Armor, There probably are not many of these laying around. DONOR ITEM." + flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE + icon_state = "rangerarmor" + item_state = "rangerarmor" /obj/item/clothing/suit/storage/marine/fluff/feodrich //CKEY=feodrich (UNIQUE) name = "Doom Armor" @@ -470,18 +471,6 @@ icon_state = "medicae_armor_u" item_state = "medicae_armor_u" -/obj/item/clothing/suit/storage/marine/fluff/Sanctum_heavy - name = "Sanctum Founder Armor" - desc = "Personal Armor of the Founder of Sanctum Team. It looks more like a Exosuit. Unique DONOR ITEM" //Add UNIQUE if Unique - icon_state = "Sanctum_Heavy_u" - item_state = "Sanctum_Heavy_u" - -/obj/item/clothing/suit/storage/marine/fluff/Sanctum_medium - name = "Sanctum Standard Armor" - desc = "The Standard Issue Armor for Sanctum Operatives Unique DONOR ITEM" - icon_state = "Sanctum_Medium_u" - item_state = "Sanctum_Medium_u" - /obj/item/clothing/suit/storage/marine/fluff/dudewithatude name = "Rainbow Coat" desc = "Powered by the magic of FRIENDSHIP. (Can be toggled opened or closed) UNIQUE DONOR ITEM" @@ -656,6 +645,13 @@ icon_state = "hecuhelm_u" desc = "A combat helmet, bearing the scars of many battles. UNIQUE DONOR ITEM" +/obj/item/clothing/head/helmet/marine/fluff/sas_legion //CKEY=sasoperative (UNIQUE) + name = "M3 Ranger Helmet" + desc = "A M3 Ranger helmet, probably not many of these laying around. DONOR ITEM" + flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE + icon_state = "rangerhelmet" + item_state = "rangerhelmet" + /obj/item/clothing/head/helmet/marine/fluff/officialjake name = "Timothy's Beret" desc = "A fancy red beret owned by Timothy Seidner. DONOR ITEM" @@ -912,14 +908,6 @@ flags_inventory = BLOCKSHARPOBJ flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR -/obj/item/clothing/head/helmet/marine/fluff/Sanctum_helmet - name = "Sanctum Combat Helmet" - desc = " The Standard Issue helmet of Sanctum Team. DONOR ITEM" //Add UNIQUE if Unique - icon_state = "Sanctum_Helm_u" - item_state = "Sanctum_Helm_u" - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR - /obj/item/clothing/head/helmet/marine/fluff/dingledangle name = "Rusty's Cap" desc = "A little old and shabby. The color has slightly faded over time. DONOR ITEM" @@ -998,13 +986,6 @@ worn_state = "camojump" flags_jumpsuit = FALSE -/obj/item/clothing/under/marine/fluff/sas_legion //CKEY=sasoperative (UNIQUE) - name = "Legion Suit" - desc = "This armor was custom-made to resemble the small growing Legion within the galaxy started by one man slowly making its way to becoming a larger Corporation. DONOR ITEM." - icon_state = "ncr_uni" - worn_state = "ncr_uni" - flags_jumpsuit = FALSE - /obj/item/clothing/under/marine/fluff/feodrich //CKEY=feodrich (UNIQUE) name = "Doom Uniform" desc = "A uniform, of a famous Earth warrior... Donor Item" @@ -1207,13 +1188,6 @@ worn_state = "medicae_jumpsuit_u" flags_jumpsuit = FALSE -/obj/item/clothing/under/marine/fluff/sanctum_uniform //NO USER - name = "Sanctum Fatigues" - desc = "Fatigues with Kevlar fibers for a bit more protection than most clothing. UNIQUE DONOR ITEM" - icon_state = "Sanctum_u" - worn_state = "Sanctum_u" - flags_jumpsuit = FALSE - /obj/item/clothing/under/marine/fluff/sailordave //CKEY=sailordave name = "Eden USCM uniform" desc = "An older model USCM uniform. UNIQUE DONOR ITEM" @@ -1244,16 +1218,6 @@ item_state = "revanmask" icon_state = "revanmask" - -/obj/item/clothing/mask/fluff/sas_legion //CKEY=sasoperative (UNIQUE) - name = "Legion Mask" - desc = "This armor was custom-made to resemble the small growing Legion within the galaxy started by one man slowly making its way to becoming a larger Corporation. DONOR ITEM." - icon_override = 'icons/mob/humans/onmob/mask.dmi' - item_state = "officer_mask" - icon_state = "officer_mask" - flags_inventory = COVERMOUTH|ALLOWREBREATH - flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR - /obj/item/clothing/mask/fluff/totalanarchy //CKEY=totalanarchy name = "PMC Mask" desc = "A white colored PMC Mask. DONOR ITEM." @@ -1373,6 +1337,13 @@ item_state = "securitypack" has_gamemode_skin = FALSE //same sprite for all gamemodes. +/obj/item/storage/backpack/marine/satchel/fluff/sas_legion //CKEY=sasoperative (UNIQUE) + name = "M3 Armored Pack" + desc = "Plenty of pouches and pockets. DONOR ITEM" + flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE + icon_state = "skinnerrangerpack" + item_state = "skinnerrangerpack" + /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 01acf638c2cd..8b352340e55a 100644 --- a/code/modules/cm_marines/Donator_Kits.dm +++ b/code/modules/cm_marines/Donator_Kits.dm @@ -436,9 +436,9 @@ donor_key = "sasoperative" kit_variant = "Legion" donor_gear = list( - /obj/item/clothing/suit/storage/marine/fluff/sas_legion, - /obj/item/clothing/under/marine/fluff/sas_legion, - /obj/item/clothing/mask/fluff/sas_legion, + /obj/item/clothing/suit/storage/marine/light/fluff/sas_legion, + /obj/item/clothing/head/helmet/marine/fluff/sas_legion, + /obj/item/storage/backpack/marine/satchel/fluff/sas_legion, ) /obj/item/storage/box/donator_kit/seloc_aferah diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index 84bdbb6ff26a..8937592c7887 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 4a4338eac4c2..862953a27be3 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 737b59f6c4af..db5514a0f3b8 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/mob/humans/onmob/uniform_1.dmi b/icons/mob/humans/onmob/uniform_1.dmi index 89500b39a596..34a85bae0e1e 100644 Binary files a/icons/mob/humans/onmob/uniform_1.dmi and b/icons/mob/humans/onmob/uniform_1.dmi differ diff --git a/icons/obj/items/clothing/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi index 99240596a9da..f4151b592e76 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/donor/HEAD.dmi b/icons/obj/items/clothing/donor/HEAD.dmi index 3116bdef26b6..23a29f5a2a58 100644 Binary files a/icons/obj/items/clothing/donor/HEAD.dmi and b/icons/obj/items/clothing/donor/HEAD.dmi differ diff --git a/icons/obj/items/clothing/donor/SUITS.dmi b/icons/obj/items/clothing/donor/SUITS.dmi index fc0c9987b9d4..e6e4ffef14e5 100644 Binary files a/icons/obj/items/clothing/donor/SUITS.dmi and b/icons/obj/items/clothing/donor/SUITS.dmi differ diff --git a/icons/obj/items/clothing/donor/Sanctum Uniforms.dmi b/icons/obj/items/clothing/donor/Sanctum Uniforms.dmi deleted file mode 100644 index 87e9a4c94b1d..000000000000 Binary files a/icons/obj/items/clothing/donor/Sanctum Uniforms.dmi and /dev/null differ diff --git a/icons/obj/items/clothing/donor/UNIFORM.dmi b/icons/obj/items/clothing/donor/UNIFORM.dmi index 2e0cd816dfed..5c43f7503a46 100644 Binary files a/icons/obj/items/clothing/donor/UNIFORM.dmi and b/icons/obj/items/clothing/donor/UNIFORM.dmi differ diff --git a/icons/obj/items/clothing/hats.dmi b/icons/obj/items/clothing/hats.dmi index 3e2a1dcfc243..45e09ebf7eaa 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 41e6be7e89b9..cdb81b742d78 100644 Binary files a/icons/obj/items/clothing/suits.dmi and b/icons/obj/items/clothing/suits.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index 6ab40c6c5970..d08183faf920 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ