From b3de66ff99f4cc6cd730c1fce1c530ce8ea9c7f1 Mon Sep 17 00:00:00 2001 From: Ireul <147546674+Ireuldiz@users.noreply.github.com> Date: Sat, 28 Oct 2023 14:29:27 +0200 Subject: [PATCH] removes squad affiliation markings from Marine armor, helmets and gloves (#7) --- code/modules/clothing/gloves/marine_gloves.dm | 2 +- code/modules/clothing/head/helmet.dm | 2 +- code/modules/clothing/suits/marine_armor.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index 15c596f9f6e..b17e46b0eff 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -21,7 +21,7 @@ armor_bio = CLOTHING_ARMOR_MEDIUM armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_LOW - var/adopts_squad_color = TRUE + var/adopts_squad_color = FALSE /// The dmi where the grayscale squad overlays are contained var/squad_overlay_icon = 'icons/mob/humans/onmob/hands_garb.dmi' diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index da0f5808885..ebaaa12fdca 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -358,7 +358,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( var/helmet_overlays[] flags_inventory = BLOCKSHARPOBJ flags_inv_hide = HIDEEARS - var/flags_marine_helmet = HELMET_SQUAD_OVERLAY|HELMET_GARB_OVERLAY|HELMET_DAMAGE_OVERLAY + var/flags_marine_helmet = HELMET_GARB_OVERLAY|HELMET_DAMAGE_OVERLAY var/helmet_bash_cooldown = 0 //speciality does NOTHING if you have NO_NAME_OVERRIDE diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index e375502f543..513b3ae93ed 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -89,7 +89,7 @@ var/locate_cooldown = 0 //Cooldown for SL locator var/armor_overlays[] actions_types = list(/datum/action/item_action/toggle) - var/flags_marine_armor = ARMOR_SQUAD_OVERLAY|ARMOR_LAMP_OVERLAY + var/flags_marine_armor = ARMOR_LAMP_OVERLAY var/specialty = "M3 pattern marine" //Same thing here. Give them a specialty so that they show up correctly in vendors. speciality does NOTHING if you have NO_NAME_OVERRIDE w_class = SIZE_HUGE uniform_restricted = list(/obj/item/clothing/under/marine)