Merge remote-tracking branch 'upstream/master' into upstream-merge-8-25

code/game/machinery/computer/dropship_weapons.dm

@@ -695,10 +695,10 @@
 				if(CEILING_GLASS)
 					is_outside = TRUE
 		if(!is_outside && !cavebreaker) //cavebreaker doesn't care
-			to_chat(weapon_operator, SPAN_WARNING("INVALID TARGET: target must be visible from high altitude."))
+			to_chat(weapon_operator, SPAN_WARNING("WARNING: Target obstructed by terrain features."))
 			return FALSE
 		if (protected_by_pylon(TURF_PROTECTION_CAS, TU))
-			to_chat(weapon_operator, SPAN_WARNING("INVALID TARGET: biological-pattern interference with signal."))
+			to_chat(weapon_operator, SPAN_WARNING("WARNING: Signal garbled, launch aborted."))
 			return FALSE
 		if(!DEW.ammo_equipped.can_fire_at(TU, weapon_operator))
 			return FALSE
@@ -808,10 +808,10 @@
 	if (!istype(dropship))
 		return FALSE
 	if (!dropship.in_flyby || dropship.mode != SHUTTLE_CALL)
-		to_chat(user, SPAN_WARNING("Has to be in Fly By mode"))
+		to_chat(user, SPAN_WARNING("You must be making a flyby!"))
 		return FALSE
 	if (dropship.timer && dropship.timeLeft(1) < firemission_envelope.flyoff_period)
-		to_chat(user, SPAN_WARNING("Not enough time to complete the Fire Mission"))
+		to_chat(user, SPAN_WARNING("Not enough time on station to complete the firemission."))
 		return FALSE
 	var/datum/cas_signal/recorded_loc = firemission_envelope.recorded_loc
 	var/obj/source = recorded_loc.signal_loc
@@ -847,7 +847,7 @@
 		return
 	if(firemission_envelope.recorded_loc.obstructed_signal())
 		if(firemission_envelope.user_is_guided(user))
-			to_chat(user, SPAN_WARNING("Signal Obstructed. You have to go in blind."))
+			to_chat(user, SPAN_WARNING("Signal obstructed. You have to go in blind."))
 		return
 	var/sx = 0
 	var/sy = 0
@@ -873,7 +873,7 @@
 	var/area/laser_area = get_area(shootloc)
 	if(!istype(laser_area) || CEILING_IS_PROTECTED(laser_area.ceiling, CEILING_PROTECTION_TIER_1))
 		if(firemission_envelope.user_is_guided(user))
-			to_chat(user, SPAN_WARNING("Vision Obstructed. You have to go in blind."))
+			to_chat(user, SPAN_WARNING("Vision obstructed. You have to go in blind."))
 		firemission_envelope.change_current_loc()
 	else
 		firemission_envelope.change_current_loc(shootloc)

code/game/machinery/vending/vending_types.dm

@@ -282,6 +282,20 @@
 		/obj/item/tape/regulation = 5,
 	)
 
+/obj/structure/machinery/vending/security/upp
+	name = "\improper People's Police Equipment Vendor"
+	desc = "A standard security vendor used by security forces of the UPP."
+	req_access = list(ACCESS_CIVILIAN_BRIG)
+	products = list(
+		/obj/item/handcuffs = 8,
+		/obj/item/reagent_container/spray/pepper = 4,
+		/obj/item/device/flashlight = 4,
+		/obj/item/storage/belt/security/MP/UPP = 4,
+		/obj/item/device/flash = 5,
+		/obj/item/storage/box/evidence = 6,
+		/obj/item/tape/regulation = 5,
+	)
+
 /obj/structure/machinery/vending/sea
 	name = "\improper SeaTech"
 	desc = "An equipment vendor designed to save lives"

code/game/objects/items/devices/motion_detector.dm

@@ -225,6 +225,10 @@
 
 	range_bounds.set_shape(cur_turf.x, cur_turf.y, detector_range * 2)
 
+	var/list/ping_receivers = list()
+	for(var/mob/living/carbon/human/humans in range(1, human_user))
+		ping_receivers += humans
+
 	var/list/ping_candidates = SSquadtree.players_in_range(range_bounds, cur_turf.z, QTREE_EXCLUDE_OBSERVER | QTREE_SCAN_MOBS)
 
 	for(var/A in ping_candidates)
@@ -237,7 +241,8 @@
 		apply_debuff(M)
 		ping_count++
 		if(human_user)
-			show_blip(human_user, M)
+			for(var/mob/living/carbon/human/show_ping_to as anything in ping_receivers)
+				show_blip(show_ping_to, M)
 
 	for(var/mob/hologram/holo as anything in GLOB.hologram_list)
 		if(!holo.motion_sensed)

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

@@ -82,12 +82,6 @@
 
 /obj/structure/closet/secure_closet/platoon_sergeant/Initialize()
 	. = ..()
-	new /obj/item/weapon/gun/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
 	new /obj/item/clothing/head/helmet/marine/leader(src)
 	new /obj/item/device/binoculars/range/designator(src)
 	new /obj/item/device/whistle(src)
@@ -99,12 +93,6 @@
 
 /obj/structure/closet/secure_closet/platoon_sergeant_forecon/Initialize()
 	. = ..()
-	new /obj/item/weapon/gun/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
-	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
 	new /obj/item/device/binoculars/range/designator(src)
 	new /obj/item/device/whistle(src)
 
@@ -115,7 +103,6 @@
 
 /obj/structure/closet/secure_closet/squad_sergeant/Initialize()
 	. = ..()
-	new /obj/item/clothing/head/helmet/marine/rto(src)
 	new /obj/item/device/binoculars/range/designator(src)
 	new /obj/item/device/whistle(src)
 

code/modules/clothing/glasses/night.dm

@@ -89,7 +89,7 @@
 /obj/item/clothing/glasses/night/m56_goggles
 	name = "\improper M56 head mounted sight"
 	gender = NEUTER
-	desc = "A headset and goggles system for the M56 Smartgun. Has a low-res short-range imager, allowing for view of terrain."
+	desc = "A headset and goggles system for the M56 Smartgun weapon system. Has a low-res short-range imager, allowing for view of terrain."
 	icon = 'icons/obj/items/clothing/glasses.dmi'
 	icon_state = "m56_goggles"
 	deactive_state = "m56_goggles_0"

code/modules/clothing/head/head.dm

@@ -391,7 +391,7 @@
 
 /obj/item/clothing/head/cmcap/flap
 	name = "\improper USCM expedition cap"
-	desc = "It's a cap, with flaps. A patch stitched across the front reads \"<b>USS ALMAYER</b>\"."
+	desc = "A casual cap issued as part of the non-combat uniform. While it only protects from the sun, it's much more comfortable than a helmet. This one comes with flaps to keep the sun off your neck."
 	icon = 'icons/obj/items/clothing/cm_hats.dmi'
 	icon_state = "flapcap"
 	flags_marine_hat = HAT_GARB_OVERLAY

code/modules/clothing/head/helmet.dm

@@ -952,8 +952,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	flags_inventory = BLOCKSHARPOBJ
 	flags_inv_hide = HIDEEARS|HIDETOPHAIR
 	flags_marine_helmet = HELMET_GARB_OVERLAY
-	flags_item = MOB_LOCK_ON_EQUIP
-	specialty = "M45 ghillie"
+	specialty = "M10 ghillie"
 
 /obj/item/clothing/head/helmet/marine/CO
 	name = "\improper M10 pattern commanding officer helmet"

code/modules/clothing/suits/marine_armor/smartgunner.dm

@@ -1,6 +1,6 @@
 /obj/item/clothing/suit/storage/marine/smartgunner
 	name = "\improper M56 combat harness"
-	desc = "Lightweight vest composed of ballistic micromesh and a ceramic composite chestplate. Also contains the computers, straps, and bracing required for operating the M56 Smartgun itself."
+	desc = "Lightweight vest composed of ballistic micromesh and a ceramic composite chestplate for practical protection, as well as the computers, straps, and armature required for operating the M56 Smartgun itself."
 	icon_state = "8"
 	item_state = "armor"
 	armor_laser = CLOTHING_ARMOR_LOW