From fd65cec7efde40ab6d08d2bf2c13b35f6ae8644f Mon Sep 17 00:00:00 2001 From: BurpleBineapple <67706292+BurpleBineapple@users.noreply.github.com> Date: Wed, 1 Mar 2023 11:57:55 -0500 Subject: [PATCH] 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 | 9 ++++ .../crates_lockers/crates/gear_loadout.dm | 41 ++++++++++++++++++ .../clothing/spacesuits/rig/suits/merc.dm | 23 +++++++++- .../purplepineapple-PR-einstein.yml | 7 +++ icons/clothing/rig/einstein_merc.dmi | Bin 0 -> 2690 bytes 5 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/purplepineapple-PR-einstein.yml create mode 100644 icons/clothing/rig/einstein_merc.dmi diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm index b27887d562a..4df83844dab 100644 --- a/code/datums/uplink/gear loadout.dm +++ b/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 diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index c92d8f11742..e65acf8b899 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/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 diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index 4fde73b0f6b..14c02c21ff6 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/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 - ) \ No newline at end of file + ) + +/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 + ) diff --git a/html/changelogs/purplepineapple-PR-einstein.yml b/html/changelogs/purplepineapple-PR-einstein.yml new file mode 100644 index 00000000000..1427123964c --- /dev/null +++ b/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." diff --git a/icons/clothing/rig/einstein_merc.dmi b/icons/clothing/rig/einstein_merc.dmi new file mode 100644 index 0000000000000000000000000000000000000000..9d101a9ec33a5ae0cece4ec6a3eab2b3ba89330b GIT binary patch literal 2690 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 literal 0 HcmV?d00001