From dd5359776ee8f544d78608f67ce381cd238c14da Mon Sep 17 00:00:00 2001
From: Drulikar <drathek@gmail.com>
Date: Fri, 21 Jun 2024 09:24:30 -0700
Subject: [PATCH] Fix weird hardpoint and vehicle examines

---
 code/game/objects/items.dm                       |  2 +-
 .../vehicles/hardpoints/armor/ballistic.dm       |  2 +-
 .../modules/vehicles/hardpoints/armor/caustic.dm |  2 +-
 .../vehicles/hardpoints/armor/concussive.dm      |  2 +-
 .../modules/vehicles/hardpoints/armor/paladin.dm |  2 +-
 .../vehicles/hardpoints/armor/snowplow.dm        |  2 +-
 code/modules/vehicles/hardpoints/hardpoint.dm    |  6 ++++++
 .../vehicles/hardpoints/holder/tank_turret.dm    |  2 +-
 .../vehicles/hardpoints/primary/autocannon.dm    |  2 +-
 .../vehicles/hardpoints/primary/dual_cannon.dm   |  2 +-
 .../vehicles/hardpoints/primary/flamer.dm        |  2 +-
 code/modules/vehicles/hardpoints/primary/ltb.dm  |  2 +-
 .../vehicles/hardpoints/primary/minigun.dm       |  2 +-
 .../vehicles/hardpoints/secondary/cupola.dm      |  2 +-
 .../vehicles/hardpoints/secondary/flamer.dm      |  2 +-
 .../hardpoints/secondary/frontal_cannon.dm       |  2 +-
 .../hardpoints/secondary/grenade_launcher.dm     |  2 +-
 .../modules/vehicles/hardpoints/secondary/tow.dm |  2 +-
 .../hardpoints/special/firing_port_weapon.dm     |  2 +-
 .../vehicles/hardpoints/support/artillery.dm     |  2 +-
 .../modules/vehicles/hardpoints/support/flare.dm |  2 +-
 code/modules/vehicles/hardpoints/support/iwsa.dm |  2 +-
 .../vehicles/hardpoints/support/overdrive.dm     |  2 +-
 .../vehicles/hardpoints/wheels/apc_wheels.dm     |  2 +-
 .../vehicles/hardpoints/wheels/arc_wheels.dm     |  2 +-
 .../vehicles/hardpoints/wheels/locomotion.dm     | 16 ++++++++++++++++
 .../modules/vehicles/hardpoints/wheels/treads.dm |  4 ++--
 code/modules/vehicles/multitile/multitile.dm     |  4 ++--
 28 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 1a632569eccb..a24f97571d85 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -277,7 +277,7 @@ cases. Override_icon_state should be a list.*/
 			size = "huge"
 		if(SIZE_MASSIVE)
 			size = "massive"
-	. += "This is a [blood_color ? blood_color != COLOR_OIL ? "bloody " : "oil-stained " : ""][icon2html(src, user)][src.name]. It is a [size] item."
+	. += "[p_are() == "are" ? "These are " : "This is a "][blood_color ? blood_color != COLOR_OIL ? "bloody " : "oil-stained " : ""][icon2html(src, user)][src.name]. [p_they(TRUE)] [p_are()] a [size] item."
 	if(desc)
 		. += desc
 	if(desc_lore)
diff --git a/code/modules/vehicles/hardpoints/armor/ballistic.dm b/code/modules/vehicles/hardpoints/armor/ballistic.dm
index 7fa19abf5b37..55f0f6bc4e6b 100644
--- a/code/modules/vehicles/hardpoints/armor/ballistic.dm
+++ b/code/modules/vehicles/hardpoints/armor/ballistic.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/armor/ballistic
-	name = "Ballistic Armor"
+	name = "\improper Ballistic Armor"
 	desc = "Protects the vehicle from high-penetration weapons"
 
 	icon_state = "ballistic_armor"
diff --git a/code/modules/vehicles/hardpoints/armor/caustic.dm b/code/modules/vehicles/hardpoints/armor/caustic.dm
index 34bcf4c3b224..ac97d3da25f9 100644
--- a/code/modules/vehicles/hardpoints/armor/caustic.dm
+++ b/code/modules/vehicles/hardpoints/armor/caustic.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/armor/caustic
-	name = "Caustic Armor"
+	name = "\improper Caustic Armor"
 	desc = "Protects vehicles from most types of acid"
 
 	icon_state = "caustic_armor"
diff --git a/code/modules/vehicles/hardpoints/armor/concussive.dm b/code/modules/vehicles/hardpoints/armor/concussive.dm
index a2e674255f2d..6da39b9c4173 100644
--- a/code/modules/vehicles/hardpoints/armor/concussive.dm
+++ b/code/modules/vehicles/hardpoints/armor/concussive.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/armor/concussive
-	name = "Concussive Armor"
+	name = "\improper Concussive Armor"
 	desc = "Protects the vehicle from high-impact weapons"
 
 	icon_state = "concussive_armor"
diff --git a/code/modules/vehicles/hardpoints/armor/paladin.dm b/code/modules/vehicles/hardpoints/armor/paladin.dm
index 7635ffca74b3..fb131d47151e 100644
--- a/code/modules/vehicles/hardpoints/armor/paladin.dm
+++ b/code/modules/vehicles/hardpoints/armor/paladin.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/armor/paladin
-	name = "Paladin Armor"
+	name = "\improper Paladin Armor"
 	desc = "Protects the vehicle from large incoming explosive projectiles"
 
 	icon_state = "paladin_armor"
diff --git a/code/modules/vehicles/hardpoints/armor/snowplow.dm b/code/modules/vehicles/hardpoints/armor/snowplow.dm
index a1b1a9dc800c..e7823854cff3 100644
--- a/code/modules/vehicles/hardpoints/armor/snowplow.dm
+++ b/code/modules/vehicles/hardpoints/armor/snowplow.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/armor/snowplow
-	name = "Snowplow"
+	name = "\improper Snowplow"
 	desc = "Clears a path in the snow for friendlies"
 
 	icon_state = "snowplow"
diff --git a/code/modules/vehicles/hardpoints/hardpoint.dm b/code/modules/vehicles/hardpoints/hardpoint.dm
index 3aaa81daf19f..f94d0dc6b373 100644
--- a/code/modules/vehicles/hardpoints/hardpoint.dm
+++ b/code/modules/vehicles/hardpoints/hardpoint.dm
@@ -132,6 +132,12 @@
 //------GENERAL PROCS----------
 //-----------------------------
 
+/obj/item/hardpoint/p_s(temp_gender)
+	if(!temp_gender)
+		temp_gender = gender
+	if(temp_gender == PLURAL)
+		. = "s"
+
 /obj/item/hardpoint/Initialize()
 	. = ..()
 	set_bullet_traits()
diff --git a/code/modules/vehicles/hardpoints/holder/tank_turret.dm b/code/modules/vehicles/hardpoints/holder/tank_turret.dm
index 2a01098de523..5be6a03863f2 100644
--- a/code/modules/vehicles/hardpoints/holder/tank_turret.dm
+++ b/code/modules/vehicles/hardpoints/holder/tank_turret.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/holder/tank_turret
-	name = "M34A2-A Multipurpose Turret"
+	name = "\improper M34A2-A Multipurpose Turret"
 	desc = "The centerpiece of the tank. Designed to support quick installation and deinstallation of various tank weapon modules. Has inbuilt smoke screen deployment system."
 
 	icon = 'icons/obj/vehicles/tank.dmi'
diff --git a/code/modules/vehicles/hardpoints/primary/autocannon.dm b/code/modules/vehicles/hardpoints/primary/autocannon.dm
index fa865f40daa1..3e12f52be097 100644
--- a/code/modules/vehicles/hardpoints/primary/autocannon.dm
+++ b/code/modules/vehicles/hardpoints/primary/autocannon.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/primary/autocannon
-	name = "AC3-E Autocannon"
+	name = "\improper AC3-E Autocannon"
 	desc = "A primary autocannon for tanks that shoots explosive flak rounds"
 
 	icon_state = "ace_autocannon"
diff --git a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm
index 7cb4b9a621bb..b896640a4ff7 100644
--- a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm
+++ b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm
@@ -1,6 +1,6 @@
 // APC cannons
 /obj/item/hardpoint/primary/dualcannon
-	name = "PARS-159 Boyars Dualcannon"
+	name = "\improper PARS-159 Boyars Dualcannon"
 	desc = "A primary two-barrel cannon for the APC that shoots 20mm IFF-compatible rounds."
 	icon = 'icons/obj/vehicles/hardpoints/apc.dmi'
 
diff --git a/code/modules/vehicles/hardpoints/primary/flamer.dm b/code/modules/vehicles/hardpoints/primary/flamer.dm
index d0e0596c141d..fce6e7f6a410 100644
--- a/code/modules/vehicles/hardpoints/primary/flamer.dm
+++ b/code/modules/vehicles/hardpoints/primary/flamer.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/primary/flamer
-	name = "DRG-N Offensive Flamer Unit"
+	name = "\improper DRG-N Offensive Flamer Unit"
 	desc = "A primary weapon for the tank that spews fire everywhere."
 
 	icon_state = "drgn_flamer"
diff --git a/code/modules/vehicles/hardpoints/primary/ltb.dm b/code/modules/vehicles/hardpoints/primary/ltb.dm
index 6cb84cf453da..7ccbc18a2853 100644
--- a/code/modules/vehicles/hardpoints/primary/ltb.dm
+++ b/code/modules/vehicles/hardpoints/primary/ltb.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/primary/cannon
-	name = "LTB Cannon"
+	name = "\improper LTB Cannon"
 	desc = "A primary cannon for tanks that shoots explosive rounds"
 
 	icon_state = "ltb_cannon"
diff --git a/code/modules/vehicles/hardpoints/primary/minigun.dm b/code/modules/vehicles/hardpoints/primary/minigun.dm
index 7ae7c20c9870..090bfb107373 100644
--- a/code/modules/vehicles/hardpoints/primary/minigun.dm
+++ b/code/modules/vehicles/hardpoints/primary/minigun.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/primary/minigun
-	name = "LTAA-AP Minigun"
+	name = "\improper LTAA-AP Minigun"
 	desc = "A primary weapon for tanks that spews bullets"
 
 	icon_state = "ltaaap_minigun"
diff --git a/code/modules/vehicles/hardpoints/secondary/cupola.dm b/code/modules/vehicles/hardpoints/secondary/cupola.dm
index c1336eb05739..a4b40c7dd3a1 100644
--- a/code/modules/vehicles/hardpoints/secondary/cupola.dm
+++ b/code/modules/vehicles/hardpoints/secondary/cupola.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/secondary/m56cupola
-	name = "M56 Cupola"
+	name = "\improper M56 Cupola"
 	desc = "A secondary weapon for tanks that shoots bullets"
 
 	icon_state = "m56_cupola"
diff --git a/code/modules/vehicles/hardpoints/secondary/flamer.dm b/code/modules/vehicles/hardpoints/secondary/flamer.dm
index 4bdc9e602974..56a9995b60c5 100644
--- a/code/modules/vehicles/hardpoints/secondary/flamer.dm
+++ b/code/modules/vehicles/hardpoints/secondary/flamer.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/secondary/small_flamer
-	name = "LZR-N Flamer Unit"
+	name = "\improper LZR-N Flamer Unit"
 	desc = "A secondary weapon for tanks that spews hot fire."
 
 	icon_state = "flamer"
diff --git a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm
index d0df1d295ffc..f9e4982bb736 100644
--- a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm
+++ b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/secondary/frontalcannon
-	name = "Bleihagel RE-RE700 Frontal Cannon"
+	name = "\improper Bleihagel RE-RE700 Frontal Cannon"
 	desc = "The marketing department over at Bleihagel would have you believe that the RE-RE700 is an original design. However, experts who pried the cover off the cannon have discovered an object with a striking similarity to the popular M56 Cupola. It is still unknown why the cannon has two barrels."
 	icon = 'icons/obj/vehicles/hardpoints/apc.dmi'
 
diff --git a/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm b/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm
index ecaf36213d34..060f1f7ae9ef 100644
--- a/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm
+++ b/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/secondary/grenade_launcher
-	name = "M92T Grenade Launcher"
+	name = "\improper M92T Grenade Launcher"
 	desc = "A secondary weapon for tanks that shoots grenades."
 
 	icon_state = "glauncher"
diff --git a/code/modules/vehicles/hardpoints/secondary/tow.dm b/code/modules/vehicles/hardpoints/secondary/tow.dm
index 30eadf224bda..7b0e0ea90a27 100644
--- a/code/modules/vehicles/hardpoints/secondary/tow.dm
+++ b/code/modules/vehicles/hardpoints/secondary/tow.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/secondary/towlauncher
-	name = "TOW Launcher"
+	name = "\improper TOW Launcher"
 	desc = "A secondary weapon for tanks that shoots rockets"
 
 	icon_state = "tow_launcher"
diff --git a/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm b/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm
index f051d9a21bb5..5561ee48357d 100644
--- a/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm
+++ b/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm
@@ -1,6 +1,6 @@
 //this is Cupola guns that are fired from the sides of APC by support gunners
 /obj/item/hardpoint/special/firing_port_weapon
-	name = "M56 FPW"
+	name = "\improper M56 FPW"
 	desc = "A modified M56B Smartgun installed on the sides of M577 Armored Personnel Carrier as a Firing Port Weapon. Used by support gunners to cover friendly infantry at APC sides."
 
 	icon = 'icons/obj/vehicles/hardpoints/apc.dmi'
diff --git a/code/modules/vehicles/hardpoints/support/artillery.dm b/code/modules/vehicles/hardpoints/support/artillery.dm
index dfcdcaf73f74..dc3db8a3db0d 100644
--- a/code/modules/vehicles/hardpoints/support/artillery.dm
+++ b/code/modules/vehicles/hardpoints/support/artillery.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/support/artillery_module
-	name = "Artillery Module"
+	name = "\improper Artillery Module"
 	desc = "Allows the user to look far into the distance."
 
 	icon_state = "artillery"
diff --git a/code/modules/vehicles/hardpoints/support/flare.dm b/code/modules/vehicles/hardpoints/support/flare.dm
index da1390b861d4..0fa37de34d2f 100644
--- a/code/modules/vehicles/hardpoints/support/flare.dm
+++ b/code/modules/vehicles/hardpoints/support/flare.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/support/flare_launcher
-	name = "M-87F Flare Launcher"
+	name = "\improper M-87F Flare Launcher"
 	desc = "A support module for APCs that shoots flares."
 	icon = 'icons/obj/vehicles/hardpoints/apc.dmi'
 
diff --git a/code/modules/vehicles/hardpoints/support/iwsa.dm b/code/modules/vehicles/hardpoints/support/iwsa.dm
index c3de90c871b6..97fee4e0551a 100644
--- a/code/modules/vehicles/hardpoints/support/iwsa.dm
+++ b/code/modules/vehicles/hardpoints/support/iwsa.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/support/weapons_sensor
-	name = "Integrated Weapons Sensor Array"
+	name = "\improper Integrated Weapons Sensor Array"
 	desc = "Improves the accuracy and fire rate of all onboard weapons"
 
 	icon_state = "warray"
diff --git a/code/modules/vehicles/hardpoints/support/overdrive.dm b/code/modules/vehicles/hardpoints/support/overdrive.dm
index 1b61d6c63dfb..4daa2fddad0a 100644
--- a/code/modules/vehicles/hardpoints/support/overdrive.dm
+++ b/code/modules/vehicles/hardpoints/support/overdrive.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/support/overdrive_enhancer
-	name = "Overdrive Enhancer"
+	name = "\improper Overdrive Enhancer"
 	desc = "Increases the movement speed of the vehicle it's attached to"
 
 	icon_state = "odrive_enhancer"
diff --git a/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm b/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm
index 62c5e430c747..4bf8ca59e2ca 100644
--- a/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm
+++ b/code/modules/vehicles/hardpoints/wheels/apc_wheels.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/locomotion/apc_wheels
-	name = "APC Wheels"
+	name = "\improper APC Wheels"
 	desc = "Integral to the movement of the APC."
 	icon = 'icons/obj/vehicles/hardpoints/apc.dmi'
 
diff --git a/code/modules/vehicles/hardpoints/wheels/arc_wheels.dm b/code/modules/vehicles/hardpoints/wheels/arc_wheels.dm
index 9bb6c31746e0..17726e75c024 100644
--- a/code/modules/vehicles/hardpoints/wheels/arc_wheels.dm
+++ b/code/modules/vehicles/hardpoints/wheels/arc_wheels.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/locomotion/arc_wheels
-	name = "ARC Wheels"
+	name = "\improper ARC Wheels"
 	desc = "Integral to the movement of the ARC."
 	icon = 'icons/obj/vehicles/hardpoints/arc.dmi'
 
diff --git a/code/modules/vehicles/hardpoints/wheels/locomotion.dm b/code/modules/vehicles/hardpoints/wheels/locomotion.dm
index c05ada322a8d..a0e57c3e97d4 100644
--- a/code/modules/vehicles/hardpoints/wheels/locomotion.dm
+++ b/code/modules/vehicles/hardpoints/wheels/locomotion.dm
@@ -12,6 +12,22 @@
 	var/move_momentum_build_factor = 0
 	var/move_turn_momentum_loss_factor = 0
 
+/obj/item/hardpoint/locomotion/p_are(temp_gender)
+	if(!temp_gender)
+		temp_gender = gender
+	. = "is"
+	if(temp_gender == PLURAL)
+		. = "are"
+
+/obj/item/hardpoint/locomotion/p_they(capitalized, temp_gender)
+	if(!temp_gender)
+		temp_gender = gender
+	. = "it"
+	if(temp_gender == PLURAL)
+		. = "they"
+	if(capitalized)
+		. = capitalize(.)
+
 /obj/item/hardpoint/locomotion/deactivate()
 	owner.move_delay = initial(owner.move_delay)
 	owner.move_max_momentum = initial(owner.move_max_momentum)
diff --git a/code/modules/vehicles/hardpoints/wheels/treads.dm b/code/modules/vehicles/hardpoints/wheels/treads.dm
index dd819ea2af03..561795b8531e 100644
--- a/code/modules/vehicles/hardpoints/wheels/treads.dm
+++ b/code/modules/vehicles/hardpoints/wheels/treads.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/locomotion/treads
-	name = "Treads"
+	name = "\improper Treads"
 	desc = "Integral to the movement of the vehicle."
 
 	icon_state = "treads"
@@ -17,7 +17,7 @@
 	move_turn_momentum_loss_factor = 0.6
 
 /obj/item/hardpoint/locomotion/treads/robust
-	name = "Reinforced Treads"
+	name = "\improper Reinforced Treads"
 	desc = "These treads are made of a tougher material and are more durable. However, the extra weight slows the tank down slightly."
 
 	health = 500
diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm
index ce118fd14c56..bcd48c3633be 100644
--- a/code/modules/vehicles/multitile/multitile.dm
+++ b/code/modules/vehicles/multitile/multitile.dm
@@ -258,7 +258,7 @@
 /obj/vehicle/multitile/get_examine_text(mob/user)
 	. = ..()
 	for(var/obj/item/hardpoint/H in hardpoints)
-		. += "There is \a [H] module installed."
+		. += "There [H.p_are()] \a [H] module[H.p_s()] installed."
 		H.examine(user, TRUE)
 	if(clamped)
 		. += "There is a vehicle clamp attached."
@@ -267,7 +267,7 @@
 		for(var/datum/role_reserved_slots/RRS in interior.role_reserved_slots)
 			passengers_amount += RRS.taken
 		if(passengers_amount > 0)
-			. += "You can sense approximately [passengers_amount] hosts inside."
+			. += "You can sense approximately [passengers_amount] host\s inside."
 
 /obj/vehicle/multitile/proc/load_hardpoints()
 	return