From 5a68a792897974f76c687186d10011667fefc0aa Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 13 Aug 2024 01:25:45 +0800 Subject: [PATCH 01/13] InitalCommit --- code/__DEFINES/mode.dm | 2 +- .../suits/marine_armor/_marine_armor.dm | 55 +++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 4c3a658ff421..a09672a47ab8 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -57,7 +57,7 @@ #define MODE_BASIC_RT (1<<11) #define MODE_RANDOM_HIVE (1<<12)// Makes Join-as-Xeno choose a hive to join as burrowed larva at random rather than at user's input.. #define MODE_THUNDERSTORM (1<<13)// Enables thunderstorm effects on maps that are compatible with it. (Lit exterior tiles, rain effects) -#define MODE_FACTION_CLASH (1<<14)// Disables scopes, sniper sentries, OBs, shooting corpses, dragging enemy corpses, stripping enemy corpses +#define MODE_FACTION_CLASH (1<<14)// Disables scopes, sniper sentries, OBs, shooting corpses, dragging enemy corpses, stripping enemy corpses, increase armor bullet/bomb/internal damage protection // Gamemode Toggleable Flags #define MODE_NO_SNIPER_SENTRY (1<<0) /// Upgrade kits will no longer allow you to select long-range upgrades diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 3d89ecb7cabb..1fc83d869841 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -286,6 +286,17 @@ item_state_slots = list(WEAR_JACKET = "mp_armor") black_market_value = 20 +/obj/item/clothing/suit/storage/marine/MP/Initialize(mapload) + . = ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + armor_bullet = CLOTHING_ARMOR_HIGH + armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_HIGH + else + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW + /obj/item/clothing/suit/storage/marine/MP/warden name = "\improper M3 pattern warden MP armor" desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Wardens. Useful for letting your men know who is in charge." @@ -415,6 +426,17 @@ armor_variation = 0 specialty = "M3 pattern smooth marine" +/obj/item/clothing/suit/storage/marine/medium/Initialize(mapload) + . = ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + armor_bullet = CLOTHING_ARMOR_HIGH + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_HIGH + else + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + // M3-L pattern light armor /obj/item/clothing/suit/storage/marine/light name = "\improper M3-L pattern light armor" @@ -455,6 +477,17 @@ icon_state = "L6" armor_variation = 0 +/obj/item/clothing/suit/storage/marine/light/Initialize(mapload) + . = ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + else + armor_bullet = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_LOW + /obj/item/clothing/suit/storage/marine/light/vest name = "\improper M3-VL pattern ballistics vest" desc = "Up until 2182 USCM non-combat personnel were issued non-standardized ballistics vests, though the lack of IMP compatibility and suit lamps proved time and time again inefficient. This modified M3-L shell is the result of a 6-year R&D program; It provides utility, protection, AND comfort to all USCM non-combat personnel." @@ -500,6 +533,17 @@ time_to_equip = 1 SECONDS uniform_restricted = null +/obj/item/clothing/suit/storage/marine/light/synvest/Initialize(mapload) + . = ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + armor_bullet = CLOTHING_ARMOR_NONE + armor_bomb = CLOTHING_ARMOR_NONE + armor_internaldamage = CLOTHING_ARMOR_NONE + else + armor_bullet = CLOTHING_ARMOR_NONE + armor_bomb = CLOTHING_ARMOR_NONE + armor_internaldamage = CLOTHING_ARMOR_NONE + /obj/item/clothing/suit/storage/marine/light/synvest/grey icon_state = "VL_syn" flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE @@ -578,6 +622,17 @@ icon_state = "H6" armor_variation = 0 +/obj/item/clothing/suit/storage/marine/heavy/Initialize(mapload) + . = ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + armor_bullet = CLOTHING_ARMOR_HIGH + armor_bomb = CLOTHING_ARMOR_HIGH + armor_internaldamage = CLOTHING_ARMOR_HIGH + else + armor_bullet = CLOTHING_ARMOR_HIGHPLUS + armor_bomb = CLOTHING_ARMOR_HIGHPLUS + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + //===========================//SPECIALIST\\================================\\ //=======================================================================\\ From 7ce8e2be90925c00a607bc24e7a8e880ff13170d Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 13 Aug 2024 10:41:21 +0800 Subject: [PATCH 02/13] ReturnArmour --- code/modules/clothing/suits/marine_armor/_marine_armor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 1fc83d869841..701e74aaf3d7 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -625,8 +625,8 @@ /obj/item/clothing/suit/storage/marine/heavy/Initialize(mapload) . = ..() if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_HIGH - armor_bomb = CLOTHING_ARMOR_HIGH + armor_bullet = CLOTHING_ARMOR_HIGHPLUS + armor_bomb = CLOTHING_ARMOR_HIGHPLUS armor_internaldamage = CLOTHING_ARMOR_HIGH else armor_bullet = CLOTHING_ARMOR_HIGHPLUS From eaf4e7d4cd9314d93565742be70ba494efc80d75 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 13 Aug 2024 11:10:12 +0800 Subject: [PATCH 03/13] Smartgunner --- .../clothing/suits/marine_armor/smartgunner.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/clothing/suits/marine_armor/smartgunner.dm b/code/modules/clothing/suits/marine_armor/smartgunner.dm index 64cf88d22cfe..38eada013c3e 100644 --- a/code/modules/clothing/suits/marine_armor/smartgunner.dm +++ b/code/modules/clothing/suits/marine_armor/smartgunner.dm @@ -63,3 +63,14 @@ . = ..() UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP) + +/obj/item/clothing/suit/storage/marine/smartgunner/Initialize(mapload) + . = ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + armor_bullet = CLOTHING_ARMOR_HIGH + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_HIGH + else + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUM From 0d80c11100f4b668da852b7ead9a04d350fb6e2f Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 13 Aug 2024 11:10:50 +0800 Subject: [PATCH 04/13] SGTwo --- code/modules/clothing/suits/marine_armor/smartgunner.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/clothing/suits/marine_armor/smartgunner.dm b/code/modules/clothing/suits/marine_armor/smartgunner.dm index 38eada013c3e..f3dbd42ca9fc 100644 --- a/code/modules/clothing/suits/marine_armor/smartgunner.dm +++ b/code/modules/clothing/suits/marine_armor/smartgunner.dm @@ -68,9 +68,7 @@ . = ..() if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) armor_bullet = CLOTHING_ARMOR_HIGH - armor_bomb = CLOTHING_ARMOR_MEDIUM armor_internaldamage = CLOTHING_ARMOR_HIGH else armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_MEDIUMLOW armor_internaldamage = CLOTHING_ARMOR_MEDIUM From 9d57b7e5291bdbeff67b96d3aa3239b40936c79f Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 13 Aug 2024 11:26:43 +0800 Subject: [PATCH 05/13] SpecArmors --- .../suits/marine_armor/_marine_armor.dm | 40 +++++++++++++++++++ .../clothing/suits/marine_armor/ghillie.dm | 11 +++++ 2 files changed, 51 insertions(+) diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 701e74aaf3d7..90df7ce84aeb 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -680,6 +680,15 @@ playsound(src,'sound/machines/click.ogg', 15, 1) return +/obj/item/clothing/suit/storage/marine/specialist/Initialize(mapload) + . = ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + armor_bullet = CLOTHING_ARMOR_HIGHPLUS + armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS + else + armor_bullet = CLOTHING_ARMOR_HIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + /obj/item/clothing/suit/storage/marine/M3G name = "\improper M3-G4 grenadier armor" desc = "A custom set of M3 armor packed to the brim with padding, plating, and every form of ballistic protection under the sun. Used exclusively by USCM Grenadiers." @@ -700,6 +709,15 @@ unacidable = TRUE light_range = 5 +/obj/item/clothing/suit/storage/marine/M3G/Initialize(mapload) + . = ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + armor_bullet = CLOTHING_ARMOR_HIGH + armor_internaldamage = CLOTHING_ARMOR_HIGH + else + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + /obj/item/clothing/suit/storage/marine/M3T name = "\improper M3-T light armor" desc = "A custom set of M3 armor designed for users of long-ranged explosive weaponry." @@ -710,6 +728,17 @@ flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE unacidable = TRUE +/obj/item/clothing/suit/storage/marine/M3T/Initialize(mapload) + . = ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + armor_bullet = CLOTHING_ARMOR_HIGH + armor_bomb = CLOTHING_ARMOR_HIGH + armor_internaldamage = CLOTHING_ARMOR_HIGH + else + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_HIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + /obj/item/clothing/suit/storage/marine/M3S name = "\improper M3-S light armor" desc = "A custom set of M3 armor designed for USCM Scouts." @@ -720,6 +749,17 @@ flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE unacidable = TRUE +/obj/item/clothing/suit/storage/marine/M3S/Initialize(mapload) + . = ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + armor_bullet = CLOTHING_ARMOR_HIGH + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_HIGH + else + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + /obj/item/clothing/suit/storage/RO name = "quartermaster jacket" desc = "A green jacket worn by USCM personnel. The back has the flag of the United Americas on it." diff --git a/code/modules/clothing/suits/marine_armor/ghillie.dm b/code/modules/clothing/suits/marine_armor/ghillie.dm index c55e1d054b79..44ebf5033322 100644 --- a/code/modules/clothing/suits/marine_armor/ghillie.dm +++ b/code/modules/clothing/suits/marine_armor/ghillie.dm @@ -24,6 +24,17 @@ actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/specialist/prepare_position) +/obj/item/clothing/suit/storage/marine/ghillie/Initialize(mapload) + . = ..() + if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) + armor_bullet = CLOTHING_ARMOR_HIGH + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_HIGH + else + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + /obj/item/clothing/suit/storage/marine/ghillie/dropped(mob/user) if(ishuman(user) && !issynth(user)) deactivate_camouflage(user, FALSE) From 473083bb46020f3ece74c2e1abe718be086d5439 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 13 Aug 2024 11:55:19 +0800 Subject: [PATCH 06/13] Clearup --- code/modules/clothing/suits/marine_armor/_marine_armor.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 90df7ce84aeb..42533d21aa63 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -625,12 +625,8 @@ /obj/item/clothing/suit/storage/marine/heavy/Initialize(mapload) . = ..() if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_HIGHPLUS - armor_bomb = CLOTHING_ARMOR_HIGHPLUS armor_internaldamage = CLOTHING_ARMOR_HIGH else - armor_bullet = CLOTHING_ARMOR_HIGHPLUS - armor_bomb = CLOTHING_ARMOR_HIGHPLUS armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH //===========================//SPECIALIST\\================================\\ @@ -732,11 +728,9 @@ . = ..() if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) armor_bullet = CLOTHING_ARMOR_HIGH - armor_bomb = CLOTHING_ARMOR_HIGH armor_internaldamage = CLOTHING_ARMOR_HIGH else armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_HIGH armor_internaldamage = CLOTHING_ARMOR_MEDIUM /obj/item/clothing/suit/storage/marine/M3S From 21df82bb84de338ade5bf4121d5b550ed7a2f431 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 15 Aug 2024 17:18:23 +0800 Subject: [PATCH 07/13] ReqChanges --- .../suits/marine_armor/_marine_armor.dm | 31 ------------------- .../clothing/suits/marine_armor/ghillie.dm | 4 --- .../suits/marine_armor/smartgunner.dm | 3 -- 3 files changed, 38 deletions(-) diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 42533d21aa63..244b72447ff9 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -292,10 +292,6 @@ armor_bullet = CLOTHING_ARMOR_HIGH armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH armor_internaldamage = CLOTHING_ARMOR_HIGH - else - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW /obj/item/clothing/suit/storage/marine/MP/warden name = "\improper M3 pattern warden MP armor" @@ -432,10 +428,6 @@ armor_bullet = CLOTHING_ARMOR_HIGH armor_bomb = CLOTHING_ARMOR_MEDIUM armor_internaldamage = CLOTHING_ARMOR_HIGH - else - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_MEDIUMLOW - armor_internaldamage = CLOTHING_ARMOR_MEDIUM // M3-L pattern light armor /obj/item/clothing/suit/storage/marine/light @@ -483,10 +475,6 @@ armor_bullet = CLOTHING_ARMOR_MEDIUM armor_bomb = CLOTHING_ARMOR_MEDIUMLOW armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - else - armor_bullet = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_LOW /obj/item/clothing/suit/storage/marine/light/vest name = "\improper M3-VL pattern ballistics vest" @@ -539,10 +527,6 @@ armor_bullet = CLOTHING_ARMOR_NONE armor_bomb = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_NONE - else - armor_bullet = CLOTHING_ARMOR_NONE - armor_bomb = CLOTHING_ARMOR_NONE - armor_internaldamage = CLOTHING_ARMOR_NONE /obj/item/clothing/suit/storage/marine/light/synvest/grey icon_state = "VL_syn" @@ -626,8 +610,6 @@ . = ..() if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) armor_internaldamage = CLOTHING_ARMOR_HIGH - else - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH //===========================//SPECIALIST\\================================\\ //=======================================================================\\ @@ -681,9 +663,6 @@ if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) armor_bullet = CLOTHING_ARMOR_HIGHPLUS armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS - else - armor_bullet = CLOTHING_ARMOR_HIGH - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH /obj/item/clothing/suit/storage/marine/M3G name = "\improper M3-G4 grenadier armor" @@ -710,9 +689,6 @@ if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) armor_bullet = CLOTHING_ARMOR_HIGH armor_internaldamage = CLOTHING_ARMOR_HIGH - else - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH /obj/item/clothing/suit/storage/marine/M3T name = "\improper M3-T light armor" @@ -729,9 +705,6 @@ if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) armor_bullet = CLOTHING_ARMOR_HIGH armor_internaldamage = CLOTHING_ARMOR_HIGH - else - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUM /obj/item/clothing/suit/storage/marine/M3S name = "\improper M3-S light armor" @@ -749,10 +722,6 @@ armor_bullet = CLOTHING_ARMOR_HIGH armor_bomb = CLOTHING_ARMOR_MEDIUM armor_internaldamage = CLOTHING_ARMOR_HIGH - else - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_MEDIUMLOW - armor_internaldamage = CLOTHING_ARMOR_MEDIUM /obj/item/clothing/suit/storage/RO name = "quartermaster jacket" diff --git a/code/modules/clothing/suits/marine_armor/ghillie.dm b/code/modules/clothing/suits/marine_armor/ghillie.dm index 44ebf5033322..790c270f512f 100644 --- a/code/modules/clothing/suits/marine_armor/ghillie.dm +++ b/code/modules/clothing/suits/marine_armor/ghillie.dm @@ -30,10 +30,6 @@ armor_bullet = CLOTHING_ARMOR_HIGH armor_bomb = CLOTHING_ARMOR_MEDIUM armor_internaldamage = CLOTHING_ARMOR_HIGH - else - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_MEDIUMLOW - armor_internaldamage = CLOTHING_ARMOR_MEDIUM /obj/item/clothing/suit/storage/marine/ghillie/dropped(mob/user) if(ishuman(user) && !issynth(user)) diff --git a/code/modules/clothing/suits/marine_armor/smartgunner.dm b/code/modules/clothing/suits/marine_armor/smartgunner.dm index f3dbd42ca9fc..a186b006f7a8 100644 --- a/code/modules/clothing/suits/marine_armor/smartgunner.dm +++ b/code/modules/clothing/suits/marine_armor/smartgunner.dm @@ -69,6 +69,3 @@ if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) armor_bullet = CLOTHING_ARMOR_HIGH armor_internaldamage = CLOTHING_ARMOR_HIGH - else - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUM From 994b118da3b9c45bcd8270d6f5a786e02257b9e1 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Mon, 26 Aug 2024 20:52:08 +0800 Subject: [PATCH 08/13] update --- code/datums/decorators/gamemode_decorator.dm | 76 +++++++++++++++++++ .../suits/marine_armor/_marine_armor.dm | 58 -------------- .../clothing/suits/marine_armor/ghillie.dm | 7 -- .../suits/marine_armor/smartgunner.dm | 6 -- 4 files changed, 76 insertions(+), 71 deletions(-) diff --git a/code/datums/decorators/gamemode_decorator.dm b/code/datums/decorators/gamemode_decorator.dm index bc89d7a20632..63fd7ef659f6 100644 --- a/code/datums/decorators/gamemode_decorator.dm +++ b/code/datums/decorators/gamemode_decorator.dm @@ -44,3 +44,79 @@ /datum/decorator/gamemode/decorate(atom/object) for(var/edit in edits) object.vars[edit] = edits[edit] + +//*********************** Human Versus Human ***********************// +//************ USCM Armour Values ************// + +//**** Medium Armor ****// +GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/medium, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + )) + +//**** Light Armor ****// +GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/light, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_MEDIUM), + ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUMLOW), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_MEDIUMHIGH) + )) + +//**** Heavy Armor ****// +GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/heavy, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + )) + +//**** Smartgunner ****// +GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/smartgunner, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + )) + +//**** Military Police and Command ****// +GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/MP, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUMHIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + )) + +//**** B18 Spec Armor ****// +GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/specialist, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGHPLUS), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGHPLUS) + )) + +//**** Grenadier Spec Armor ****// +GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3G, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + )) + +//**** RPG Spec Armor ****// +GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3T, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + )) + +//**** Scout Spec Armor ****// +GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3S, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + )) + +//**** Sniper Spec Armor ****// +GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/ghillie, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + )) + +//**** Pyro Spec Armor ****// +GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M35, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + )) + +//*********************** ------------------ ***********************// diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 244b72447ff9..3d89ecb7cabb 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -286,13 +286,6 @@ item_state_slots = list(WEAR_JACKET = "mp_armor") black_market_value = 20 -/obj/item/clothing/suit/storage/marine/MP/Initialize(mapload) - . = ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_HIGH - armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH - armor_internaldamage = CLOTHING_ARMOR_HIGH - /obj/item/clothing/suit/storage/marine/MP/warden name = "\improper M3 pattern warden MP armor" desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Wardens. Useful for letting your men know who is in charge." @@ -422,13 +415,6 @@ armor_variation = 0 specialty = "M3 pattern smooth marine" -/obj/item/clothing/suit/storage/marine/medium/Initialize(mapload) - . = ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_HIGH - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_HIGH - // M3-L pattern light armor /obj/item/clothing/suit/storage/marine/light name = "\improper M3-L pattern light armor" @@ -469,13 +455,6 @@ icon_state = "L6" armor_variation = 0 -/obj/item/clothing/suit/storage/marine/light/Initialize(mapload) - . = ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_MEDIUMLOW - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - /obj/item/clothing/suit/storage/marine/light/vest name = "\improper M3-VL pattern ballistics vest" desc = "Up until 2182 USCM non-combat personnel were issued non-standardized ballistics vests, though the lack of IMP compatibility and suit lamps proved time and time again inefficient. This modified M3-L shell is the result of a 6-year R&D program; It provides utility, protection, AND comfort to all USCM non-combat personnel." @@ -521,13 +500,6 @@ time_to_equip = 1 SECONDS uniform_restricted = null -/obj/item/clothing/suit/storage/marine/light/synvest/Initialize(mapload) - . = ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_NONE - armor_bomb = CLOTHING_ARMOR_NONE - armor_internaldamage = CLOTHING_ARMOR_NONE - /obj/item/clothing/suit/storage/marine/light/synvest/grey icon_state = "VL_syn" flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE @@ -606,11 +578,6 @@ icon_state = "H6" armor_variation = 0 -/obj/item/clothing/suit/storage/marine/heavy/Initialize(mapload) - . = ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_internaldamage = CLOTHING_ARMOR_HIGH - //===========================//SPECIALIST\\================================\\ //=======================================================================\\ @@ -658,12 +625,6 @@ playsound(src,'sound/machines/click.ogg', 15, 1) return -/obj/item/clothing/suit/storage/marine/specialist/Initialize(mapload) - . = ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_HIGHPLUS - armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS - /obj/item/clothing/suit/storage/marine/M3G name = "\improper M3-G4 grenadier armor" desc = "A custom set of M3 armor packed to the brim with padding, plating, and every form of ballistic protection under the sun. Used exclusively by USCM Grenadiers." @@ -684,12 +645,6 @@ unacidable = TRUE light_range = 5 -/obj/item/clothing/suit/storage/marine/M3G/Initialize(mapload) - . = ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_HIGH - armor_internaldamage = CLOTHING_ARMOR_HIGH - /obj/item/clothing/suit/storage/marine/M3T name = "\improper M3-T light armor" desc = "A custom set of M3 armor designed for users of long-ranged explosive weaponry." @@ -700,12 +655,6 @@ flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE unacidable = TRUE -/obj/item/clothing/suit/storage/marine/M3T/Initialize(mapload) - . = ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_HIGH - armor_internaldamage = CLOTHING_ARMOR_HIGH - /obj/item/clothing/suit/storage/marine/M3S name = "\improper M3-S light armor" desc = "A custom set of M3 armor designed for USCM Scouts." @@ -716,13 +665,6 @@ flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE unacidable = TRUE -/obj/item/clothing/suit/storage/marine/M3S/Initialize(mapload) - . = ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_HIGH - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_HIGH - /obj/item/clothing/suit/storage/RO name = "quartermaster jacket" desc = "A green jacket worn by USCM personnel. The back has the flag of the United Americas on it." diff --git a/code/modules/clothing/suits/marine_armor/ghillie.dm b/code/modules/clothing/suits/marine_armor/ghillie.dm index 790c270f512f..c55e1d054b79 100644 --- a/code/modules/clothing/suits/marine_armor/ghillie.dm +++ b/code/modules/clothing/suits/marine_armor/ghillie.dm @@ -24,13 +24,6 @@ actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/specialist/prepare_position) -/obj/item/clothing/suit/storage/marine/ghillie/Initialize(mapload) - . = ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_HIGH - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_HIGH - /obj/item/clothing/suit/storage/marine/ghillie/dropped(mob/user) if(ishuman(user) && !issynth(user)) deactivate_camouflage(user, FALSE) diff --git a/code/modules/clothing/suits/marine_armor/smartgunner.dm b/code/modules/clothing/suits/marine_armor/smartgunner.dm index a186b006f7a8..64cf88d22cfe 100644 --- a/code/modules/clothing/suits/marine_armor/smartgunner.dm +++ b/code/modules/clothing/suits/marine_armor/smartgunner.dm @@ -63,9 +63,3 @@ . = ..() UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP) - -/obj/item/clothing/suit/storage/marine/smartgunner/Initialize(mapload) - . = ..() - if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) - armor_bullet = CLOTHING_ARMOR_HIGH - armor_internaldamage = CLOTHING_ARMOR_HIGH From 08ce825ead2bc9c83c71a5ef31ac9a8bd34cabcf Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Mon, 26 Aug 2024 20:56:32 +0800 Subject: [PATCH 09/13] more --- code/datums/decorators/gamemode_decorator.dm | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/datums/decorators/gamemode_decorator.dm b/code/datums/decorators/gamemode_decorator.dm index 63fd7ef659f6..247dc7d97410 100644 --- a/code/datums/decorators/gamemode_decorator.dm +++ b/code/datums/decorators/gamemode_decorator.dm @@ -53,70 +53,70 @@ GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/medium, /datum/game_mo ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) - )) +)) //**** Light Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/light, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_MEDIUM), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUMLOW), ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_MEDIUMHIGH) - )) +)) //**** Heavy Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/heavy, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) - )) +)) //**** Smartgunner ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/smartgunner, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) - )) +)) //**** Military Police and Command ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/MP, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUMHIGH), ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) - )) +)) //**** B18 Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/specialist, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGHPLUS), ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGHPLUS) - )) +)) //**** Grenadier Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3G, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) - )) +)) //**** RPG Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3T, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) - )) +)) //**** Scout Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3S, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) - )) +)) //**** Sniper Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/ghillie, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) - )) +)) //**** Pyro Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M35, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) - )) +)) //*********************** ------------------ ***********************// From 366d192492ef772078c038eca848fc3b496b028d Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Mon, 26 Aug 2024 20:59:21 +0800 Subject: [PATCH 10/13] moremore --- code/datums/decorators/gamemode_decorator.dm | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/datums/decorators/gamemode_decorator.dm b/code/datums/decorators/gamemode_decorator.dm index 247dc7d97410..d2c925912b7e 100644 --- a/code/datums/decorators/gamemode_decorator.dm +++ b/code/datums/decorators/gamemode_decorator.dm @@ -52,71 +52,71 @@ GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/medium, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), )) //**** Light Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/light, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_MEDIUM), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUMLOW), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_MEDIUMHIGH) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_MEDIUMHIGH), )) //**** Heavy Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/heavy, /datum/game_mode/extended/faction_clash, list( - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), )) //**** Smartgunner ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/smartgunner, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), )) //**** Military Police and Command ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/MP, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUMHIGH), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), )) //**** B18 Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/specialist, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGHPLUS), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGHPLUS) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGHPLUS), )) //**** Grenadier Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3G, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), )) //**** RPG Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3T, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), )) //**** Scout Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3S, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), )) //**** Sniper Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/ghillie, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), )) //**** Pyro Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M35, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), )) //*********************** ------------------ ***********************// From 8b326a85266fe3a069bf36be61950466f16b32fa Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Mon, 26 Aug 2024 21:04:44 +0800 Subject: [PATCH 11/13] fixfix --- code/datums/decorators/gamemode_decorator.dm | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/datums/decorators/gamemode_decorator.dm b/code/datums/decorators/gamemode_decorator.dm index d2c925912b7e..5a3adf011a61 100644 --- a/code/datums/decorators/gamemode_decorator.dm +++ b/code/datums/decorators/gamemode_decorator.dm @@ -52,71 +52,71 @@ GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/medium, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), + (armor_internaldamage, CLOTHING_ARMOR_HIGH) )) //**** Light Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/light, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_MEDIUM), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUMLOW), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_MEDIUMHIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_MEDIUMHIGH) )) //**** Heavy Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/heavy, /datum/game_mode/extended/faction_clash, list( - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) )) //**** Smartgunner ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/smartgunner, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) )) //**** Military Police and Command ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/MP, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUMHIGH), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) )) //**** B18 Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/specialist, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGHPLUS), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGHPLUS), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGHPLUS) )) //**** Grenadier Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3G, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) )) //**** RPG Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3T, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) )) //**** Scout Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3S, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) )) //**** Sniper Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/ghillie, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) )) //**** Pyro Spec Armor ****// GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M35, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), - ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) )) //*********************** ------------------ ***********************// From e86cdbec0bd127c0bf569174fb56ea96641ff2ef Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Mon, 26 Aug 2024 21:05:03 +0800 Subject: [PATCH 12/13] missedarmor --- code/datums/decorators/gamemode_decorator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/decorators/gamemode_decorator.dm b/code/datums/decorators/gamemode_decorator.dm index 5a3adf011a61..0684735e7205 100644 --- a/code/datums/decorators/gamemode_decorator.dm +++ b/code/datums/decorators/gamemode_decorator.dm @@ -52,7 +52,7 @@ GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/medium, /datum/game_mode/extended/faction_clash, list( ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), - (armor_internaldamage, CLOTHING_ARMOR_HIGH) + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) )) //**** Light Armor ****// From 337c1eba6dcd0216467badf7ab0a58ca9c7e4c35 Mon Sep 17 00:00:00 2001 From: Steelpoint <6595389+Steelpoint@users.noreply.github.com> Date: Thu, 29 Aug 2024 08:46:59 +0800 Subject: [PATCH 13/13] Update _marine_armor.dm --- .../modules/clothing/suits/marine_armor/_marine_armor.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 3d89ecb7cabb..0ba339433fc2 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -665,15 +665,6 @@ flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE unacidable = TRUE -/obj/item/clothing/suit/storage/RO - name = "quartermaster jacket" - desc = "A green jacket worn by USCM personnel. The back has the flag of the United Americas on it." - icon_state = "RO_jacket" - blood_overlay_type = "coat" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS - valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL) - restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) - //==================Combat Correspondent==================\\ /obj/item/clothing/suit/storage/marine/light/reporter