Adds rival corp voidsuits (#8389)

aurorastation.dme

@@ -348,6 +348,7 @@
 #include "code\datums\uplink\ammunition.dm"
 #include "code\datums\uplink\announcements.dm"
 #include "code\datums\uplink\badassery.dm"
+#include "code\datums\uplink\corporate_equipment.dm"
 #include "code\datums\uplink\devices and tools.dm"
 #include "code\datums\uplink\exosuit.dm"
 #include "code\datums\uplink\exosuit_equipment.dm"

code/datums/uplink/corporate_equipment.dm

@@ -0,0 +1,26 @@
+/datum/uplink_item/item/corporate_equipment
+	category = /datum/uplink_category/corporate_equipment
+
+/datum/uplink_item/item/corporate_equipment/suit/necropolis
+	name = "Revenant Combat Suit"
+	item_cost = 14
+	path = /obj/structure/closet/crate/gear_loadout/necropolis
+	desc = "A full spaceworthy kit of a Necropolis Industries Revenant-type combat suit. Heavily resistant against fast projectiles and backpack-portable. Only wearable by Humans and Humanoid IPCs."
+
+/datum/uplink_item/item/corporate_equipment/suit/zenghu
+	name = "Dragon Biohazard Control Suit"
+	item_cost = 12
+	path = /obj/structure/closet/crate/gear_loadout/zenghu
+	desc = "A full spaceworthy kit of a Zeng-Hu Pharmaceuticals Dragon-type biohazard containment suit. Entirely resistant against radiation in most circumstances. Only wearable by Humans and Humanoid IPCs."
+
+/datum/uplink_item/item/corporate_equipment/suit/hephaestus
+	name = "Caiman Drop Suit"
+	item_cost = 16
+	path = /obj/structure/closet/crate/gear_loadout/hephaestus
+	desc = "A full spaceworthy kit of a Hephaestus Industries Caiman-type terraforming suit. Very resistant against slow-moving blunt force, but heavy. Only wearable by Humans and Humanoid IPCs."
+
+/datum/uplink_item/item/corporate_equipment/suit/einstein
+	name = "Banshee Combat Suit"
+	item_cost = 14
+	path = /obj/structure/closet/crate/gear_loadout/einstein
+	desc = "A full spaceworthy kit of an Einstein Engines Banshee-type infiltration suit. Resistant against lasers, but made of paper against anything else. Only wearable by Humans and Humanoid IPCs."

code/datums/uplink/devices and tools.dm

@@ -183,4 +183,4 @@
 	name = "Electropack"
 	item_cost = 6
 	path = /obj/item/device/radio/electropack
-	desc = "A backpack wired with electrodes. Sync up with a signaller, attach to an unwilling host and pulse the signal to shock them."
+	desc = "A backpack wired with electrodes. Sync up with a signaller, attach to an unwilling host and pulse the signal to shock them."

code/datums/uplink/uplink_categories.dm

@@ -59,6 +59,9 @@
 /datum/uplink_category/exosuit_equipment
 	name = "Exosuit Equipment"
 
+/datum/uplink_category/corporate_equipment
+	name = "Corporate Equipment"
+
 /datum/uplink_category/telecrystals
 	name = "Telecrystals"
 

code/game/objects/random/random.dm

@@ -426,7 +426,11 @@
 		/obj/item/clothing/suit/space/void/hos = /obj/item/clothing/head/helmet/space/void/hos,
 		/obj/item/clothing/suit/space/void/lancer = /obj/item/clothing/head/helmet/space/void/lancer,
 		/obj/item/clothing/suit/space/void/sci = /obj/item/clothing/head/helmet/space/void/sci,
-		/obj/item/clothing/suit/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol
+		/obj/item/clothing/suit/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol,
+		/obj/item/clothing/suit/space/void/hephaestus = /obj/item/clothing/head/helmet/space/void/hephaestus,
+		/obj/item/clothing/suit/space/void/zenghu = /obj/item/clothing/head/helmet/space/void/zenghu,
+		/obj/item/clothing/suit/space/void/einstein = /obj/item/clothing/head/helmet/space/void/einstein,
+		/obj/item/clothing/suit/space/void/necropolis = /obj/item/clothing/head/helmet/space/void/necropolis
 	)
 	problist = list(
 		/obj/item/clothing/suit/space/void = 2,
@@ -442,7 +446,11 @@
 		/obj/item/clothing/suit/space/void/hos = 0.3,
 		/obj/item/clothing/suit/space/void/lancer = 0.3,
 		/obj/item/clothing/suit/space/void/sci = 2,
-		/obj/item/clothing/suit/space/void/sol = 0.5
+		/obj/item/clothing/suit/space/void/sol = 0.5,
+		/obj/item/clothing/suit/space/void/necropolis = 0.5,
+		/obj/item/clothing/suit/space/void/einstein = 0.5,
+		/obj/item/clothing/suit/space/void/hephaestus = 0.5,
+		/obj/item/clothing/suit/space/void/zenghu = 0.5
 	)
 	has_postspawn = TRUE
 

code/game/objects/structures/crates_lockers/closets.dm

@@ -5,6 +5,7 @@
 	icon_state = "closed"
 	density = 1
 	w_class = 5
+	layer = OBJ_LAYER - 0.01
 	var/icon_closed = "closed"
 	var/icon_opened = "open"
 	var/welded_overlay_state = "welded"

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

@@ -502,6 +502,20 @@
 	icon_opened = "largebinopen"
 	icon_closed = "largebin"
 
+/obj/structure/closet/crate/drop
+	name = "drop crate"
+	desc = "A large, sturdy crate meant for airdrops."
+	icon_state = "dropcrate"
+	icon_opened = "dropcrate-open"
+	icon_closed = "dropcrate"
+
+/obj/structure/closet/crate/drop/grey
+	name = "drop crate"
+	desc = "A large, sturdy crate meant for airdrops."
+	icon_state = "dropcrate-grey"
+	icon_opened = "dropcrate-grey-open"
+	icon_closed = "dropcrate-grey"
+
 /obj/structure/closet/crate/radiation
 	name = "radioactive gear crate"
 	desc = "A crate with a radiation sign on it."
@@ -533,7 +547,6 @@
 	icon_opened = "tcflcrateopen"
 	icon_closed = "tcflcrate"
 	req_access = list(access_legion)
-	layer = OBJ_LAYER - 0.01
 
 /obj/structure/closet/crate/secure/phoron
 	name = "phoron crate"

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

@@ -3,6 +3,34 @@
 	name = "gear crate"
 	req_access = list(access_syndicate)
 
+/obj/structure/closet/crate/gear_loadout/hephaestus
+	desc = "A sturdy crate with Hephaestus Industries branding."
+	name = "hephaestus drop crate"
+	icon_state = "hephcrate"
+	icon_opened = "hephcrateopen"
+	icon_closed = "hephcrate"
+
+/obj/structure/closet/crate/gear_loadout/zenghu
+	desc = "A sturdy crate with Zeng-Hu Pharmaceuticals branding."
+	name = "zeng-hu drop crate"
+	icon_state = "zenghucrate"
+	icon_opened = "zenghucrateopen"
+	icon_closed = "zenghucrate"
+
+/obj/structure/closet/crate/gear_loadout/einstein
+	desc = "A sturdy crate with Einstein Engines branding."
+	name = "einstein drop crate"
+	icon_state = "einsteincrate"
+	icon_opened = "einsteincrateopen"
+	icon_closed = "einsteincrate"
+
+/obj/structure/closet/crate/gear_loadout/necropolis
+	desc = "A sturdy crate with Necropolis Industries branding."
+	name = "necropolis drop crate"
+	icon_state = "necrocrate"
+	icon_opened = "necrocrateopen"
+	icon_closed = "necrocrate"
+
 /obj/structure/closet/crate/secure/gear_loadout/coalition/fill()
 	new /obj/item/rig/gunslinger/equipped(src)
 	new /obj/item/clothing/head/helmet/space/void/coalition(src)
@@ -207,4 +235,28 @@
 	new /obj/item/clothing/accessory/holster/thigh(src)
 	new /obj/item/clothing/head/cowboy(src)
 	new /obj/item/melee/whip(src)
-	new /obj/item/gun/projectile/revolver/detective(src)
+	new /obj/item/gun/projectile/revolver/detective(src)
+//Megacorporate suits are used in devices and tools in the uplink
+/obj/structure/closet/crate/gear_loadout/necropolis/fill()
+	new /obj/item/clothing/head/helmet/space/void/necropolis(src)
+	new /obj/item/clothing/suit/space/void/necropolis(src)
+	new /obj/item/tank/oxygen/red(src)
+	new /obj/item/clothing/shoes/magboots(src)
+
+/obj/structure/closet/crate/gear_loadout/zenghu/fill()
+	new /obj/item/clothing/head/helmet/space/void/zenghu(src)
+	new /obj/item/clothing/suit/space/void/zenghu(src)
+	new /obj/item/tank/oxygen/red(src)
+	new /obj/item/clothing/shoes/magboots(src)
+
+/obj/structure/closet/crate/gear_loadout/hephaestus/fill()
+	new /obj/item/clothing/head/helmet/space/void/hephaestus(src)
+	new /obj/item/clothing/suit/space/void/hephaestus(src)
+	new /obj/item/tank/oxygen/red(src)
+	new /obj/item/clothing/shoes/magboots(src)
+
+/obj/structure/closet/crate/gear_loadout/einstein/fill()
+	new /obj/item/clothing/head/helmet/space/void/einstein(src)
+	new /obj/item/clothing/suit/space/void/einstein(src)
+	new /obj/item/tank/oxygen/red(src)
+	new /obj/item/clothing/shoes/magboots(src)

code/modules/clothing/spacesuits/void/misc.dm

@@ -118,6 +118,140 @@
 	species_restricted = list("Human")
 	refittable = FALSE
 
+//Einstein Engines espionage voidsuit
+/obj/item/clothing/head/helmet/space/void/einstein
+	name = "banshee combat suit helmet"
+	desc = "A sleek, menacing voidsuit helmet with the branding of Taipei Engineering Industrial's private military contractors."
+	icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+	icon_state = "bansheehelm"
+	item_state = "bansheehelm"
+	contained_sprite = 1
+
+	armor = list(melee = 35, bullet = 35, laser = 75,energy = 55, bomb = 25, bio = 100, rad = 10)
+	siemens_coefficient = 0.35
+	species_restricted = list("Human", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
+	light_overlay = "helmet_light_banshee"
+	brightness_on = 6
+	light_color = "#7ffbf7"
+	description_fluff = "An easily recognized Einstein Engines-made PMC voidsuit piece. It is a telltale mark of corporate espionage and more often than not ends up buried with its user."
+	refittable = FALSE
+
+/obj/item/clothing/suit/space/void/einstein
+	name = "banshee combat suit"
+	desc = "A tightly-fitting suit manufactured with shimmering, ablative plating. Looks almost weightless."
+	icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+	icon_state = "banshee"
+	item_state = "banshee"
+	contained_sprite = 1
+
+	slowdown = 1
+	armor = list(melee = 35, bullet = 35, laser = 75,energy = 55, bomb = 25, bio = 100, rad = 10)
+	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
+	siemens_coefficient = 0.35
+	species_restricted = list("Human", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
+	description_fluff = "An easily recognized Einstein Engines-made PMC voidsuit piece. It is a telltale mark of corporate espionage and more often than not ends up buried with its user."
+	refittable = FALSE
+
+//Zeng-Hu Pharmaceuticals espionage voidsuit
+/obj/item/clothing/head/helmet/space/void/zenghu
+	name = "dragon biohazard suit helmet"
+	desc = "A lightweight form-fitting helmet with sparse plating and weird, bug-like goggles."
+	icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+	icon_state = "dragonhelm"
+	item_state = "dragonhelm"
+	contained_sprite = 1
+
+	armor = list(melee = 45, bullet = 15, laser = 35,energy = 25, bomb = 55, bio = 100, rad = 100)
+	siemens_coefficient = 0.35
+	species_restricted = list("Human", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
+	light_overlay = "helmet_light_dragon"
+	brightness_on = 6
+	light_color = "#7ffbf7"
+	description_fluff = "An easily recognized Zeng-Hu Pharmaceuticals biohazard control suit helmet. Its bug-eyed goggle visor design is unique among its class, alongside cutting-edge radiation protection."
+	refittable = FALSE
+
+/obj/item/clothing/suit/space/void/zenghu
+	name = "dragon biohazard control suit"
+	desc = "A remarkably lightweight Zeng-Hu Pharmaceuticals suit sporting excellent ambient radiation protection."
+	icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+	icon_state = "dragon"
+	item_state = "dragon"
+	contained_sprite = 1
+
+	slowdown = 1
+	armor = list(melee = 60, bullet = 15, laser = 35,energy = 25, bomb = 55, bio = 100, rad = 100)
+	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
+	siemens_coefficient = 0.35
+	species_restricted = list("Human", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
+	description_fluff = "An easily recognized Zeng-Hu Pharmaceuticals biohazard control suit. It is relatively fragile but has very apparent radiation shielding. Most often seen in the hands of post-disaster cleanup teams and private military contractors."
+	refittable = FALSE
+
+//Hephaestus Industries espionage voidsuit
+/obj/item/clothing/head/helmet/space/void/hephaestus
+	name = "caiman drop suit helmet"
+	desc = "A massively heavy helmet, part of a larger terraforming suit assembly."
+	icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+	icon_state = "caimanhelm"
+	item_state = "caimanhelm"
+	contained_sprite = 1
+
+	armor = list(melee = 75, bullet = 45, laser = 15,energy = 25, bomb = 75, bio = 100, rad = 15)
+	siemens_coefficient = 0.35
+	species_restricted = list("Human")
+	light_overlay = "helmet_light_caiman"
+	brightness_on = 6
+	light_color = "#ffce01"
+	description_fluff = "An easily recognized Hephaestus terraforming suit helmet. Its low, protruding brow and heavy plating is useful in the event you happen to be cutting down things. Mostly trees. Hopefully trees."
+	refittable = FALSE
+
+/obj/item/clothing/suit/space/void/hephaestus
+	name = "caiman drop suit"
+	desc = "A superheavy Hephaestus designed terraforming suit, iconic for its usage in orbital drops onto hostile jungle worlds."
+	icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+	icon_state = "caiman"
+	item_state = "caiman"
+	contained_sprite = 1
+
+	slowdown = 2
+	armor = list(melee = 75, bullet = 45, laser = 15,energy = 25, bomb = 75, bio = 100, rad = 15)
+	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
+	siemens_coefficient = 0.35
+	species_restricted = list("Human")
+	description_fluff = "An easily recognized Hephaestus terraforming suit. Used often on jungle worlds to handle local wildlife and safely deforest areas in hostile environments. It found recent popularity due to its combat effectiveness that resulted in its proliferation in the hands of Hephaestus private military."
+	refittable = FALSE
+
+//Necropolis Industries espionage voidsuit
+/obj/item/clothing/head/helmet/space/void/necropolis
+	name = "revenant suit helmet"
+	desc = "A scary-looking helmet with blood red optics."
+	icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+	icon_state = "revenanthelm"
+	item_state = "revenanthelm"
+	contained_sprite = 1
+
+	armor = list(melee = 25, bullet = 65, laser = 35,energy = 25, bomb = 15, bio = 100, rad = 15)
+	siemens_coefficient = 0.35
+	species_restricted = list("Human")
+	light_overlay = "helmet_light_revenant"
+	brightness_on = 6
+	light_color = "#f65858"
+	description_fluff = "An ominous helmet of Necropolis make with its past veiled in mystery, used for high-end corporate backstabbing and secret operations."
+
+/obj/item/clothing/suit/space/void/necropolis
+	name = "revenant combat suit"
+	desc = "A robust skirmishing suit with lightweight plating. It is branded with Kumar Arms logos, a subsidiary of Necropolis Industries. It looks very portable."
+	icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+	icon_state = "revenant"
+	item_state = "revenant"
+	contained_sprite = 1
+
+	w_class = 3
+	armor = list(melee = 25, bullet = 65, laser = 35,energy = 25, bomb = 15, bio = 100, rad = 15)
+	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
+	siemens_coefficient = 0.35
+	species_restricted = list("Human")
+	description_fluff = "A portable, sleek combat suit utilized in excess by Necropolis private military contractors. It is known to be utilized by the company's most secretive sectors explicitly for espionage."
+
 //Freelancer voidsuit
 /obj/item/clothing/head/helmet/space/void/freelancer
 	name = "freelancer voidsuit helmet"

html/changelogs/kyres1-#8389.yml

@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Kyres1
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Added a set of rival corp voidsuits to random spawn lists and the traitor/merc/ninja uplink."