diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 368553468af0..04c7993bd9f2 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/datums/decorators/gamemode_decorator.dm b/code/datums/decorators/gamemode_decorator.dm index bc89d7a20632..0684735e7205 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) +)) + +//*********************** ------------------ ***********************//