Adds Einstein Merc Equipment (Again) (#15799)

* Adds Einstein Merc Equipment

Adds two gear crates for mercenary teams (or an individual) looking to play as Einstein Engines.

The group crate contains two energy rifles, and a heavy bolter. The single crate has one energy rifle. Both come with silenced pistols and themed voidsuits (or a hardsuit in the case of the group crate)

* Minor Syntax Fixes

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

code/datums/uplink/gear loadout.dm

@@ -80,3 +80,12 @@
 	desc = "A crate containing gear for a single individual.The voidsuit is only usable by Tajara."
 	path = /obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/single
 	item_cost = 10
+
+/datum/uplink_item/item/gear_loadout/einstein
+	name = "Einstein Engines Assets (Group)"
+	path = /obj/structure/closet/crate/secure/gear_loadout/einstein
+
+/datum/uplink_item/item/gear_loadout/einstein_single
+	name = "Einstein Engines Assets (Single)"
+	path = /obj/structure/closet/crate/secure/gear_loadout/einstein/single
+	item_cost = 10

code/game/objects/structures/crates_lockers/crates/gear_loadout.dm

@@ -365,6 +365,47 @@
 	new /obj/item/ammo_magazine/mc9mm(src)
 	new /obj/item/ammo_magazine/mc9mm(src)
 
+/obj/structure/closet/crate/secure/gear_loadout/einstein/fill()
+    new /obj/item/rig/merc/einstein(src)
+    new /obj/item/clothing/head/helmet/space/void/einstein(src)
+    new /obj/item/clothing/head/helmet/space/void/einstein(src)
+    new /obj/item/clothing/head/helmet/space/void/einstein(src)
+    new /obj/item/clothing/head/helmet/space/void/einstein(src)
+    new /obj/item/clothing/head/helmet/space/void/einstein(src)
+    new /obj/item/clothing/suit/space/void/einstein(src)
+    new /obj/item/clothing/suit/space/void/einstein(src)
+    new /obj/item/clothing/suit/space/void/einstein(src)
+    new /obj/item/clothing/suit/space/void/einstein(src)
+    new /obj/item/clothing/suit/space/void/einstein(src)
+    new /obj/item/gun/energy/laser/shotgun(src)
+    new /obj/item/gun/energy/rifle(src)
+    new /obj/item/gun/energy/rifle(src)
+    new /obj/item/gun/projectile/pistol(src)
+    new /obj/item/gun/projectile/pistol(src)
+    new /obj/item/gun/projectile/pistol(src)
+    new /obj/item/gun/projectile/pistol(src)
+    new /obj/item/silencer(src)
+    new /obj/item/silencer(src)
+    new /obj/item/silencer(src)
+    new /obj/item/silencer(src)
+    new /obj/item/ammo_magazine/mc9mm(src)
+    new /obj/item/ammo_magazine/mc9mm(src)
+    new /obj/item/ammo_magazine/mc9mm(src)
+    new /obj/item/ammo_magazine/mc9mm(src)
+    new /obj/item/ammo_magazine/mc9mm(src)
+    new /obj/item/ammo_magazine/mc9mm(src)
+    new /obj/item/ammo_magazine/mc9mm(src)
+    new /obj/item/ammo_magazine/mc9mm(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/einstein/single/fill()
+    new /obj/item/clothing/head/helmet/space/void/einstein(src)
+    new /obj/item/clothing/suit/space/void/einstein(src)
+    new /obj/item/gun/energy/rifle(src)
+    new /obj/item/gun/projectile/pistol(src)
+    new /obj/item/silencer(src)
+    new /obj/item/ammo_magazine/mc9mm(src)
+    new /obj/item/ammo_magazine/mc9mm(src)
+
 //ninja stuff
 /obj/structure/closet/crate/secure/gear_loadout/ninja
 	var/associated_hardsuit = /obj/item/rig/light/ninja

code/modules/clothing/spacesuits/rig/suits/merc.dm

@@ -115,4 +115,25 @@
 		/obj/item/rig_module/fabricator/energy_net,
 		/obj/item/rig_module/device/door_hack,
 		/obj/item/rig_module/actuators/combat
-		)
+		)
+
+/obj/item/rig/merc/einstein //For the Einstein Merc kit
+	name = "paragon suit control module"
+	desc = "A back mounted control mechanism of an Einstein Engines hardsuit. This model is issued to the leaders of security teams within the corporation."
+	suit_type = "paragon"
+	icon = 'icons/clothing/rig/einstein_merc.dmi'
+	icon_state = "paragon"
+	icon_supported_species_tags = null
+	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY
+	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU)
+
+	initial_modules = list(
+		/obj/item/rig_module/power_sink,
+		/obj/item/rig_module/mounted/ion,
+		/obj/item/rig_module/cooling_unit,
+		/obj/item/rig_module/actuators/combat,
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/vision/multi,
+		/obj/item/rig_module/electrowarfare_suite
+	)

html/changelogs/purplepineapple-PR-einstein.yml

@@ -0,0 +1,7 @@
+author: PurplePineapple, Kyres
+
+delete-after: True
+
+changes:
+  - rscadd: "Added a variant of the mercenary hardsuit for use in the Einstein gear crates."
+  - rscadd: "Added gear crates for antagonists wishing to play as Einstein to allow for a more unique set of weapons from other group antagonists."