Merge remote-tracking branch 'upstream/master'

_maps/map_files/generic/centcomm.dmm

@@ -5410,7 +5410,6 @@
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/shuttle/assault_pod)
 "sh" = (
-/obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
 	dir = 2;
@@ -5419,6 +5418,7 @@
 	name = "Privacy Shutters";
 	opacity = 0
 	},
+/obj/effect/spawner/window/shuttle,
 /turf/simulated/floor/mineral/titanium/blue,
 /area/shuttle/trade/sol)
 "sj" = (

_maps/map_files/stations/boxstation.dmm

@@ -11923,7 +11923,6 @@
 /area/station/hallway/secondary/entry/north)
 "aMC" = (
 /obj/structure/table,
-/obj/machinery/computer/mob_healer_terminal,
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "aMD" = (
@@ -14876,9 +14875,6 @@
 /area/station/medical/reception)
 "aVy" = (
 /obj/machinery/economy/vending/coffee,
-/obj/machinery/computer/mob_healer_terminal{
-	pixel_x = 28
-	},
 /obj/structure/sign/poster/official/random{
 	pixel_y = 32
 	},
@@ -55778,13 +55774,6 @@
 	icon_state = "darkgreen"
 	},
 /area/station/medical/medbay3)
-"fes" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/machinery/computer/mob_battle_terminal/red,
-/turf/simulated/floor/plasteel,
-/area/station/public/dorms)
 "feN" = (
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry/north)
@@ -65342,12 +65331,6 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/station/supply/lobby)
-"jPN" = (
-/obj/machinery/computer/mob_battle_terminal/blue{
-	pixel_x = -32
-	},
-/turf/simulated/floor/plasteel,
-/area/station/public/dorms)
 "jPZ" = (
 /obj/structure/sign/poster/official/cleanliness{
 	pixel_x = 32
@@ -76992,10 +76975,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/security/permabrig)
-"pwU" = (
-/obj/effect/landmark/battle_mob_point,
-/turf/simulated/floor/engine,
-/area/holodeck/alphadeck)
 "pxv" = (
 /obj/machinery/atmospherics/unary/outlet_injector/on{
 	dir = 8;
@@ -132341,7 +132320,7 @@ nXr
 aKQ
 fRL
 aPm
-jPN
+aPm
 lkw
 fho
 aPm
@@ -132590,7 +132569,7 @@ awE
 ayf
 azn
 arR
-fes
+tbC
 tbC
 tbC
 aPm
@@ -133621,10 +133600,10 @@ atG
 sHt
 sHt
 sHt
-pwU
 sHt
 sHt
-pwU
+sHt
+sHt
 sHt
 sHt
 sHt

_maps/map_files/stations/cerestation.dmm

@@ -82602,12 +82602,6 @@
 	icon_state = "whitegreen"
 	},
 /area/station/medical/virology)
-"tpw" = (
-/obj/effect/landmark/battle_mob_point,
-/turf/simulated/floor/engine{
-	name = "Holodeck Projector Floor"
-	},
-/area/holodeck/alphadeck)
 "tpA" = (
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -116641,10 +116635,10 @@ bEM
 pDn
 pDn
 pDn
-tpw
 pDn
 pDn
-tpw
+pDn
+pDn
 pDn
 pDn
 pDn

_maps/map_files/stations/metastation.dmm

@@ -806,9 +806,6 @@
 /turf/simulated/wall,
 /area/station/public/arcade)
 "ajb" = (
-/obj/machinery/computer/mob_battle_terminal/red{
-	pixel_y = 30
-	},
 /obj/item/kirbyplants/plant20,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgrey"
@@ -3389,9 +3386,6 @@
 	name = "east bump";
 	pixel_x = 27
 	},
-/obj/machinery/computer/mob_battle_terminal/blue{
-	pixel_y = -30
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgrey"
 	},
@@ -53400,9 +53394,6 @@
 /obj/structure/table,
 /obj/item/stack/medical/bruise_pack,
 /obj/item/stack/medical/ointment,
-/obj/machinery/computer/mob_healer_terminal{
-	pixel_y = 30
-	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whiteblue"

code/__DEFINES/dcs/signals.dm

@@ -717,9 +717,12 @@
 
 // /obj/item/gun signals
 
-/// called in /obj/item/gun/process_fire (user, target, params, zone_override)
-#define COMSIG_MOB_FIRED_GUN "mob_fired_gun"
-/// called in /obj/item/gun/process_fire (user, target)
+///called in /obj/item/gun/fire_gun (user, target, flag, params)
+#define COMSIG_GUN_TRY_FIRE "gun_try_fire"
+	#define COMPONENT_CANCEL_GUN_FIRE (1<<0)
+///called in /obj/item/gun/afterattack (user, target, flag, params)
+#define COMSIG_MOB_TRY_FIRE "mob_fired_gun"
+///called in /obj/item/gun/process_fire (user, target)
 #define COMSIG_GUN_FIRED "gun_fired"
 /// called in /datum/component/automatic_fire/proc/on_mouse_down: (client/clicker, atom/target, turf/location, control, params)
 #define COMSIG_AUTOFIRE_ONMOUSEDOWN "autofire_onmousedown"

code/__DEFINES/mob_defines.dm

@@ -298,6 +298,7 @@
 #define HEALTH_HUD_OVERRIDE_HEALTHY 3
 // Eye protection
 #define FLASH_PROTECTION_VERYVUNERABLE -4
+#define FLASH_PROTECTION_EXTRA_SENSITIVE -2
 #define FLASH_PROTECTION_SENSITIVE -1
 #define FLASH_PROTECTION_NONE 0
 #define FLASH_PROTECTION_FLASH 1

code/__DEFINES/subsystems.dm

@@ -91,7 +91,6 @@
 // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
 
 #define FIRE_PRIORITY_PING			10
-#define FIRE_PRIORITY_NANOMOB		10
 #define FIRE_PRIORITY_NIGHTSHIFT	10
 #define FIRE_PRIORITY_IDLE_NPC		10
 #define FIRE_PRIORITY_CLEANUP		10

code/__DEFINES/zoom.dm

@@ -0,0 +1,5 @@
+///How the scope component is toggled.
+/// Wielding the object with both hands toggles the zoom. Requires the two-handed component to work.
+#define ZOOM_METHOD_WIELD 1
+/// Activated by clicking an item action button specified by the `item_action_type` var.
+#define ZOOM_METHOD_ITEM_ACTION 2

code/__HELPERS/iconprocs.dm

@@ -445,9 +445,9 @@ GLOBAL_LIST_EMPTY(bicon_cache)
  * * frame - what frame of the icon_state's animation for the icon being used
  * * moving - whether or not to use a moving state for the given icon
  * * sourceonly - if TRUE, only generate the asset and send back the asset url, instead of tags that display the icon to players
- * * extra_clases - string of extra css classes to use when returning the icon string
+ * * extra_classes - string of extra css classes to use when returning the icon string
  */
-/proc/icon2html(atom/thing, client/target, icon_state, dir = SOUTH, frame = 1, moving = FALSE, sourceonly = FALSE, extra_classes = null)
+/proc/icon2asset(atom/thing, client/target, icon_state, dir = SOUTH, frame = 1, moving = FALSE, sourceonly = FALSE, extra_classes = null)
 	if(!thing)
 		return
 
@@ -516,17 +516,15 @@ GLOBAL_LIST_EMPTY(bicon_cache)
 		SSassets.transport.register_asset(key, rsc_ref, file_hash, icon_path)
 	for(var/client_target in targets)
 		SSassets.transport.send_assets(client_target, key)
-	if(sourceonly)
-		return SSassets.transport.get_asset_url(key)
-	return "<img class='icon icon-[icon_state]' src='[SSassets.transport.get_asset_url(key)]'>"
+	return key
 
-/// Costlier version of icon2html() that uses getFlatIcon() to account for overlays, underlays, etc. Use with extreme moderation, ESPECIALLY on mobs.
-/proc/costly_icon2html(thing, target, sourceonly = FALSE)
+/// Costlier version of icon2asset() that uses getFlatIcon() to account for overlays, underlays, etc. Use with extreme moderation, ESPECIALLY on mobs.
+/proc/costly_icon2asset(thing, target, sourceonly = FALSE)
 	if(!thing)
 		return
 
 	if(isicon(thing))
-		return icon2html(thing, target)
+		return icon2asset(thing, target)
 
 	var/icon/I = getFlatIcon(thing)
-	return icon2html(I, target, sourceonly = sourceonly)
+	return icon2asset(I, target)

code/__HELPERS/trait_helpers.dm

@@ -223,6 +223,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_CAN_VIEW_HEALTH "can_view_health" // Also used for /Stat
 #define TRAIT_MAGPULSE "magnetificent" // Used for anything that is magboot related
 #define TRAIT_NOSLIP "noslip"
+#define TRAIT_SCOPED "user_scoped"
 #define TRAIT_MEPHEDRONE_ADAPTED "mephedrone_adapted" // Trait that changes the ending effects of twitch leaving your system
 #define TRAIT_NOKNOCKDOWNSLOWDOWN "noknockdownslowdown" //If this person has this trait, they are not slowed via knockdown, but they can be hit by bullets like a self knockdown
 #define TRAIT_CAN_STRIP "can_strip" // This mob can strip other mobs.

code/_globalvars/traits.dm

@@ -88,6 +88,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_FORCED_STANDING" = TRAIT_FORCED_STANDING,
 		"TRAIT_NOSLIP" = TRAIT_NOSLIP,
 		"TRAIT_MAGPULSE" = TRAIT_MAGPULSE,
+		"TRAIT_SCOPED" = TRAIT_SCOPED,
 		"TRAIT_MEPHEDRONE_ADAPTED" = TRAIT_MEPHEDRONE_ADAPTED,
 		"TRAIT_NOKNOCKDOWNSLOWDOWN" = TRAIT_NOKNOCKDOWNSLOWDOWN,
 		"TRAIT_CAN_STRIP" = TRAIT_CAN_STRIP