Merge remote-tracking branch 'upstream/master' into sound-environment

cmss13-devs · Jul 5, 2024 · 7dde8ba · 7dde8ba
2 parents 0efc206 + a26c0a4
commit 7dde8ba
Show file tree

Hide file tree

Showing 36 changed files with 87 additions and 36 deletions.
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -233,6 +233,8 @@
 #define TRAIT_IN_TUTORIAL "t_IN_TUTORIAL"
 /// If the mob is cloaked in any form
 #define TRAIT_CLOAKED "t_cloaked"
+/// If the mob won't drop items held in face slot when downed
+#define TRAIT_IRON_TEETH "t_iron_teeth"
 
 // -- ability traits --
 /// Xenos with this trait cannot have plasma transfered to them

diff --git a/code/datums/elements/mouth_drop_item.dm b/code/datums/elements/mouth_drop_item.dm
@@ -18,7 +18,7 @@
 /datum/element/mouth_drop_item/proc/item_equipped(obj/item/I, mob/living/carbon/human/user, slot)
 	SIGNAL_HANDLER
 
-	if(slot == WEAR_FACE)
+	if(slot == WEAR_FACE && !HAS_TRAIT(user, TRAIT_IRON_TEETH))
 		I.RegisterSignal(user, COMSIG_LIVING_SET_BODY_POSITION, TYPE_PROC_REF(/obj/item, drop_to_floor))
 
 /datum/element/mouth_drop_item/proc/item_dropped(obj/item/I, mob/living/carbon/human/user)

diff --git 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/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
@@ -145,7 +145,7 @@
 
 /obj/item/storage/belt/medical
 	name = "\improper M276 pattern medical storage rig"
-	desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is a less common configuration, designed to transport medical supplies and pistol ammunition. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them."
+	desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is a less common configuration, designed to transport bulkier medical supplies. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them."
 	icon_state = "medicalbelt"
 	item_state = "medical"
 	storage_slots = 14

diff --git a/code/game/turfs/floors/desert.dm b/code/game/turfs/floors/desert.dm
@@ -114,7 +114,7 @@
 			set_light(2)
 			icon = 'icons/turf/floors/desert_water_toxic.dmi'
 		if(0)
-			set_light(1)
+			set_light(0)
 			icon = 'icons/turf/floors/desert_water.dmi'
 		if(-1)
 			set_light(1)
@@ -199,7 +199,7 @@
 			set_light(2)
 			icon = 'icons/turf/floors/desert_water_toxic.dmi'
 		if(0)
-			set_light(1)
+			set_light(0)
 			icon = 'icons/turf/floors/desert_water.dmi'
 		if(-1)
 			set_light(1)
@@ -224,7 +224,7 @@
 			set_light(2)
 			icon = 'icons/turf/floors/desert_water_toxic.dmi'
 		if(0)
-			set_light(1)
+			set_light(0)
 			icon = 'icons/turf/floors/desert_water.dmi'
 		if(-1)
 			set_light(1)

diff --git a/code/modules/character_traits/biology_traits.dm b/code/modules/character_traits/biology_traits.dm
@@ -130,3 +130,17 @@
 /datum/character_trait/biology/hardcore/unapply_trait(mob/living/carbon/human/target)
 	REMOVE_TRAIT(target, TRAIT_HARDCORE, ROUNDSTART_TRAIT)
 	..()
+
+/datum/character_trait/biology/iron_teeth
+	trait_name = "Iron Teeth"
+	trait_desc = "You've got iron teeth or really good dental insurance. Items in your face slot won't fall out when you go down."
+	applyable = TRUE
+	cost = 1
+
+/datum/character_trait/biology/iron_teeth/apply_trait(mob/living/carbon/human/target, datum/equipment_preset/preset)
+	ADD_TRAIT(target, TRAIT_IRON_TEETH, ROUNDSTART_TRAIT)
+	..()
+
+/datum/character_trait/biology/iron_teeth/unapply_trait(mob/living/carbon/human/target)
+	REMOVE_TRAIT(target, TRAIT_IRON_TEETH, ROUNDSTART_TRAIT)
+	..()
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
@@ -315,7 +315,7 @@ GLOBAL_LIST_INIT(limb_types_by_name, list(
 		message = replace_X.Replace(message, "CKTH")
 	return message
 
-#define PIXELS_PER_STRENGTH_VAL 24
+#define PIXELS_PER_STRENGTH_VAL 28
 
 /proc/shake_camera(mob/M, steps = 1, strength = 1, time_per_step = 1)
 	if(!M?.client || (M.shakecamera > world.time))
@@ -326,10 +326,10 @@ GLOBAL_LIST_INIT(limb_types_by_name, list(
 	var/old_X = M.client.pixel_x
 	var/old_y = M.client.pixel_y
 
-	animate(M.client, pixel_x = old_X + rand(-(strength), strength), pixel_y = old_y + rand(-(strength), strength), easing = JUMP_EASING, time = time_per_step, flags = ANIMATION_PARALLEL)
+	animate(M.client, pixel_x = old_X + rand(-(strength), strength), pixel_y = old_y + rand(-(strength), strength), easing = CUBIC_EASING | EASE_IN, time = time_per_step, flags = ANIMATION_PARALLEL)
 	var/i = 1
 	while(i < steps)
-		animate(pixel_x = old_X + rand(-(strength), strength), pixel_y = old_y + rand(-(strength), strength), easing = JUMP_EASING, time = time_per_step)
+		animate(pixel_x = old_X + rand(-(strength), strength), pixel_y = old_y + rand(-(strength), strength), easing = CUBIC_EASING | EASE_IN, time = time_per_step)
 		i++
 	animate(pixel_x = old_X, pixel_y = old_y,time = clamp(floor(strength/PIXELS_PER_STRENGTH_VAL),2,4))//ease it back
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/html/changelogs/AutoChangeLog-pr-6523.yml b/html/changelogs/AutoChangeLog-pr-6523.yml
@@ -0,0 +1,4 @@
+author: "Drathek"
+delete-after: True
+changes:
+  - spellcheck: "Fix grammar and plurality for vehicles and their hardpoints"
diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml
@@ -11,3 +11,12 @@
       a synthetic headset as opposed to a senior command headset
   zzzmike:
   - spellcheck: more clarity for facehugger/lesser drone text
+2024-07-05:
+  AndroBetel:
+  - rscadd: Adds "Iron teeth" trait.
+  GrrrKitten:
+  - qol: Makes screenshake look less low FPS/jumpy
+  Venuska1117:
+  - bugfix: Make non-toxic water stop glowing.
+  coldironwarrior:
+  - spellcheck: fixed the medical rig belt's description