Adds new energy shield module MK2 [MODULAR]

modular_RUtgmc/code/modules/clothing/modular_armor/attachments/modules.dm

@@ -125,6 +125,26 @@
 		return
 	blips_list += new /obj/effect/blip/close_blip(get_turf(target), status, operator)
 
+/obj/item/armor_module/module/eshield/mark2
+	name = "Svalinn Energy Shield System Mark 2"
+	desc = "Improved version of the protective shield covering the user with a force field, improved shield strength by 2 times makes it more reliable."
+	icon = 'icons/mob/modular/modular_armor_modules.dmi'
+	icon_state = "mod_eshield"
+	item_state = "mod_eshield_a"
+	slot = ATTACHMENT_SLOT_MODULE
+	soft_armor = list(MELEE = -15, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = -5, FIRE = 0, ACID = -5)
+	variants_by_parent_type = list(/obj/item/clothing/suit/modular/xenonauten = "mod_eshield_xn")
+
+	///Maximum shield Health
+	max_shield_health = 70
+	///Amount to recharge per tick, processes once every two seconds.
+	recharge_rate = 5
+
+	///Shield color when the shield is 66% to full
+	shield_color_full = COLOR_GREEN
+///Delay it takes to start recharging again after the shield has been damaged.
+	damaged_shield_cooldown = 7 SECONDS
+
 /obj/item/armor_module/module/fire_proof/som
 	icon = 'modular_RUtgmc/icons/mob/modular/modular_armor_modules.dmi'
 

modular_RUtgmc/code/modules/clothing/modular_armor/jaeger.dm

@@ -6,3 +6,31 @@
 
 /obj/item/clothing/head/modular/marine
 	soft_armor = list(MELEE = 50, BULLET = 70, LASER = 70, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 50, ACID = 60)
+
+/obj/item/clothing/suit/modular/jaeger
+	attachments_allowed = list(
+		/obj/item/armor_module/module/better_shoulder_lamp,
+		/obj/item/armor_module/module/valkyrie_autodoc,
+		/obj/item/armor_module/module/fire_proof,
+		/obj/item/armor_module/module/tyr_extra_armor,
+		/obj/item/armor_module/module/tyr_extra_armor/mark1,
+		/obj/item/armor_module/module/mimir_environment_protection,
+		/obj/item/armor_module/module/mimir_environment_protection/mark1,
+		/obj/item/armor_module/module/hlin_explosive_armor,
+		/obj/item/armor_module/module/ballistic_armor,
+		/obj/item/armor_module/module/chemsystem,
+		/obj/item/armor_module/module/eshield/mark2,
+		/obj/item/armor_module/module/eshield,
+
+		/obj/item/armor_module/storage/general,
+		/obj/item/armor_module/storage/ammo_mag,
+		/obj/item/armor_module/storage/engineering,
+		/obj/item/armor_module/storage/medical,
+		/obj/item/armor_module/storage/general/som,
+		/obj/item/armor_module/storage/engineering/som,
+		/obj/item/armor_module/storage/medical/som,
+		/obj/item/armor_module/storage/injector,
+		/obj/item/armor_module/storage/grenade,
+		/obj/item/armor_module/storage/integrated,
+		/obj/item/armor_module/armor/badge,
+	)

modular_RUtgmc/code/modules/clothing/modular_armor/modular.dm

@@ -0,0 +1,98 @@
+	attachments_allowed = list(
+		/obj/item/armor_module/armor/chest/marine,
+		/obj/item/armor_module/armor/legs/marine,
+		/obj/item/armor_module/armor/arms/marine,
+
+		/obj/item/armor_module/armor/chest/marine/skirmisher,
+		/obj/item/armor_module/armor/legs/marine/skirmisher,
+		/obj/item/armor_module/armor/arms/marine/skirmisher,
+
+		/obj/item/armor_module/armor/chest/marine/skirmisher/scout,
+		/obj/item/armor_module/armor/legs/marine/scout,
+		/obj/item/armor_module/armor/arms/marine/scout,
+
+		/obj/item/armor_module/armor/chest/marine/skirmisher/trooper,
+		/obj/item/armor_module/armor/legs/marine/trooper,
+		/obj/item/armor_module/armor/arms/marine/trooper,
+
+		/obj/item/armor_module/armor/chest/marine/assault,
+		/obj/item/armor_module/armor/legs/marine/assault,
+		/obj/item/armor_module/armor/arms/marine/assault,
+
+		/obj/item/armor_module/armor/chest/marine/eva,
+		/obj/item/armor_module/armor/legs/marine/eva,
+		/obj/item/armor_module/armor/arms/marine/eva,
+
+		/obj/item/armor_module/armor/chest/marine/assault/eod,
+		/obj/item/armor_module/armor/legs/marine/eod,
+		/obj/item/armor_module/armor/arms/marine/eod,
+
+		/obj/item/armor_module/armor/chest/marine/helljumper,
+		/obj/item/armor_module/armor/legs/marine/helljumper,
+		/obj/item/armor_module/armor/arms/marine/helljumper,
+
+		/obj/item/armor_module/armor/chest/marine/ranger,
+		/obj/item/armor_module/armor/legs/marine/ranger,
+		/obj/item/armor_module/armor/arms/marine/ranger,
+
+		/obj/item/armor_module/armor/chest/marine/kabuto,
+		/obj/item/armor_module/armor/legs/marine/kabuto,
+		/obj/item/armor_module/armor/arms/marine/kabuto,
+
+		/obj/item/armor_module/armor/chest/marine/hotaru,
+		/obj/item/armor_module/armor/legs/marine/hotaru,
+		/obj/item/armor_module/armor/arms/marine/hotaru,
+
+		/obj/item/armor_module/module/better_shoulder_lamp,
+		/obj/item/armor_module/module/valkyrie_autodoc,
+		/obj/item/armor_module/module/fire_proof,
+		/obj/item/armor_module/module/tyr_extra_armor,
+		/obj/item/armor_module/module/tyr_extra_armor/mark1,
+		/obj/item/armor_module/module/mimir_environment_protection,
+		/obj/item/armor_module/module/mimir_environment_protection/mark1,
+		/obj/item/armor_module/module/hlin_explosive_armor,
+		/obj/item/armor_module/module/ballistic_armor,
+		/obj/item/armor_module/module/chemsystem,
+		/obj/item/armor_module/module/eshield/mark2,
+		/obj/item/armor_module/module/eshield,
+
+		/obj/item/armor_module/storage/general,
+		/obj/item/armor_module/storage/ammo_mag,
+		/obj/item/armor_module/storage/engineering,
+		/obj/item/armor_module/storage/medical,
+		/obj/item/armor_module/storage/general/som,
+		/obj/item/armor_module/storage/engineering/som,
+		/obj/item/armor_module/storage/medical/som,
+		/obj/item/armor_module/storage/injector,
+		/obj/item/armor_module/storage/grenade,
+		/obj/item/armor_module/storage/integrated,
+		/obj/item/armor_module/armor/badge,
+	)
+
+/obj/item/clothing/suit/modular/rownin
+	attachments_allowed = list(
+		/obj/item/armor_module/module/better_shoulder_lamp,
+		/obj/item/armor_module/module/valkyrie_autodoc,
+		/obj/item/armor_module/module/fire_proof,
+		/obj/item/armor_module/module/tyr_extra_armor,
+		/obj/item/armor_module/module/tyr_extra_armor/mark1,
+		/obj/item/armor_module/module/mimir_environment_protection,
+		/obj/item/armor_module/module/mimir_environment_protection/mark1,
+		/obj/item/armor_module/module/hlin_explosive_armor,
+		/obj/item/armor_module/module/ballistic_armor,
+		/obj/item/armor_module/module/chemsystem,
+		/obj/item/armor_module/module/eshield/mark2,
+		/obj/item/armor_module/module/eshield,
+
+		/obj/item/armor_module/storage/general,
+		/obj/item/armor_module/storage/ammo_mag,
+		/obj/item/armor_module/storage/engineering,
+		/obj/item/armor_module/storage/medical,
+		/obj/item/armor_module/storage/general/som,
+		/obj/item/armor_module/storage/engineering/som,
+		/obj/item/armor_module/storage/medical/som,
+		/obj/item/armor_module/storage/injector,
+		/obj/item/armor_module/storage/grenade,
+		/obj/item/armor_module/storage/integrated,
+		/obj/item/armor_module/armor/badge,
+	)

modular_RUtgmc/code/modules/clothing/modular_armor/xenonauten.dm

@@ -39,6 +39,7 @@
 		/obj/item/armor_module/module/ballistic_armor,
 		/obj/item/armor_module/module/chemsystem,
 		/obj/item/armor_module/module/eshield,
+		/obj/item/armor_module/module/eshield/mark2,
 
 		/obj/item/armor_module/storage/general,
 		/obj/item/armor_module/storage/ammo_mag,
@@ -48,3 +49,31 @@
 		/obj/item/armor_module/storage/integrated,
 		/obj/item/armor_module/armor/badge,
 	)
+
+/obj/item/clothing/suit/modular/xenonauten
+	attachments_allowed = list(
+		/obj/item/armor_module/module/better_shoulder_lamp,
+		/obj/item/armor_module/module/valkyrie_autodoc,
+		/obj/item/armor_module/module/fire_proof,
+		/obj/item/armor_module/module/tyr_extra_armor,
+		/obj/item/armor_module/module/tyr_extra_armor/mark1,
+		/obj/item/armor_module/module/mimir_environment_protection,
+		/obj/item/armor_module/module/mimir_environment_protection/mark1,
+		/obj/item/armor_module/module/hlin_explosive_armor,
+		/obj/item/armor_module/module/ballistic_armor,
+		/obj/item/armor_module/module/chemsystem,
+		/obj/item/armor_module/module/eshield/mark2,
+		/obj/item/armor_module/module/eshield,
+
+		/obj/item/armor_module/storage/general,
+		/obj/item/armor_module/storage/ammo_mag,
+		/obj/item/armor_module/storage/engineering,
+		/obj/item/armor_module/storage/medical,
+		/obj/item/armor_module/storage/general/som,
+		/obj/item/armor_module/storage/engineering/som,
+		/obj/item/armor_module/storage/medical/som,
+		/obj/item/armor_module/storage/injector,
+		/obj/item/armor_module/storage/grenade,
+		/obj/item/armor_module/storage/integrated,
+		/obj/item/armor_module/armor/badge,
+	)

modular_RUtgmc/code/modules/reqs/supplypacks.dm

@@ -158,6 +158,13 @@
 	contains = list(/obj/item/clothing/glasses/night/imager_goggles)
 	cost = 50
 
+/datum/supply_packs/armor/modular/attachments/eshield_mark2
+	name = "Svalinn Energy Shield System Mark 2"
+	contains = list(
+	/obj/item/armor_module/module/eshield/mark2,
+	)
+	cost = 115
+
 /datum/supply_packs/operations/beacons_orbital
 	name = "orbital beacon"
 	contains = list(/obj/item/beacon/orbital_bombardment_beacon)

modular_RUtgmc/includes.dm

@@ -183,6 +183,7 @@
 #include "code\datums\keybinding\communication.dm"
 #include "code\__HELPERS\text.dm"
 #include "code\modules\projectiles\guns\specialist.dm"
+#include "code\modules\clothing\modular_armor\modular.dm"
 #include "code\modules\clothing\modular_armor\jaeger.dm"
 #include "code\modules\clothing\modular_armor\attachments\chest_plates.dm"
 #include "code\modules\reagents\reactions\medical.dm"