Batch of TG PRs

_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm

@@ -300,7 +300,6 @@
 /area/ruin/pizzeria)
 "kr" = (
 /obj/structure/table,
-/obj/item/trash/waffles,
 /obj/effect/turf_decal/tile/blue/opposingcorners{
 	dir = 1
 	},

_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm

@@ -451,12 +451,8 @@
 /area/ruin/comms_agent)
 "xq" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom{
-	pixel_x = 31;
-	syndie = 1;
-	freerange = 1;
-	name = "syndicate radio intercom";
-	desc = "A custom-made Syndicate-issue intercom used to transmit on all Nanotrasen frequencies. Particularly expensive."
+/obj/item/radio/intercom/syndicate/freerange{
+	pixel_x = 31
 	},
 /obj/structure/table/reinforced,
 /obj/machinery/fax{

_maps/RandomRuins/SpaceRuins/dangerous_research.dmm

@@ -1062,7 +1062,7 @@
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/dangerous_research/lab)
 "oJ" = (
-/obj/structure/closet/crate/medical,
+/obj/structure/closet/crate/secure/interdyne,
 /obj/item/stack/medical/suture/emergency,
 /obj/item/stack/medical/gauze/twelve,
 /obj/item/reagent_containers/hypospray/medipen/blood_loss,
@@ -2155,7 +2155,7 @@
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/dangerous_research/lab)
 "BG" = (
-/obj/structure/closet/crate,
+/obj/structure/closet/crate/secure/interdyne,
 /obj/item/stack/sheet/mineral/plasma/thirty,
 /obj/item/stack/sheet/mineral/wood/fifty,
 /obj/item/stack/sheet/iron/fifty,
@@ -3658,7 +3658,7 @@
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/dangerous_research)
 "VQ" = (
-/obj/structure/closet/crate,
+/obj/structure/closet/crate/secure/interdyne,
 /obj/item/reagent_containers/cup/glass/waterbottle/large,
 /obj/item/reagent_containers/cup/glass/waterbottle/large,
 /obj/item/reagent_containers/cup/glass/waterbottle/large,

_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm

@@ -491,9 +491,6 @@
 /area/ruin/space/has_grav/garbagetruck/foodwaste)
 "xf" = (
 /obj/item/trash/tray,
-/obj/item/trash/waffles,
-/obj/item/trash/waffles,
-/obj/item/trash/waffles,
 /obj/item/food/grown/mushroom/plumphelmet,
 /obj/structure/closet/crate/trashcart,
 /mob/living/basic/mouse/rat,

_maps/RandomZLevels/TheBeach.dmm

@@ -505,6 +505,10 @@
 	},
 /turf/closed/wall/mineral/wood,
 /area/awaymission/beach)
+"gq" = (
+/obj/item/broken_bottle,
+/turf/open/misc/beach/sand,
+/area/awaymission/beach)
 "gw" = (
 /obj/item/stack/sheet/mineral/sandstone{
 	pixel_x = -8
@@ -1191,6 +1195,10 @@
 	},
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
+"pq" = (
+/obj/effect/spawner/random/trash/cigbutt,
+/turf/open/misc/beach/sand,
+/area/awaymission/beach)
 "pr" = (
 /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
 	pixel_x = -17;
@@ -2856,6 +2864,17 @@
 /obj/machinery/light/directional/west,
 /turf/open/floor/wood/large,
 /area/awaymission/beach)
+"Jv" = (
+/obj/item/paper/fluff/old_pirate_note{
+	pixel_x = -5;
+	pixel_y = -7
+	},
+/obj/item/pen/fountain{
+	pixel_y = -11;
+	pixel_x = -8
+	},
+/turf/open/misc/beach/sand,
+/area/awaymission/beach)
 "JF" = (
 /obj/structure/marker_beacon/burgundy,
 /turf/open/water/beach,
@@ -3330,6 +3349,12 @@
 	},
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
+"Pb" = (
+/obj/item/fishing_rod,
+/obj/structure/closet/crate/trashcart,
+/obj/item/reagent_containers/cup/glass/bottle/rum/aged,
+/turf/open/misc/beach/sand,
+/area/awaymission/beach)
 "Pe" = (
 /turf/open/misc/beach/coast{
 	dir = 5
@@ -3378,6 +3403,11 @@
 	},
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
+"PU" = (
+/obj/effect/mob_spawn/corpse/human/old_pirate_captain,
+/obj/structure/bed/maint,
+/turf/open/misc/beach/sand,
+/area/awaymission/beach)
 "Qe" = (
 /obj/effect/turf_decal/sand,
 /obj/machinery/door/airlock/wood{
@@ -7415,8 +7445,8 @@ XB
 XB
 Vf
 YV
-VY
-VY
+Pb
+gq
 hL
 ni
 XB
@@ -7672,8 +7702,8 @@ XB
 XB
 Vf
 VY
-VY
-VY
+pq
+PU
 Er
 BK
 XB
@@ -7929,7 +7959,7 @@ XB
 XB
 Vf
 VY
-VY
+Jv
 VY
 VY
 BK
@@ -8187,7 +8217,7 @@ XB
 Vf
 IZ
 VY
-VY
+pq
 VY
 BK
 XB

_maps/RandomZLevels/snowdin.dmm

@@ -1909,11 +1909,6 @@
 	},
 /turf/open/floor/iron/cafeteria,
 /area/awaymission/snowdin/post/messhall)
-"ht" = (
-/obj/structure/table,
-/obj/item/trash/waffles,
-/turf/open/floor/iron/cafeteria,
-/area/awaymission/snowdin/post/messhall)
 "hu" = (
 /obj/structure/chair{
 	dir = 8
@@ -25007,7 +25002,7 @@ Kd
 ex
 fJ
 gA
-ht
+hq
 hW
 iH
 jz

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -5684,7 +5684,6 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/trash/waffles,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
 "bGm" = (

_maps/map_files/generic/CentCom.dmm

@@ -2412,10 +2412,7 @@
 "lb" = (
 /obj/structure/table/wood,
 /obj/machinery/door/window/left/directional/south,
-/obj/item/radio/intercom{
-	desc = "Talk smack through this.";
-	syndie = 1
-	},
+/obj/item/radio/intercom/syndicate,
 /turf/open/floor/iron/grimy,
 /area/centcom/central_command_areas/courtroom)
 "lc" = (
@@ -2428,10 +2425,7 @@
 /area/centcom/central_command_areas/courtroom)
 "ld" = (
 /obj/structure/table/wood,
-/obj/item/radio/intercom{
-	desc = "Talk smack through this.";
-	syndie = 1
-	},
+/obj/item/radio/intercom/syndicate,
 /obj/machinery/door/window/brigdoor/right/directional/south{
 	name = "CentCom Stand";
 	req_access = list("cent_captain")
@@ -2600,10 +2594,8 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/obj/item/radio/intercom{
-	desc = "Talk smack through this.";
-	pixel_x = -32;
-	syndie = 1
+/obj/item/radio/intercom/syndicate{
+	pixel_x = -32
 	},
 /turf/open/floor/iron/grimy,
 /area/centcom/central_command_areas/courtroom)
@@ -2669,10 +2661,7 @@
 /area/centcom/central_command_areas/courtroom)
 "mn" = (
 /obj/structure/table/wood,
-/obj/item/radio/intercom{
-	desc = "Talk smack through this.";
-	syndie = 1
-	},
+/obj/item/radio/intercom/syndicate,
 /turf/open/floor/iron/grimy,
 /area/centcom/central_command_areas/courtroom)
 "mo" = (
@@ -10246,10 +10235,8 @@
 /obj/machinery/computer/station_alert{
 	dir = 8
 	},
-/obj/item/radio/intercom{
-	desc = "Talk smack through this.";
-	pixel_x = 28;
-	syndie = 1
+/obj/item/radio/intercom/syndicate{
+	pixel_x = 28
 	},
 /turf/open/floor/iron/dark,
 /area/centcom/central_command_areas/control)

_maps/map_files/wawastation/wawastation.dmm

@@ -13766,7 +13766,6 @@
 "eTu" = (
 /obj/effect/turf_decal/tile/neutral,
 /obj/structure/table,
-/obj/item/trash/waffles,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "eTZ" = (

_maps/shuttles/pirate_ex_interdyne.dmm

@@ -291,7 +291,7 @@
 /area/shuttle/pirate)
 "aS" = (
 /obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/obj/structure/closet/crate/freezer/blood,
+/obj/structure/closet/crate/freezer/blood/interdyne,
 /obj/machinery/light/small/blacklight/directional/south,
 /obj/machinery/iv_drip,
 /turf/open/floor/iron/dark,

code/__DEFINES/MC.dm

@@ -133,3 +133,11 @@
 }\
 /datum/controller/subsystem/verb_manager/##X/fire() {..() /*just so it shows up on the profiler*/} \
 /datum/controller/subsystem/verb_manager/##X
+
+#define AI_CONTROLLER_SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/ai_controllers/##X);\
+/datum/controller/subsystem/ai_controllers/##X/New(){\
+	NEW_SS_GLOBAL(SS##X);\
+	PreInit();\
+}\
+/datum/controller/subsystem/ai_controllers/##X/fire() {..() /*just so it shows up on the profiler*/} \
+/datum/controller/subsystem/ai_controllers/##X

code/__DEFINES/access.dm

@@ -326,7 +326,6 @@
 	ACCESS_PHARMACY, \
 	ACCESS_PLUMBING, \
 	ACCESS_PSYCHOLOGY, \
-	ACCESS_QM, \
 	ACCESS_RESEARCH, \
 	ACCESS_ROBOTICS, \
 	ACCESS_SCIENCE, \

code/__DEFINES/achievements.dm

@@ -57,6 +57,7 @@
 #define MEDAL_DEBT_EXTINGUISHED "Debt Extinguished"
 #define MEDAL_SISYPHUS "Sisyphus"
 #define MEDAL_ARCHMAGE "Archmage"
+#define MEDAL_CIGARETTES "Cigarettes"
 #define MEDAL_THEORETICAL_LIMITS "All Within Theoretical Limits"
 
 //Skill medal hub IDs

code/__DEFINES/ai/ai.dm

@@ -68,7 +68,7 @@
 ///macro for whether it's appropriate to resist right now, used by resist subtree
 #define SHOULD_RESIST(source) (source.on_fire || source.buckled || HAS_TRAIT(source, TRAIT_RESTRAINED) || (source.pulledby && source.pulledby.grab_state > GRAB_PASSIVE))
 ///macro for whether the pawn can act, used generally to prevent some horrifying ai disasters
-#define IS_DEAD_OR_INCAP(source) (source.incapacitated() || source.stat)
+#define IS_DEAD_OR_INCAP(source) (source.incapacitated || source.stat)
 
 GLOBAL_LIST_INIT(all_radial_directions, list(
 	"NORTH" = image(icon = 'icons/testing/turf_analysis.dmi', icon_state = "red_arrow", dir = NORTH),

code/__DEFINES/ai/ai_blackboard.dm

@@ -133,6 +133,9 @@
 ///Range for a MOD AI controller.
 #define MOD_AI_RANGE 200
 
+///Only target mobs with these traits
+#define BB_TARGET_ONLY_WITH_TRAITS "BB_target_only_with_traits"
+
 ///should we skip the faction check for the targeting strategy?
 #define BB_ALWAYS_IGNORE_FACTION "BB_always_ignore_factions"
 ///are we in some kind of temporary state of ignoring factions when targeting? can result in volatile results if multiple behaviours touch this

code/__DEFINES/cameranets.dm

@@ -30,6 +30,7 @@
 #define CAMERA_NETWORK_CARGO "cargo"
 #define CAMERANET_NETWORK_ABDUCTOR "abductor"
 #define OPERATIVE_CAMERA_NET "operative"
+#define CAMERANET_NETWORK_CURATOR "curator"
 
 // Ruins/Away missiosn/Misc camera nets
 #define CAMERANET_NETWORK_MOON19_XENO "mo19x"

code/__DEFINES/crushing.dm

@@ -8,7 +8,7 @@
 #define SUCCESSFULLY_FELL_OVER (1<<2)
 
 #define CRUSH_CRIT_SHATTER_LEGS "crush_crit_shatter_legs"
-#define CRUSH_CRIT_PARAPALEGIC "crush_crit_parapalegic"
+#define CRUSH_CRIT_PARAPLEGIC "crush_crit_paraplegic"
 #define CRUSH_CRIT_SQUISH_LIMB "crush_crit_pin"
 #define CRUSH_CRIT_HEADGIB "crush_crit_headgib"
 #define VENDOR_CRUSH_CRIT_PIN "vendor_crush_crit_pin"

code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm

@@ -119,6 +119,9 @@
 /// From base of area/Exited(): (area/left, direction)
 #define COMSIG_MOVABLE_EXITED_AREA "movable_exited_area"
 
+///from base of /atom/movable/point_at: (atom/A, obj/effect/temp_visual/point/point)
+#define COMSIG_MOVABLE_POINTED "movable_pointed"
+
 /// Sent to movables when they are being stolen by a spy: (mob/living/spy, datum/spy_bounty/bounty)
 #define COMSIG_MOVABLE_SPY_STEALING "movable_spy_stealing"
 /// Called when something is pushed by a living mob bumping it: (mob/living/pusher, push force)

code/__DEFINES/dcs/signals/signals_mind.dm

@@ -6,3 +6,6 @@
 
 /// Called on the mind when an antagonist is being removed, after the antagonist list has updated (datum/antagonist/antagonist)
 #define COMSIG_ANTAGONIST_REMOVED "antagonist_removed"
+
+/// Called on the mob when losing an antagonist datum (datum/antagonist/antagonist)
+#define COMSIG_MOB_ANTAGONIST_REMOVED "mob_antagonist_removed"

code/__DEFINES/dcs/signals/signals_mob/signals_mob_ai.dm

@@ -9,3 +9,5 @@
 
 ///Signal sent when a bot is reset
 #define COMSIG_BOT_RESET "bot_reset"
+///Sent off /mob/living/basic/bot/proc/set_mode_flags() : (new_flags)
+#define COMSIG_BOT_MODE_FLAGS_SET "bot_mode_flags_set"

code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm

@@ -133,6 +133,10 @@
 	#define VISIBLE_NAME_FACE 1
 	//Index for the name of the id
 	#define VISIBLE_NAME_ID 2
+	//Index for whether their name is being overriden instead of obsfuscated
+	#define VISIBLE_NAME_FORCED 3
+///from /mob/living/carbon/human/get_id_name; only returns if the mob has TRAIT_UNKNOWN and it's being overriden: (identity)
+#define COMSIG_HUMAN_GET_FORCED_NAME "human_get_forced_name"
 
 // Mob transformation signals
 ///Called when a human turns into a monkey, from /mob/living/carbon/proc/finish_monkeyize()

code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm

@@ -150,8 +150,6 @@
 /// from base of mob/swap_hand(): ()
 /// Performed after the hands are swapped.
 #define COMSIG_MOB_SWAP_HANDS "mob_swap_hands"
-///from base of /mob/verb/pointed: (atom/A)
-#define COMSIG_MOB_POINTED "mob_pointed"
 ///Mob is trying to open the wires of a target [/atom], from /datum/wires/interactable(): (atom/target)
 #define COMSIG_TRY_WIRES_INTERACT "try_wires_interact"
 	#define COMPONENT_CANT_INTERACT_WIRES (1<<0)
@@ -248,3 +246,6 @@
 
 /// from /mob/proc/key_down(): (key, client/client, full_key)
 #define COMSIG_MOB_KEYDOWN "mob_key_down"
+
+/// from /mob/update_incapacitated(): (old_incap, new_incap)
+#define COMSIG_MOB_INCAPACITATE_CHANGED "mob_incapacitated"

code/__DEFINES/dcs/signals/signals_movetype.dm

@@ -1,6 +1,3 @@
-// /datum/element/movetype_handler signals
-/// Called when the floating anim has to be temporarily stopped and restarted later: (timer)
-#define COMSIG_PAUSE_FLOATING_ANIM "pause_floating_anim"
 /// From base of datum/element/movetype_handler/on_movement_type_trait_gain: (flag, old_movement_type)
 #define COMSIG_MOVETYPE_FLAG_ENABLED "movetype_flag_enabled"
 /// From base of datum/element/movetype_handler/on_movement_type_trait_loss: (flag, old_movement_type)