Merge branch 'test-' of https://github.com/JohnFulpWillard/tgstation …

…into test-

.github/workflows/ci_suite.yml

@@ -287,7 +287,7 @@ jobs:
   completion_gate: # Serves as a non-moving target for branch rulesets
     if: always() && !cancelled()
     name: Completion Gate
-    needs: [ test_windows, compare_screenshots, compile_all_maps, run_linters ]
+    needs: [ test_windows, compare_screenshots, compile_all_maps, run_all_tests, run_alternate_tests, run_linters ]
     runs-on: ubuntu-latest
     steps:
       - name: Decide whether the needed jobs succeeded or failed

_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm

@@ -993,9 +993,6 @@
 /area/ruin/comms_agent)
 "UI" = (
 /obj/structure/table/reinforced,
-/obj/machinery/computer/records/security/laptop/syndie{
-	dir = 1
-	},
 /obj/item/paper/monitorkey{
 	pixel_x = -15;
 	pixel_y = 7

_maps/map_files/Birdshot/birdshot.dmm

@@ -9394,10 +9394,9 @@
 /obj/machinery/airalarm/directional/north,
 /obj/structure/table/wood,
 /obj/machinery/chem_dispenser/drinks,
-/obj/effect/turf_decal/siding/wood{
-	dir = 5
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/iron/dark/diagonal,
 /area/station/service/bar)
 "dxZ" = (
@@ -10072,6 +10071,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable,
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/stone,
 /area/station/service/bar)
 "dMm" = (
@@ -33247,11 +33247,10 @@
 	pixel_x = -7;
 	pixel_y = 15
 	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 9
-	},
-/obj/effect/turf_decal/siding/wood,
 /obj/structure/sign/warning/no_smoking/circle/directional/north,
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 8
+	},
 /turf/open/floor/iron/dark/diagonal,
 /area/station/service/bar)
 "lnI" = (
@@ -50833,12 +50832,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/station/service/lawoffice)
-"rrX" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
-	},
-/turf/open/floor/stone,
-/area/station/service/bar)
 "rrZ" = (
 /obj/structure/closet/crate/trashcart,
 /obj/effect/spawner/random/trash/garbage,
@@ -56445,11 +56438,14 @@
 /turf/open/floor/eighties/red,
 /area/station/hallway/primary/central/fore)
 "tjT" = (
-/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/chem_master/condimaster,
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 8
+	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 5
+	dir = 4
 	},
-/turf/open/floor/stone,
+/turf/open/floor/iron/dark/diagonal,
 /area/station/service/bar)
 "tjY" = (
 /obj/machinery/atmospherics/components/binary/pump/on{
@@ -100086,7 +100082,7 @@ iXW
 dRb
 sON
 tjT
-rrX
+xkV
 lAV
 fYJ
 eGU

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -84092,10 +84092,10 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
-/obj/machinery/disposal/delivery_chute{
+/obj/effect/turf_decal/box/red,
+/obj/structure/disposaloutlet{
 	dir = 8
 	},
-/obj/effect/turf_decal/box/red,
 /turf/open/floor/engine/xenobio,
 /area/station/science/xenobiology)
 "uYg" = (

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -46005,6 +46005,13 @@
 	dir = 4
 	},
 /area/station/hallway/secondary/entry)
+"nqI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/commons/fitness)
 "nqP" = (
 /obj/machinery/camera/directional/north{
 	c_tag = "Research Division West";
@@ -53846,8 +53853,8 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
-/obj/item/kirbyplants/random,
 /obj/structure/sign/flag/terragov/directional/north,
+/obj/structure/weightmachine/weightlifter,
 /turf/open/floor/iron,
 /area/station/commons/fitness)
 "pyn" = (
@@ -81087,6 +81094,10 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/security/detectives_office)
+"xyg" = (
+/obj/structure/weightmachine,
+/turf/open/floor/iron,
+/area/station/commons/fitness)
 "xyl" = (
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 1
@@ -249315,7 +249326,7 @@ cGB
 cGB
 gsI
 tLL
-spy
+nqI
 kKL
 kKL
 kKL
@@ -250338,8 +250349,8 @@ dyA
 skl
 gaC
 vfW
-eOl
 vfW
+xyg
 vfW
 lvk
 crv

_maps/map_files/MetaStation/MetaStation.dmm

@@ -67095,10 +67095,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/ai_monitored/command/storage/eva)
-"xBX" = (
-/obj/machinery/firealarm/directional/east,
-/turf/closed/wall,
-/area/station/security/checkpoint/customs)
 "xCf" = (
 /obj/item/clothing/suit/jacket/straight_jacket,
 /obj/item/electropack,
@@ -83046,7 +83042,7 @@ wdr
 fcq
 xfI
 fcq
-xBX
+xjh
 qhW
 xjh
 yme

_maps/map_files/NebulaStation/NebulaStation.dmm

@@ -12770,6 +12770,7 @@
 /turf/open/floor/iron/dark/textured,
 /area/station/engineering/atmos)
 "bUo" = (
+/obj/structure/cable,
 /turf/open/floor/iron/solarpanel/airless,
 /area/station/solars/port/aft)
 "bUs" = (
@@ -92159,7 +92160,8 @@
 /area/station/security/checkpoint/science)
 "nKF" = (
 /obj/item/toy/katana{
-	icon_state = "supermatter_sword"
+	icon_state = "supermatter_sword";
+	icon_angle = -45
 	},
 /obj/structure/ladder,
 /turf/open/floor/plating,

_maps/map_files/generic/CentCom.dmm

@@ -62229,7 +62229,7 @@ xt
 xt
 xt
 xt
-xt
+PG
 xt
 Vd
 zm
@@ -62486,7 +62486,7 @@ xt
 xt
 xt
 xt
-rq
+xt
 xt
 xt
 zl

_maps/shuttles/emergency_lance.dmm

@@ -62,7 +62,7 @@
 /area/shuttle/escape)
 "bV" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{
 	dir = 8
@@ -125,7 +125,7 @@
 /area/shuttle/escape)
 "dW" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
@@ -287,7 +287,7 @@
 /area/shuttle/escape)
 "jo" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{
 	dir = 8
@@ -533,7 +533,7 @@
 /area/shuttle/escape)
 "pu" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
@@ -573,7 +573,7 @@
 /area/shuttle/escape)
 "qe" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -609,7 +609,7 @@
 /area/shuttle/escape)
 "rw" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
@@ -682,7 +682,7 @@
 /area/shuttle/escape)
 "uK" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
@@ -868,7 +868,7 @@
 /area/shuttle/escape)
 "Cx" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
@@ -887,7 +887,7 @@
 /area/shuttle/escape)
 "CR" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
@@ -1199,7 +1199,7 @@
 /area/shuttle/escape)
 "LD" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8

_maps/shuttles/emergency_raven.dmm

@@ -742,7 +742,7 @@
 /area/shuttle/escape)
 "cd" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
@@ -1456,7 +1456,7 @@
 /area/shuttle/escape)
 "eo" = (
 /obj/machinery/door/airlock/external/ruin{
-	name = "Emegency Shuttle External Airlock"
+	name = "Emergency Shuttle External Airlock"
 	},
 /obj/docking_port/mobile/emergency{
 	name = "CentCom Raven Cruiser"

_maps/templates/lazy_templates/nukie_base.dmm

@@ -68,6 +68,17 @@
 /obj/effect/turf_decal/siding/thinplating_new/light{
 	dir = 8
 	},
+/obj/structure/closet/syndicate/personal,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /turf/open/floor/mineral/plastitanium,
 /area/centcom/syndicate_mothership/expansion_chemicalwarfare)
 "bo" = (

code/__DEFINES/ai/ai_blackboard.dm

@@ -195,6 +195,14 @@
 #define BB_DRILLABLE_ICE "BB_drillable_ice"
 
 
+//emotions we displays depending on our happiness
+///emotions we display when happy
+#define BB_HAPPY_EMOTIONS "happy_emotions"
+///emotions we display when neutral
+#define BB_MODERATE_EMOTIONS "moderate_emotions"
+///emotions we display when depressed
+#define BB_SAD_EMOTIONS "sad_emotions"
+
 // Keys used by one and only one behavior
 // Used to hold state without making bigass lists
 /// For /datum/ai_behavior/find_potential_targets, what if any field are we using currently

code/__DEFINES/ai/monsters.dm

@@ -304,3 +304,11 @@
 #define BB_DEER_RESTING "deer_resting"
 ///time till our next rest duration
 #define BB_DEER_NEXT_REST_TIMER "deer_next_rest_timer"
+
+//turtle
+///our tree's ability
+#define BB_TURTLE_TREE_ABILITY "turtle_tree_ability"
+///people we headbutt!
+#define BB_TURTLE_HEADBUTT_VICTIM "turtle_headbutt_victim"
+///flore we must smell
+#define BB_TURTLE_FLORA_TARGET "turtle_flora_target"

code/__DEFINES/combat.dm

@@ -154,6 +154,13 @@ DEFINE_BITFIELD(status_flags, list(
 #define ATTACK_EFFECT_MECHTOXIN "mech_toxin"
 #define ATTACK_EFFECT_BOOP "boop" //Honk
 
+/// Attack animation for sharp items
+#define ATTACK_ANIMATION_SLASH "slash"
+/// Attack animation for pointy items
+#define ATTACK_ANIMATION_PIERCE "pierce"
+/// Animation for blunt attacks
+#define ATTACK_ANIMATION_BLUNT "blunt"
+
 //the define for visible message range in combat
 #define SAMETILE_MESSAGE_RANGE 1
 #define COMBAT_MESSAGE_RANGE 3

code/__DEFINES/construction/rcd.dm

@@ -51,3 +51,6 @@
 #define RCD_MEMORY_COST_BUFF 8
 /// If set to TRUE in rcd_vals, will bypass the cooldown on slowing down frequent use
 #define RCD_RESULT_BYPASS_FREQUENT_USE_COOLDOWN "bypass_frequent_use_cooldown"
+
+/// How much longer does it take to deconstruct rwalls?
+#define RCD_RWALL_DELAY_MULT 2

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

@@ -92,3 +92,6 @@
 /// from /obj/projectile/energy/fisher/on_hit() or /obj/item/gun/energy/recharge/fisher when striking a target
 #define COMSIG_ATOM_SABOTEUR_ACT "hit_by_saboteur"
 	#define COMSIG_SABOTEUR_SUCCESS 1
+
+/// signal sent when a mouse is hovering over us, sent by atom/proc/on_mouse_entered
+#define COMSIG_ATOM_MOUSE_ENTERED "mouse_entered"