Does maintenance on mechs, adds in the hypergauss. (MrMelbert#451)

siliconOpossum · May 15, 2024 · c4a2241 · c4a2241
1 parent 6807d34
commit c4a2241
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 15 deletions.
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
@@ -208,6 +208,8 @@
 	/// Module selected by default when mech UI is opened
 	var/ui_selected_module_index
 
+	var/mecha_zoom_view_size = 4.5 //NON-MODULE CHANGE : customizable zoom size
+
 /datum/armor/sealed_mecha
 	melee = 20
 	bullet = 10

diff --git a/code/modules/vehicles/mecha/combat/marauder.dm b/code/modules/vehicles/mecha/combat/marauder.dm
@@ -78,7 +78,7 @@
 	chassis.log_message("Toggled zoom mode.", LOG_MECHA)
 	to_chat(owner, "[icon2html(chassis, owner)]<font color='[chassis.zoom_mode?"blue":"red"]'>Zoom mode [chassis.zoom_mode?"en":"dis"]abled.</font>")
 	if(chassis.zoom_mode)
-		owner.client.view_size.setTo(4.5)
+		owner.client.view_size.setTo(chassis.mecha_zoom_view_size) //NON-MODULE CHANGE : customizable zoom size
 		SEND_SOUND(owner, sound('sound/mecha/imag_enh.ogg', volume=50))
 	else
 		owner.client.view_size.resetToDefault()

diff --git a/maplestation.dme b/maplestation.dme
@@ -6484,6 +6484,7 @@
 #include "maplestation_modules\story_content\albert_equipment\code\albertclothing.dm"
 #include "maplestation_modules\story_content\albert_equipment\code\albertitem.dm"
 #include "maplestation_modules\story_content\armored_corps\code\clothing\aylie_cloak.dm"
+#include "maplestation_modules\story_content\armored_corps\code\mecha_weapons\gauss_override.dm"
 #include "maplestation_modules\story_content\armored_corps\code\mecha_weapons\laser_override.dm"
 #include "maplestation_modules\story_content\armored_corps\code\mecha_weapons\ppc_override.dm"
 #include "maplestation_modules\story_content\armored_corps\code\melee\void_blade.dm"

diff --git a/maplestation_modules/code/modules/projectiles/projectile/bullets/gauss.dm b/maplestation_modules/code/modules/projectiles/projectile/bullets/gauss.dm
@@ -6,3 +6,12 @@
 	wound_bonus = -30
 	speed = 0.3
 	range = 80
+
+/obj/projectile/bullet/gauss/penetrator //upgraded penetration gauss for silly use. it's basically an upgraded penetrator round.
+	name = "hypervelocity ferromagnetic slug"
+	damage = 75
+	wound_bonus = 0
+	range = 100
+	projectile_piercing = PASSMOB|PASSVEHICLE
+	projectile_phasing = ~(PASSMOB|PASSVEHICLE)
+	phasing_ignore_direct_target = TRUE
diff --git a/maplestation_modules/code/modules/projectiles/projectile/energy/laser.dm b/maplestation_modules/code/modules/projectiles/projectile/energy/laser.dm
@@ -6,7 +6,6 @@
 	armour_penetration = 20
 	light_color = COLOR_RED_LIGHT
 	wound_bonus = -20
-	bare_wound_bonus = -10
 	hitscan = TRUE
 	muzzle_type = /obj/effect/projectile/muzzle/laser/er_laser
 	tracer_type = /obj/effect/projectile/tracer/laser/er_laser

diff --git a/maplestation_modules/code/modules/projectiles/projectile/energy/ppc.dm b/maplestation_modules/code/modules/projectiles/projectile/energy/ppc.dm
@@ -4,6 +4,7 @@
 	icon = 'maplestation_modules/icons/obj/weapons/guns/projectile_tracer.dmi'
 	icon_state = "ppc"
 	damage = 60 //60 damage, but no armor penetration means you can easily knock this down.
+	weak_against_armour = TRUE
 	light_color = LIGHT_COLOR_HALOGEN
 	wound_bonus = -40
 	bare_wound_bonus = 5
@@ -30,5 +31,6 @@
 	impact_type = /obj/effect/projectile/impact/laser/ppc/hellstar
 	damage = 95 //ow fuck
 	armour_penetration = 50 // oh
+	weak_against_armour = FALSE
 	wound_bonus = 0
 	bare_wound_bonus = 20
diff --git a/maplestation_modules/code/modules/vehicles/mecha/combat/marauder.dm b/maplestation_modules/code/modules/vehicles/mecha/combat/marauder.dm
@@ -1,11 +1,17 @@
+/obj/vehicle/sealed/mecha/marauder
+	mecha_flags = ID_LOCK_ON | CAN_STRAFE | IS_ENCLOSED | HAS_LIGHTS | MMI_COMPATIBLE //Upstream fix for the marauder not having an ID lock by default despite being intended to. You love to see it.
+
 ///The new variations of the marauder and seraph with the new weapons
-/obj/vehicle/sealed/mecha/combat/marauder/upgraded
+/obj/vehicle/sealed/mecha/marauder/upgraded
 	name = "\improper Marauder II-N"
 	desc = "An upgraded variant of the venerable Marauder, featuring the latest in military technologies. New titan-carbide armor technologies result in harder armor, but the inability to mount armor packages."
-	armor_type =/datum/armor/marauder_two_armor
+	armor_type = /datum/armor/mecha_marauder_two
+	bumpsmash = FALSE //bumpsmash is annoying on mechs that are often piloted by all-access pilots
 	max_equip_by_category = list(
-		MECHA_UTILITY = 3,
-		MECHA_POWER = 2,
+		MECHA_L_ARM = 1,
+		MECHA_R_ARM = 1,
+		MECHA_UTILITY = 5,
+		MECHA_POWER = 1,
 		MECHA_ARMOR = 0, //No armor packages otherwise the increased armor would be insane
 	)
 	equip_by_category = list(
@@ -16,24 +22,46 @@
 		MECHA_ARMOR = list(),
 	)
 
-/datum/armor/marauder_two_armor
+/datum/armor/mecha_marauder_two
 	melee = 60
 	bullet = 80
 	laser = 70
 	energy = 60
 	bomb = 30
-	bio = 0
 	fire = 100
 	acid = 100
 
-/obj/vehicle/sealed/mecha/combat/marauder/seraph/upgraded //Frankly overpowered, but let's be honest it's kind of intended to be.
+/obj/vehicle/sealed/mecha/marauder/upgraded/populate_parts()
+	cell = new /obj/item/stock_parts/cell/bluespace(src)
+	scanmod = new /obj/item/stock_parts/scanning_module/triphasic(src)
+	capacitor = new /obj/item/stock_parts/capacitor/quadratic(src)
+	servo = new /obj/item/stock_parts/servo/femto(src)
+	update_part_values()
+
+/obj/vehicle/sealed/mecha/marauder/upgraded/loaded
+	equip_by_category = list(
+		MECHA_L_ARM = /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulsed_laser/large,
+		MECHA_R_ARM = /obj/item/mecha_parts/mecha_equipment/weapon/energy/er_laser/heavy,
+		MECHA_UTILITY = list(
+			/obj/item/mecha_parts/mecha_equipment/radio,
+			/obj/item/mecha_parts/mecha_equipment/air_tank/full,
+			/obj/item/mecha_parts/mecha_equipment/thrusters/ion,
+		),
+		MECHA_POWER = list(),
+		MECHA_ARMOR = list(),
+	)
+
+/obj/vehicle/sealed/mecha/marauder/seraph/upgraded //Frankly overpowered, but let's be honest it's kind of intended to be.
 	name = "\improper Seraph II-N"
 	desc = "An upgraded variant of the Seraph. If you see this, just run. You'll probably get killed for even just gazing at it. New composite armor technologies result in harder armor, but the inability to mount armor packages."
-	armor_type = /datum/armor/seraph_two_armor
+	armor_type = /datum/armor/mecha_seraph_two
+	bumpsmash = FALSE
 	max_equip_by_category = list(
-		MECHA_UTILITY = 3,
-		MECHA_POWER = 2,
-		MECHA_ARMOR = 0,
+		MECHA_L_ARM = 1,
+		MECHA_R_ARM = 1,
+		MECHA_UTILITY = 5,
+		MECHA_POWER = 1,
+		MECHA_ARMOR = 0, //No armor packages otherwise the increased armor would be insane
 	)
 	equip_by_category = list(
 		MECHA_L_ARM = null,
@@ -43,12 +71,32 @@
 		MECHA_ARMOR = list(),
 	)
 
-/datum/armor/seraph_two_armor
+/datum/armor/mecha_seraph_two
 	melee = 80
 	bullet = 85
 	laser = 80
 	energy = 60
 	bomb = 30
-	bio = 0
 	fire = 100
 	acid = 100
+
+/obj/vehicle/sealed/mecha/marauder/seraph/upgraded/populate_parts()
+	cell = new /obj/item/stock_parts/cell/bluespace(src)
+	scanmod = new /obj/item/stock_parts/scanning_module/triphasic(src)
+	capacitor = new /obj/item/stock_parts/capacitor/quadratic(src)
+	servo = new /obj/item/stock_parts/servo/femto(src)
+	update_part_values()
+
+/obj/vehicle/sealed/mecha/marauder/seraph/upgraded/loaded
+	equip_by_category = list(
+		MECHA_L_ARM = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ppc/hellstar,
+		MECHA_R_ARM = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/ssrm2,
+		MECHA_UTILITY = list(
+			/obj/item/mecha_parts/mecha_equipment/repair_droid,
+			/obj/item/mecha_parts/mecha_equipment/radio,
+			/obj/item/mecha_parts/mecha_equipment/air_tank/full,
+			/obj/item/mecha_parts/mecha_equipment/thrusters/ion,
+		),
+		MECHA_POWER = list(),
+		MECHA_ARMOR = list(),
+	)
diff --git a/maplestation_modules/code/modules/vehicles/mecha/equipment/weapons/gauss.dm b/maplestation_modules/code/modules/vehicles/mecha/equipment/weapons/gauss.dm
@@ -25,3 +25,11 @@
 				shake_camera(affected_pilots, 1.5 SECONDS, 3)
 		chassis.take_damage(75)
 	return ..()
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/gauss/penetrator
+	name = "\improper \"Shadow Cat\" Mech Gauss Rifle (N)"
+	desc = "A weapon for combat exosuits. Uses magnetic propulsion to fire a metallic slug at extremely high velocities. \
+	Upgraded version for internal Nanotrasen usage. Only available in extremely low quantities."
+	equip_cooldown = 50
+	projectile = /obj/projectile/bullet/gauss/penetrator
+	ammo_type = MECHA_AMMO_GAUSS
diff --git a/maplestation_modules/story_content/armored_corps/code/mecha_weapons/gauss_override.dm b/maplestation_modules/story_content/armored_corps/code/mecha_weapons/gauss_override.dm
@@ -0,0 +1,3 @@
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/gauss/penetrator
+	desc = "A weapon for combat exosuits. Uses magnetic propulsion to fire a metallic slug at extremely high velocities. \
+	Upgraded version for internal Nanotrasen usage. Only available in extremely low quantities. Has a faded \"SFI\" marking."