Merge remote-tracking branch 'upstream/master'

.github/workflows/generate_documentation.yml

@@ -27,7 +27,7 @@ jobs:
           touch dmdoc/.nojekyll
           echo codedocs.tgstation13.org > dmdoc/CNAME
       - name: Deploy
-        uses: JamesIves/[email protected].1
+        uses: JamesIves/[email protected].2
         with:
           branch: gh-pages
           clean: true

_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm

@@ -1,99 +1,119 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/obj/machinery/holopad,
-/turf/open/floor/iron/dark/smooth_edge{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
+/turf/open/floor/iron/dark/smooth_large,
 /area/ruin/powered/icemoon_phone_booth)
 "c" = (
-/obj/machinery/door/window/left/directional/north,
-/obj/machinery/door/window/left/directional/south,
-/turf/open/floor/iron/dark/smooth_edge{
-	dir = 4
-	},
-/area/ruin/powered/icemoon_phone_booth)
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/underground/explored)
 "e" = (
+/obj/structure/lattice,
 /turf/open/misc/asteroid/snow/icemoon,
-/area/ruin/powered/icemoon_phone_booth)
+/area/icemoon/underground/explored)
 "k" = (
-/obj/machinery/vending/coffee,
+/obj/machinery/vending/cigarette{
+	all_products_free = 0
+	},
 /obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/floor/plating/icemoon,
-/area/ruin/powered/icemoon_phone_booth)
-"q" = (
-/obj/machinery/airalarm/directional/south,
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
-	dir = 4
+	dir = 8
 	},
-/obj/machinery/atmospherics/components/tank/air/layer4{
+/obj/effect/turf_decal/weather/snow/corner{
 	dir = 8
 	},
-/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/weather/snow,
 /turf/open/floor/plating/icemoon,
 /area/ruin/powered/icemoon_phone_booth)
-"v" = (
+"q" = (
 /obj/structure/lattice,
 /obj/structure/billboard/Phone_booth,
 /turf/open/misc/asteroid/snow/icemoon,
-/area/ruin/powered/icemoon_phone_booth)
-"z" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/area/icemoon/underground/explored)
+"v" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 4
 	},
+/obj/item/gps/spaceruin{
+	gpstag = "Public Holophone"
+	},
+/obj/effect/turf_decal/weather/snow/corner{
+	dir = 5
+	},
+/obj/effect/turf_decal/weather/snow,
+/turf/open/floor/plating/icemoon,
+/area/ruin/powered/icemoon_phone_booth)
+"z" = (
+/obj/machinery/door/window/left/directional/north,
+/obj/machinery/door/window/left/directional/south,
+/obj/effect/turf_decal/weather/snow/corner,
 /turf/open/floor/iron/dark/smooth_edge{
-	dir = 4
+	dir = 1
 	},
 /area/ruin/powered/icemoon_phone_booth)
 "J" = (
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 4
 	},
-/obj/item/gps/spaceruin{
-	gpstag = "Public Holophone"
-	},
-/obj/machinery/light/small{
-	dir = 1
+/obj/machinery/atmospherics/components/tank/air/layer4{
+	dir = 8
 	},
 /obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/weather/snow/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/weather/snow,
 /turf/open/floor/plating/icemoon,
 /area/ruin/powered/icemoon_phone_booth)
 "M" = (
 /turf/closed/wall/ice,
 /area/ruin/powered/icemoon_phone_booth)
 "R" = (
-/obj/effect/spawner/structure/window/hollow/reinforced,
-/turf/open/floor/plating/icemoon,
+/obj/machinery/holopad,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron/dark/smooth_large,
 /area/ruin/powered/icemoon_phone_booth)
 "V" = (
-/obj/structure/lattice,
-/turf/open/misc/asteroid/snow/icemoon,
-/area/ruin/powered/icemoon_phone_booth)
-"W" = (
-/obj/machinery/vending/cigarette{
-	all_products_free = 0
-	},
+/obj/machinery/vending/coffee,
 /obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+	dir = 8
+	},
+/obj/effect/turf_decal/weather/snow/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/weather/snow,
 /turf/open/floor/plating/icemoon,
 /area/ruin/powered/icemoon_phone_booth)
+"W" = (
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
 
 (1,1,1) = {"
-v
+q
 M
+V
 k
-W
 M
+c
 "}
 (2,1,1) = {"
-e
+W
+M
 R
 a
 z
 c
 "}
 (3,1,1) = {"
-V
+e
 M
+v
 J
-q
 M
+c
 "}

_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm

@@ -30,7 +30,6 @@
 /area/ruin/space/djstation)
 "t" = (
 /obj/structure/closet/secure_closet/freezer/fridge/all_access,
-/obj/machinery/light/directional/south,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/iron,

_maps/RandomRuins/SpaceRuins/anomaly_research.dmm

@@ -351,7 +351,7 @@
 "kp" = (
 /obj/effect/spawner/random/environmentally_safe_anomaly/immobile,
 /turf/template_noop,
-/area/space)
+/area/space/nearstation)
 "kt" = (
 /obj/effect/turf_decal/tile/purple/half/contrasted{
 	dir = 1

_maps/RandomRuins/SpaceRuins/bus.dmm

@@ -285,7 +285,7 @@
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "ET" = (
-/mob/living/basic/lizard,
+/mob/living/basic/lizard/space,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "Fo" = (

_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm

@@ -122,7 +122,6 @@
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "lm" = (
 /obj/structure/spider/stickyweb,
-/obj/structure/spider/stickyweb/very_sticky,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "mf" = (
@@ -182,7 +181,6 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "qX" = (
-/obj/structure/spider/stickyweb/very_sticky,
 /obj/item/food/badrecipe/moldy,
 /obj/structure/spider/stickyweb,
 /obj/item/food/spidereggs{

_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm

@@ -147,8 +147,8 @@
 /turf/open/floor/iron/dark/airless,
 /area/ruin/space/prison_shuttle)
 "O" = (
-/mob/living/basic/cockroach,
 /obj/effect/turf_decal/tile/brown/fourcorners,
+/obj/effect/decal/cleanable/xenoblood/xsplatter,
 /turf/open/floor/iron/dark/airless,
 /area/ruin/space/prison_shuttle)
 "P" = (

_maps/shuttles/whiteship_birdshot.dmm

@@ -736,7 +736,6 @@
 /turf/open/floor/iron/grimy,
 /area/shuttle/abandoned/crew)
 "yM" = (
-/obj/machinery/light/cold/directional/south,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/broken/directional/south,
 /obj/machinery/firealarm/directional/east,
@@ -1084,15 +1083,6 @@
 	},
 /turf/open/floor/iron/small,
 /area/shuttle/abandoned/pod)
-"Jk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
 "Jn" = (
 /obj/structure/dresser,
 /obj/effect/decal/cleanable/dirt,
@@ -1712,7 +1702,7 @@ wE
 RX
 gV
 EX
-Jk
+Ui
 kQ
 Jn
 iS

code/__DEFINES/dcs/signals/signals_species.dm

@@ -1,5 +1,5 @@
 // /datum/species signals
-///from datum/species/on_species_gain(): (datum/species/new_species, datum/species/old_species)
+///from datum/species/on_species_gain(): (datum/species/new_species, datum/species/old_species, pref_load, regenerate_icons)
 #define COMSIG_SPECIES_GAIN "species_gain"
 ///from datum/species/on_species_loss(): (datum/species/lost_species)
 #define COMSIG_SPECIES_LOSS "species_loss"

code/__DEFINES/traits/declarations.dm

@@ -1377,6 +1377,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 ///Trait given to mobs that can dig
 #define TRAIT_MOB_CAN_DIG "mob_can_dig"
 
+/// This atom has a tether attached to it
+#define TRAIT_TETHER_ATTACHED "tether_attached"
+
 /**
  *
  * This trait is used in some interactions very high in the interaction chain to allow

code/__HELPERS/logging/attack.dm

@@ -80,5 +80,5 @@
 
 	GLOB.bombers += bomb_message
 	var/area/bomb_area = get_area(bomb)
-	if(message_admins && !(bomb_area.area_flags & QUIET_LOGS)) // Don't spam the logs with deathmatch bombs
+	if(message_admins && !(bomb_area?.area_flags & QUIET_LOGS)) // Don't spam the logs with deathmatch bombs
 		message_admins("[user ? "[ADMIN_LOOKUPFLW(user)] at [ADMIN_VERBOSEJMP(user)] " : ""][details][bomb ? " [bomb.name] at [ADMIN_VERBOSEJMP(bomb)]": ""][additional_details ? " [additional_details]" : ""].")

code/_globalvars/traits/_traits.dm

@@ -34,6 +34,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_STICKERED" = TRAIT_STICKERED,
 		"TRAIT_UNHITTABLE_BY_PROJECTILES" = TRAIT_UNHITTABLE_BY_PROJECTILES,
 		"TRAIT_UNLINKABLE_FISHING_SPOT" = TRAIT_UNLINKABLE_FISHING_SPOT,
+		"TRAIT_TETHER_ATTACHED" = TRAIT_TETHER_ATTACHED,
 	),
 	/atom/movable = list(
 		"TRAIT_ACTIVE_STORAGE" = TRAIT_ACTIVE_STORAGE,

code/controllers/subsystem/processing/fishing.dm

@@ -37,7 +37,7 @@ PROCESSING_SUBSYSTEM_DEF(fishing)
 		unknown_icon.Blend(questionmark, ICON_OVERLAY, x = width, y = height)
 		cached_unknown_fish_icons[fish_type] = icon2base64(unknown_icon)
 
-		var/obj/item/fish/fish = new fish_type(null, FALSE)
+		var/obj/item/fish/fish = new fish_type
 		spawned_fish += fish
 		var/list/properties = list()
 		fish_properties[fish_type] = properties

code/datums/ai/generic/generic_behaviors.dm

@@ -49,14 +49,8 @@
 
 	batman.visible_message(span_warning("[batman] gets a slightly too tight hug from [big_guy]!"), span_userdanger("You feel your body break as [big_guy] embraces you!"))
 
-	if(iscarbon(batman))
-		var/mob/living/carbon/carbon_batman = batman
-		for(var/obj/item/bodypart/bodypart_to_break in carbon_batman.bodyparts)
-			if(bodypart_to_break.body_zone == BODY_ZONE_HEAD)
-				continue
-			bodypart_to_break.receive_damage(brute = 15, wound_bonus = 35)
-	else
-		batman.adjustBruteLoss(150)
+	for(var/zone in GLOB.all_body_zones - BODY_ZONE_HEAD)
+		batman.apply_damage(15, BRUTE, zone, wound_bonus = 35)
 
 	return AI_BEHAVIOR_INSTANT | AI_BEHAVIOR_SUCCEEDED
 

code/datums/ai/monkey/monkey_behaviors.dm

@@ -4,11 +4,18 @@
 /datum/ai_behavior/monkey_equip
 	behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_REQUIRE_REACH
 
-/datum/ai_behavior/monkey_equip/finish_action(datum/ai_controller/controller, success)
+/datum/ai_behavior/monkey_equip/setup(datum/ai_controller/controller, target_key)
+	. = ..()
+	var/obj/target = controller.blackboard[target_key]
+	if(QDELETED(target))
+		return FALSE
+	set_movement_target(controller, target)
+
+/datum/ai_behavior/monkey_equip/finish_action(datum/ai_controller/controller, success, target_key)
 	. = ..()
 
 	if(!success) //Don't try again on this item if we failed
-		controller.set_blackboard_key_assoc(BB_MONKEY_BLACKLISTITEMS, controller.blackboard[BB_MONKEY_PICKUPTARGET], TRUE)
+		controller.set_blackboard_key_assoc(BB_MONKEY_BLACKLISTITEMS, controller.blackboard[target_key], TRUE)
 
 	controller.clear_blackboard_key(BB_MONKEY_PICKUPTARGET)
 
@@ -50,17 +57,16 @@
 	return FALSE
 
 /datum/ai_behavior/monkey_equip/ground
-	required_distance = 0
 
-/datum/ai_behavior/monkey_equip/ground/perform(seconds_per_tick, datum/ai_controller/controller)
+/datum/ai_behavior/monkey_equip/ground/perform(seconds_per_tick, datum/ai_controller/controller, target_key)
 	. = ..()
 	if(equip_item(controller))
 		return . | AI_BEHAVIOR_SUCCEEDED
 	return . | AI_BEHAVIOR_FAILED
 
 /datum/ai_behavior/monkey_equip/pickpocket
 
-/datum/ai_behavior/monkey_equip/pickpocket/perform(seconds_per_tick, datum/ai_controller/controller)
+/datum/ai_behavior/monkey_equip/pickpocket/perform(seconds_per_tick, datum/ai_controller/controller, target_key)
 	. = ..()
 	if(controller.blackboard[BB_MONKEY_PICKPOCKETING]) //We are pickpocketing, don't do ANYTHING!!!!
 		return
@@ -75,8 +81,6 @@
 		finish_action(controller, FALSE)
 		return
 
-
-
 	victim.visible_message(span_warning("[living_pawn] starts trying to take [target] from [victim]!"), span_danger("[living_pawn] tries to take [target]!"))
 
 	controller.set_blackboard_key(BB_MONKEY_PICKPOCKETING, TRUE)
@@ -196,7 +200,7 @@
 
 	if(isnull(potential_weapon))
 		controller.ai_interact(target = target, modifiers = disarm ? list(RIGHT_CLICK = TRUE) : null, combat_mode = TRUE)
-		if(!isnull(holding_weapon))
+		if(disarm && !isnull(holding_weapon) && controller.blackboard[BB_MONKEY_BLACKLISTITEMS][holding_weapon])
 			controller.remove_thing_from_blackboard_key(BB_MONKEY_BLACKLISTITEMS, holding_weapon) //lets try to pickpocket it again!
 		return TRUE
 

code/datums/ai/monkey/monkey_controller.dm

@@ -171,11 +171,10 @@ have ways of interacting with a specific mob and control it.
 		return FALSE
 
 	set_blackboard_key(BB_MONKEY_PICKUPTARGET, weapon)
-	set_movement_target(type, weapon)
 	if(pickpocket)
-		queue_behavior(/datum/ai_behavior/monkey_equip/pickpocket)
+		queue_behavior(/datum/ai_behavior/monkey_equip/pickpocket, BB_MONKEY_PICKUPTARGET)
 	else
-		queue_behavior(/datum/ai_behavior/monkey_equip/ground)
+		queue_behavior(/datum/ai_behavior/monkey_equip/ground, BB_MONKEY_PICKUPTARGET)
 	return TRUE
 
 ///Reactive events to being hit

code/datums/brain_damage/hypnosis.dm

@@ -55,7 +55,10 @@
 	to_chat(owner, span_userdanger("You suddenly snap out of your hypnosis. The phrase '[hypnotic_phrase]' no longer feels important to you."))
 	owner.clear_alert(ALERT_HYPNOSIS)
 	..()
+	if (!isnull(antagonist))
+		antagonist.trauma = null
 	owner.mind.remove_antag_datum(/datum/antagonist/hypnotized)
+	antagonist = null
 
 /datum/brain_trauma/hypnosis/on_life(seconds_per_tick, times_fired)
 	..()