Excelsior armor and starter kit crates (#8503)

* Excelsior Shock trooper armor and starter kits * Further changes * Update deferred.dm fixing conscript * Update ex_teleporter.dm reworked prices a bit, made excel conscript kit cheap enough that its worth buying early on * Update armor.dm added material value for the excel flak vest * A bunch more code changes * Update code/game/machinery/excelsior/ex_teleporter.dm Co-authored-by: Firefox13 <[email protected]> * Update code/datums/autolathe/clothing.dm Co-authored-by: Firefox13 <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: Firefox13 <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: Firefox13 <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: Firefox13 <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: Firefox13 <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: Firefox13 <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: Firefox13 <[email protected]> * Update code/datums/autolathe/clothing.dm Co-authored-by: Firefox13 <[email protected]> * Update code/datums/autolathe/clothing.dm Co-authored-by: Firefox13 <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update deferred.dm * Update code/modules/clothing/head/armor.dm Co-authored-by: Firefox13 <[email protected]> * Update code/modules/clothing/suits/armor.dm Co-authored-by: Firefox13 <[email protected]> * Update code/modules/clothing/suits/armor.dm Co-authored-by: Firefox13 <[email protected]> * Update ex_teleporter.dm spetznatz crate * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: Firefox13 <[email protected]> * Update code/modules/clothing/head/armor.dm Co-authored-by: Firefox13 <[email protected]> * Update armor.dm plasteel fix * Update armor.dm removes hud that does nothing * Update code/modules/clothing/suits/armor.dm Co-authored-by: Firefox13 <[email protected]> * Update armor.dm made shock_ex to shock_excelsior * fixes icon names * Revert "Merge branch 'discordia-space:master' into excelsior_armor_and_crates" This reverts commit 3fe901b, reversing changes made to 78eddac. * Revert "Auxiliary commit to revert individual files from 3a0d6a8" This reverts commit 5d6f11a534dcad9b1f2719628086f4afbe157fa4. * committing this * Fixing the names * Revert "Merge remote-tracking branch 'origin/excelsior_armor_and_crates' into excelsior_armor_and_crates" This reverts commit 055b791, reversing changes made to 03b7350. * Revert "Merge remote-tracking branch 'origin/excelsior_armor_and_crates' into excelsior_armor_and_crates" This reverts commit 70c5fb0, reversing changes made to 055b791. * Finally fixed icons * This should be the last of it. * Update armor.dm new description * A bit of a rebalance for the NT pouch disk. Basically moving the pouches that nobody uses to the biofabrics disk, keeping the useful pouches in the new caravana pouch disk, renaming the power cell disk to solaris power cells. * fixed * New armor modules * Update stungloves.dm fixed * Update NeoTheology.dm fixed the broken NT disks * undo neotheo changes.dm returned neotheo to normal * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/modules/clothing/gloves/miscellaneous.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/modules/clothing/head/armor.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/modules/clothing/under/excelsior.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/modules/clothing/suits/armor.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/game/objects/items/weapons/design_disks/excelsior.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/game/machinery/excelsior/ex_teleporter.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/datums/autolathe/clothing.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/game/objects/items/weapons/storage/deferred.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/modules/clothing/head/armor.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/modules/clothing/head/armor.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/modules/clothing/head/armor.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/modules/clothing/shoes/jobs.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/modules/clothing/shoes/jobs.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/modules/clothing/shoes/jobs.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update code/modules/clothing/suits/armor.dm Co-authored-by: SirRichardFrancis <[email protected]> * Update deferred.dm fixed issues with incorrect pathing --------- Co-authored-by: Firefox13 <[email protected]> Co-authored-by: SirRichardFrancis <[email protected]>
discordia-space · Sep 14, 2024 · 983a6bf · 983a6bf
1 parent 4014e69
commit 983a6bf
Show file tree

Hide file tree

Showing 19 changed files with 268 additions and 4 deletions.
diff --git a/code/datums/autolathe/clothing.dm b/code/datums/autolathe/clothing.dm
@@ -3,6 +3,21 @@
 	name = "excelsior armor"
 	build_path = /obj/item/clothing/suit/space/void/excelsior
 
+/datum/design/autolathe/clothing/excel_armor
+	name = "Excelsior gzhel-m vest"
+	build_path = /obj/item/clothing/suit/armor/gzhel
+
+/datum/design/autolathe/clothing/excel_boots
+	name = "Excelsior boots"
+	build_path = /obj/item/clothing/shoes/workboots/proletariat
+
+/datum/design/autolathe/clothing/excel_helmet
+	name = "Excelsior sfera-9 helmet"
+	build_path = /obj/item/clothing/head/armor/excel_sfera
+
+/datum/design/autolathe/clothing/excel_beret
+	name = "Excelsior beret"
+	build_path = /obj/item/clothing/head/armor/excel_beret
 // Standard
 
 /datum/design/autolathe/clothing/generic_helmet_basic
@@ -33,6 +48,7 @@
 	name = "webbed armor vest"
 	build_path = /obj/item/clothing/suit/storage/vest
 
+
 /datum/design/autolathe/clothing/riot_helmet
 	name = "riot helmet"
 	build_path = /obj/item/clothing/head/armor/faceshield/riot

diff --git a/code/game/machinery/excelsior/ex_teleporter.dm b/code/game/machinery/excelsior/ex_teleporter.dm
@@ -66,9 +66,13 @@ var/global/excelsior_last_draft = 0
 		/obj/item/electronics/circuitboard/excelsior_autodoc = 150,
 		/// its expensive so they need to do a few mandates before they manage to get it
 		/obj/item/electronics/circuitboard/excelsior_navigation_cracker = 3000,
-		/obj/item/electronics/circuitboard/diesel = 150
+		/obj/item/electronics/circuitboard/diesel = 150,
+		/obj/item/storage/deferred/crate/excel_conscript = 75,
+		/obj/item/storage/deferred/crate/excel_shock_kit = 250,
+		/obj/item/storage/deferred/crate/excel_eva = 300,
+		/obj/item/storage/deferred/crate/excel_spetsnaz = 350,
+		/obj/item/storage/deferred/crate/excel_heavy = 450,
 		)
-
 	var/list/IKEA_list = list(
 		/obj/item/machinery_crate/excelsior/shield = 500,
 		/obj/item/machinery_crate/excelsior/autolathe = 300,

diff --git a/code/game/objects/items/weapons/design_disks/NeoTheology.dm b/code/game/objects/items/weapons/design_disks/NeoTheology.dm
@@ -17,11 +17,11 @@
 		/datum/design/bioprinter/small_generic,
 		/datum/design/bioprinter/medium_generic,
 		/datum/design/bioprinter/large_generic,
-		/datum/design/bioprinter/medical_supply,
+		/datum/design/bioprinter/ammo,
 		/datum/design/bioprinter/engineering_tools,
 		/datum/design/bioprinter/engineering_supply,
 		/datum/design/bioprinter/engineering_material,
-		/datum/design/bioprinter/ammo,
+		/datum/design/bioprinter/medical_supply,
 		/datum/design/bioprinter/tubular,
 		/datum/design/bioprinter/tubular/vial,
 		/datum/design/bioprinter/part

diff --git a/code/game/objects/items/weapons/design_disks/excelsior.dm b/code/game/objects/items/weapons/design_disks/excelsior.dm
@@ -83,7 +83,11 @@
 		/datum/design/autolathe/ammo/shotgun_beanbag,
 		/datum/design/autolathe/ammo/shotgun_pellet,
 		/datum/design/autolathe/sec/silencer,						//misc
+		/datum/design/autolathe/clothing/excel_armor,
+		/datum/design/autolathe/clothing/excel_boots,
+		/datum/design/autolathe/clothing/excel_helmet,
 		/datum/design/autolathe/clothing/excelsior_armor,
+		/datum/design/autolathe/clothing/excel_beret,
 		/datum/design/autolathe/device/excelbaton,					//security
 		/datum/design/autolathe/device/excelsiormine,
 		/datum/design/autolathe/sec/beartrap,

diff --git a/code/game/objects/items/weapons/storage/deferred.dm b/code/game/objects/items/weapons/storage/deferred.dm
@@ -344,6 +344,88 @@
 	/obj/item/clothing/suit/storage/greatcoat/german_overcoat = 1,
 	/obj/item/clothing/under/germansuit = 1)
 
+
+/obj/item/storage/deferred/crate/excel_conscript
+	name = "Excelsior conscript crate"
+	desc = "A supply kit for an aspiring conscript."
+	icon_state = "Excel_crate"
+	initial_contents = list(
+	/obj/item/clothing/gloves/thick = 1,
+	/obj/item/clothing/under/excelsior = 1,
+	/obj/item/clothing/head/armor/excel_sfera = 1,
+	/obj/item/clothing/mask/gas = 1,
+	/obj/item/clothing/suit/armor/gzhel = 1,
+	/obj/item/gun/projectile/boltgun = 1,
+	/obj/item/ammo_magazine/ammobox/lrifle_small = 1,
+	/obj/item/ammo_magazine/sllrifle = 7,
+	/obj/item/clothing/shoes/workboots/proletariat = 1
+	)
+
+/obj/item/storage/deferred/crate/excel_shock_kit
+	name = "Excelsior shock trooper kit"
+	desc = "Everything needed for an aspiring shock trooper."
+	icon_state = "Excel_crate"
+	initial_contents = list(
+	/obj/item/clothing/gloves/thick = 1,
+	/obj/item/clothing/under/excelsior = 1,
+	/obj/item/clothing/head/armor/excel_sfera = 1,
+	/obj/item/ammo_magazine/msmg = 4,
+	/obj/item/ammo_magazine/ammobox/magnum = 1,
+	/obj/item/clothing/mask/gas = 1,
+	/obj/item/gun/projectile/automatic/drozd = 1,
+	/obj/item/clothing/suit/armor/gzhel = 1,
+	/obj/item/clothing/shoes/workboots/proletariat = 1
+	)
+
+
+/obj/item/storage/deferred/crate/excel_eva
+	name = "Excelsior EVA trooper kit"
+	desc = "The start of a revolutionary career in Haven's space corps."
+	icon_state = "Excel_crate"
+	initial_contents = list(
+	/obj/item/gun/projectile/automatic/modular/ak/excelsior = 1,
+	/obj/item/clothing/under/excelsior = 1,
+	/obj/item/clothing/gloves/thick = 1,
+	/obj/item/ammo_magazine/lrifle = 4,
+	/obj/item/clothing/mask/gas = 1,
+	/obj/item/ammo_magazine/ammobox/lrifle_small = 1,
+	/obj/item/clothing/suit/space/void/excelsior = 1,
+	/obj/item/tank/emergency_oxygen/double = 1,
+	/obj/item/clothing/shoes/workboots/proletariat = 1
+	)
+
+/obj/item/storage/deferred/crate/excel_spetsnaz
+	name = "Excelsior special operative kit"
+	desc = "A kit for comrades quietly engaging at a distance."
+	icon_state = "Excel_crate"
+	initial_contents = list(
+	/obj/item/clothing/gloves/thick = 1,
+	/obj/item/clothing/under/excelsior = 1,
+	/obj/item/gun/projectile/automatic/vintorez = 1,
+	/obj/item/ammo_magazine/srifle = 5,
+	/obj/item/clothing/suit/armor/gzhel = 1,
+	/obj/item/clothing/mask/gas = 1,
+	/obj/item/ammo_magazine/ammobox/srifle_small = 1,
+	/obj/item/clothing/head/armor/excel_sfera = 1,
+	/obj/item/clothing/shoes/workboots/proletariat = 1
+	)
+
+/obj/item/storage/deferred/crate/excel_heavy
+	name = "Excelsior heavy trooper kit"
+	desc = "Equipment of Excelsior's heavy infantry."
+	icon_state = "Excel_crate"
+	initial_contents = list(
+	/obj/item/clothing/gloves/korund = 1,
+	/obj/item/clothing/under/excelsior = 1,
+	/obj/item/clothing/mask/gas = 1,
+	/obj/item/ammo_magazine/maxim = 4,
+	/obj/item/gun/projectile/automatic/maxim =1,
+	/obj/item/tank/emergency_oxygen/double = 1,
+	/obj/item/clothing/suit/armor/korund = 1,
+	/obj/item/clothing/head/armor/korund_helm = 1,
+	/obj/item/clothing/shoes/korund = 1
+	)
+
 /obj/item/storage/deferred/crate/clown_crime
 	name = "mastermind suit bag"
 	desc = "A duffelbag filled with clothing and... a second duffelbag?"

diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
@@ -173,6 +173,20 @@
 		rad = 0
 	)
 
+/obj/item/clothing/gloves/korund
+	name = "KULAK power gauntlet"
+	desc = "A pair of heavy gloves with left one dedicated to offensive use of electric shock. Requires external power supply from korund-sh-p carapace, and is just flexible enough to pull Maxim's trigger."
+	icon_state = "kilak_glove"
+	item_state = "kilak_glove"
+	armor = list(
+		melee = 4,
+		bullet = 4,
+		energy = 5,
+		bomb = 15, //basically an EOD suit
+		bio = 0,
+		rad = 0
+	)
+
 /obj/item/clothing/gloves/knuckles
 	name = "knuckle gloves"
 	desc = "Gloves with additional reinforcment on the knuckles."

diff --git a/code/modules/clothing/head/armor.dm b/code/modules/clothing/head/armor.dm
@@ -581,6 +581,70 @@
 	name = "gray tanker helmet"
 	icon_state = "tanker_helmet_gray"
 
+/obj/item/clothing/head/armor/excel_beret
+	name = "Excelsior beret"
+	desc = "An armored white and orange beret, issued out to Haven's many conscripts"
+	icon_state = "excel_beret"
+	item_state = "excel_beret"
+	armor = list(
+		melee = 5,
+		bullet = 4,
+		energy = 5,
+		bomb = 5,
+		bio = 0,
+		rad = 0
+	)
+	matter = list(
+		MATERIAL_BIOMATTER = 2,
+		MATERIAL_PLASTIC = 1,
+		MATERIAL_STEEL = 1
+	)
+/obj/item/clothing/head/armor/excel_sfera
+	name = "Excelsior sfera-9 helmet"
+	desc = "The most common Excelsior combat helmet, offers decent enough protection for relative ease of production."
+	icon_state = "spherer_helm"
+	item_state = "spherer_helm"
+	armor = list(
+		melee = 8,
+		bullet = 12,
+		energy = 10,
+		bomb = 25,
+		bio = 0,
+		rad = 0
+	)
+	matter = list(
+	MATERIAL_PLASTIC = 2,
+	MATERIAL_GLASS = 2,
+	MATERIAL_STEEL = 3,
+	MATERIAL_PLASTEEL = 2
+	)
+	siemens_coefficient = 1
+	species_restricted = list(SPECIES_HUMAN)
+	price_tag = 150
+
+/obj/item/clothing/head/armor/korund_helm
+	name = "Excelsior sfera-45 helmet"
+	desc = "The most durable and heavy Excelsior helmet to date, for Haven's hardest battles."
+	icon_state = "korund_helm"
+	item_state = "korund_helm"
+	armor = list(
+		melee = 16,
+		bullet = 14,
+		energy = 16,
+		bomb = 95,
+		bio = 0,
+		rad = 0
+	)
+	matter = list(
+	MATERIAL_PLASTIC = 40,
+	MATERIAL_GLASS = 10,
+	MATERIAL_STEEL = 25,
+	MATERIAL_PLASTEEL = 10
+	)
+	siemens_coefficient = 1
+	species_restricted = list(SPECIES_HUMAN)
+	price_tag = 150
+
 /obj/item/clothing/head/armor/faceshield/paramedic
 	name = "Moebius paramedic helmet"
 	desc = "Seven minutes or a refund."

diff --git a/code/modules/clothing/shoes/jobs.dm b/code/modules/clothing/shoes/jobs.dm
@@ -88,6 +88,40 @@
 	can_hold_knife = TRUE
 	style = STYLE_NEG_HIGH
 
+/obj/item/clothing/shoes/workboots/proletariat
+	name = "Excelsior boots"
+	desc = "Robust, yet surprisingly posh boots; one and only design worn by comrades everywhere from Haven to null sector."
+	icon_state = "prolo_boots"
+	item_state = "prolo_boots"
+	siemens_coefficient = 0
+	armor = list(
+		melee = 3,
+		bullet = 2,
+		energy = 2,
+		bomb = 0,
+		bio = 0,
+		rad = 0
+	)
+	can_hold_knife = TRUE
+	style = STYLE_HIGH
+
+/obj/item/clothing/shoes/korund
+	name = "Excelsior assault boots"
+	desc = "Heavily reinforced ankle boots for combat scenarios."
+	icon_state = "korund_boots"
+	item_state = "korund_boots"
+	siemens_coefficient = 0
+	armor = list(
+		melee = 5,
+		bullet = 7,
+		energy = 5,
+		bomb = 35,
+		bio = 0,
+		rad = 0
+	)
+	can_hold_knife = TRUE
+	style = STYLE_NEG_HIGH
+
 /obj/item/clothing/shoes/artist_shoes
 	name = "Pointy Shoes"
 	desc = "They're actually quite comfortable."

diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
@@ -210,6 +210,25 @@
 	name = "green flakvest vest"
 	icon_state = "flakvest_green"
 
+/obj/item/clothing/suit/armor/gzhel
+	name = "Excelsior gzhel-m vest"
+	desc = "Standard-issue Excelsior bullet-resistant vest with great balance of cost, weight, and protection."
+	icon_state = "ghezel_m"
+	item_state = "ghezel_m"
+	armor = list(
+		melee = 8,
+		bullet = 13,
+		energy = 8,
+		bomb = 30,
+		bio = 0,
+		rad = 0
+	)
+	matter = list(
+		MATERIAL_STEEL = 8,
+		MATERIAL_PLASTEEL = 1,
+		MATERIAL_PLASTIC = 3
+	)
+
 /obj/item/clothing/suit/armor/flak/full
 	name = "full flakvest vest"
 	desc = "An armored vest built for protection against high-velocity solid projectiles. This set has had kneepads and shoulderpads attached for more protection."
@@ -218,6 +237,7 @@
 	slowdown = LIGHT_SLOWDOWN
 	style_coverage = COVERS_TORSO|COVERS_UPPER_ARMS|COVERS_UPPER_LEGS
 
+
 /obj/item/clothing/suit/armor/flak/full/green
 	name = "full green flakvest vest"
 	icon_state = "flakvest_green_fullbody"
@@ -244,6 +264,32 @@
 	)
 	slowdown = LIGHT_SLOWDOWN
 
+/obj/item/clothing/suit/armor/korund
+	name = "Excelsior korund-sh-p carapace"
+	desc = "Super heavy, powered suit of communard armor. Can house a Zarya power cell to supply KULAK power gauntlet."
+	icon_state = "korund_armor"
+	item_state = "korund_armor"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+	slowdown = MEDIUM_SLOWDOWN
+	item_flags = THICKMATERIAL|DRAG_AND_DROP_UNEQUIP|COVER_PREVENT_MANIPULATION|EQUIP_SOUNDS
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	style_coverage = COVERS_TORSO|COVERS_UPPER_ARMS|COVERS_UPPER_LEGS
+	armor = list(
+		melee = 16,
+		bullet = 15,
+		energy = 16,
+		bomb = 100, //basically an EOD suit
+		bio = 0,
+		rad = 0
+	)
+	matter = list(
+		MATERIAL_STEEL = 35,
+		MATERIAL_PLASTIC = 45,
+		MATERIAL_PLASTEEL = 25,
+	)
+
 /obj/item/clothing/suit/armor/bulletproof/full
 	name = "full bulletproof vest"
 	desc = "A vest built for protection against bullets and other high-velocity projectiles. This one has shoulderpads and kneepads for extra coverage."

diff --git a/icons/inventory/feet/icon.dmi b/icons/inventory/feet/icon.dmi
diff --git a/icons/inventory/feet/mob.dmi b/icons/inventory/feet/mob.dmi
diff --git a/icons/inventory/hands/icon.dmi b/icons/inventory/hands/icon.dmi
diff --git a/icons/inventory/hands/mob.dmi b/icons/inventory/hands/mob.dmi
diff --git a/icons/inventory/head/icon.dmi b/icons/inventory/head/icon.dmi
diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi
diff --git a/icons/inventory/suit/icon.dmi b/icons/inventory/suit/icon.dmi
diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi
diff --git a/icons/inventory/suit/mob_fem.dmi b/icons/inventory/suit/mob_fem.dmi
diff --git a/icons/obj/storage/deferred.dmi b/icons/obj/storage/deferred.dmi