Merge remote-tracking branch 'origin/master' into HEAD

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -38677,7 +38677,6 @@
 /obj/machinery/power/terminal{
 	dir = 4
 	},
-/obj/structure/cable,
 /obj/structure/sign/warning/electric_shock/directional/north,
 /turf/open/floor/plating,
 /area/station/maintenance/department/electrical)
@@ -77768,7 +77767,6 @@
 /obj/machinery/power/terminal{
 	dir = 4
 	},
-/obj/structure/cable,
 /obj/structure/sign/warning/electric_shock/directional/south,
 /turf/open/floor/plating,
 /area/station/maintenance/department/electrical)

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -11148,9 +11148,8 @@
 /turf/open/floor/iron/white/smooth_large,
 /area/station/medical/pharmacy)
 "dmL" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/light_switch/directional/south,
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/maintenance/department/electrical)
 "dmR" = (
@@ -17280,7 +17279,6 @@
 /obj/machinery/power/terminal{
 	dir = 8
 	},
-/obj/structure/cable,
 /obj/structure/sign/poster/contraband/missing_gloves/directional/east,
 /turf/open/floor/plating,
 /area/station/maintenance/department/electrical)
@@ -23584,7 +23582,6 @@
 	},
 /area/station/security/office)
 "hkd" = (
-/obj/structure/cable,
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/plating,
 /area/station/maintenance/department/electrical)
@@ -36279,7 +36276,6 @@
 	pixel_x = -8;
 	pixel_y = 4
 	},
-/obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/electrical)
 "ldn" = (
@@ -58487,8 +58483,8 @@
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "rPu" = (
-/obj/machinery/power/smes,
 /obj/structure/cable,
+/obj/machinery/power/smes/engineering,
 /turf/open/floor/plating,
 /area/station/maintenance/department/electrical)
 "rPL" = (
@@ -63516,7 +63512,6 @@
 /turf/open/floor/iron/dark,
 /area/station/commons/storage/mining)
 "tsR" = (
-/obj/structure/cable,
 /obj/structure/chair/stool/directional/south,
 /obj/effect/decal/cleanable/oil/slippery,
 /turf/open/floor/plating,
@@ -68401,7 +68396,6 @@
 /obj/machinery/power/terminal{
 	dir = 4
 	},
-/obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/electrical)
 "uXy" = (

_maps/map_files/NorthStar/north_star.dmm

@@ -19508,12 +19508,12 @@
 /turf/open/openspace,
 /area/station/science/xenobiology/hallway)
 "fbl" = (
-/obj/machinery/power/smes,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
 /obj/structure/cable,
 /obj/machinery/light/small/directional/west,
+/obj/machinery/power/smes/full,
 /turf/open/floor/plating,
 /area/station/engineering/gravity_generator)
 "fbo" = (

_maps/map_files/tramstation/tramstation.dmm

@@ -7423,7 +7423,6 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
-/obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
 "bAj" = (
@@ -28808,9 +28807,14 @@
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 6
 	},
-/obj/structure/table,
 /obj/machinery/firealarm/directional/east,
 /obj/machinery/light/directional/east,
+/obj/structure/table,
+/obj/item/book/manual/wiki/engineering_guide{
+	pixel_x = -2
+	},
+/obj/item/radio/off,
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
 "jos" = (
@@ -33886,7 +33890,10 @@
 /area/station/security/brig)
 "kWp" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
 "kWq" = (
@@ -48305,10 +48312,8 @@
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 10
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
-	},
 /obj/machinery/light/directional/west,
+/obj/machinery/power/smes/engineering,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
 "qes" = (
@@ -62200,7 +62205,6 @@
 "uPi" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
 "uPo" = (
@@ -64118,11 +64122,11 @@
 /turf/open/floor/iron/white,
 /area/station/science/lobby)
 "vyD" = (
-/obj/machinery/power/smes{
-	charge = 5e+06
-	},
 /obj/machinery/airalarm/directional/east,
-/obj/structure/cable,
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical{
+	pixel_y = 5
+	},
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
 "vyG" = (
@@ -66590,10 +66594,9 @@
 /turf/open/misc/grass/jungle,
 /area/station/science/explab)
 "wtS" = (
-/obj/machinery/power/terminal{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
-/obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
 "wuc" = (
@@ -103226,7 +103229,7 @@ pcO
 iKr
 ofZ
 uKK
-ajF
+wtS
 kWp
 fal
 akK
@@ -103997,7 +104000,7 @@ bKu
 bVW
 swg
 uKK
-wtS
+ajF
 bzP
 fal
 aks

code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm

@@ -297,25 +297,29 @@
 	cost = 10
 	required_type = /mob/living/silicon/ai
 	blocking_rules = list(/datum/dynamic_ruleset/roundstart/malf_ai)
+	// AIs are technically considered "Ghost roles" as far as candidate selection are concerned
+	// So we need to allow it here. We filter of actual ghost role AIs (charlie) via trim_candidates ourselves
+	restrict_ghost_roles = FALSE
 
 /datum/dynamic_ruleset/midround/malf/trim_candidates()
 	..()
-	candidates = living_players
-	for(var/mob/living/player in candidates)
-		if(!isAI(player))
-			candidates -= player
+	candidates = list()
+	for(var/mob/living/silicon/ai/player in living_players)
+		if(!is_station_level(player.z))
 			continue
-
-		if(is_centcom_level(player.z))
-			candidates -= player
+		if(isnull(player.mind))
+			continue
+		if(player.mind.special_role || length(player.mind.antag_datums))
 			continue
+		candidates += player
 
-		if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0))
-			candidates -= player
+/datum/dynamic_ruleset/midround/malf/ready(forced)
+	if(!check_candidates())
+		log_dynamic("FAIL: No valid AI found for the Malfunctioning AI ruleset.")
+		return FALSE
+	return ..()
 
 /datum/dynamic_ruleset/midround/malf/execute()
-	if(!candidates || !candidates.len)
-		return FALSE
 	var/mob/living/silicon/ai/new_malf_ai = pick_n_take(candidates)
 	assigned += new_malf_ai.mind
 	var/datum/antagonist/malf_ai/malf_antag_datum = new

code/datums/ai/movement/_ai_movement.dm

@@ -72,7 +72,8 @@
 /datum/ai_movement/proc/post_move(datum/move_loop/source, succeeded)
 	SIGNAL_HANDLER
 	var/datum/ai_controller/controller = source.extra_info
-	if(succeeded != MOVELOOP_FAILURE)
-		reset_pathing_failures(controller)
-		return
-	increment_pathing_failures(controller)
+	switch(succeeded)
+		if(MOVELOOP_SUCCESS)
+			reset_pathing_failures(controller)
+		if(MOVELOOP_FAILURE)
+			increment_pathing_failures(controller)

code/game/objects/items/crayons.dm

@@ -775,7 +775,7 @@
 /obj/item/toy/crayon/spraycan/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
 	. = ..()
 
-	if(!user.can_perform_action(src, NEED_DEXTERITY|NEED_HANDS))
+	if(!user.can_perform_action(src, NEED_DEXTERITY|NEED_HANDS|SILENT_ADJACENCY))
 		return .
 
 	if(has_cap)
@@ -786,7 +786,7 @@
 /obj/item/toy/crayon/spraycan/add_item_context(datum/source, list/context, atom/target, mob/living/user)
 	. = ..()
 
-	if(!user.can_perform_action(src, NEED_DEXTERITY|NEED_HANDS))
+	if(!user.can_perform_action(src, NEED_DEXTERITY|NEED_HANDS|SILENT_ADJACENCY))
 		return .
 
 	context[SCREENTIP_CONTEXT_LMB] = "Paint"

code/game/objects/items/robot/robot_upgrades.dm

@@ -401,6 +401,10 @@
 
 /obj/item/borg/upgrade/hypospray/action(mob/living/silicon/robot/R, user = usr)
 	. = ..()
+	var/obj/item/borg/upgrade/hypospray/U = locate() in R
+	if(U)
+		to_chat(user, span_warning("This unit is already equipped with an expanded hypospray synthesiser!")) //check to see if we already have this module
+		return FALSE
 	if(.)
 		for(var/obj/item/reagent_containers/borghypo/medical/H in R.model.modules)
 			H.upgrade_hypo()
@@ -431,6 +435,7 @@
 			found_hypo = TRUE
 
 		if(!found_hypo)
+			to_chat(user, span_warning("This unit is already equipped with a piercing hypospray upgrade!")) //check to see if we already have this module
 			return FALSE
 
 /obj/item/borg/upgrade/piercing_hypospray/deactivate(mob/living/silicon/robot/R, user = usr)
@@ -505,6 +510,10 @@
 /obj/item/borg/upgrade/defib/action(mob/living/silicon/robot/R, user = usr)
 	. = ..()
 	if(.)
+		var/obj/item/borg/upgrade/defib/U = locate() in R
+		if(U)
+			to_chat(user, span_warning("This unit is already equipped with a defibrillator module!")) //check to see if we already have this module
+			return FALSE
 		var/obj/item/borg/upgrade/defib/backpack/BP = locate() in R //If a full defib unit was used to upgrade prior, we can just pop it out now and replace
 		if(BP)
 			BP.deactivate(R, user)
@@ -561,6 +570,10 @@
 /obj/item/borg/upgrade/processor/action(mob/living/silicon/robot/R, user = usr)
 	. = ..()
 	if(.)
+		var/obj/item/borg/upgrade/processor/U = locate() in R
+		if(U)
+			to_chat(user, span_warning("This unit is already equipped with a surgical processor module!")) //check to see if we already have this module
+			return FALSE
 		var/obj/item/surgical_processor/SP = new(R.model)
 		R.model.basic_modules += SP
 		R.model.add_module(SP, FALSE, TRUE)

code/modules/antagonists/nukeop/outfits.dm

@@ -120,10 +120,7 @@
 	head = /obj/item/clothing/head/helmet/space/plasmaman/syndie
 	uniform = /obj/item/clothing/under/plasmaman/syndicate
 	glasses = /obj/item/clothing/glasses/overwatch
-	suit = /obj/item/clothing/suit/jacket/letterman_syndie
 	r_hand = /obj/item/tank/internals/plasmaman/belt/full
-	command_radio = TRUE
-	tc = 0
 
 /datum/outfit/syndicate/reinforcement/gorlex
 	name = "Syndicate Operative - Gorlex Reinforcement"
@@ -212,3 +209,4 @@
 	shoes = /obj/item/clothing/shoes/sandal
 	command_radio = TRUE
 	tc = 0
+	uplink_type = null

code/modules/escape_menu/home_page.dm

@@ -4,8 +4,8 @@
 			null,
 			/* hud_owner = */ src,
 			src,
-			"Продолжить",
-			/* offset = */ 0,
+			"Resume",
+			/* offset = */ 1,
 			CALLBACK(src, PROC_REF(home_resume)),
 		)
 	)
@@ -15,8 +15,8 @@
 			null,
 			/* hud_owner = */ null,
 			src,
-			"Настройки",
-			/* offset = */ 1,
+			"Settings",
+			/* offset = */ 2,
 			CALLBACK(src, PROC_REF(home_open_settings)),
 		)
 	)
@@ -26,8 +26,8 @@
 			null,
 			/* hud_owner = */ src,
 			src,
-			"Админхелп",
-			/* offset = */ 2,
+			"Admin Help",
+			/* offset = */ 3,
 		)
 	)
 
@@ -36,8 +36,8 @@
 			null,
 			/* hud_owner = */ src,
 			src,
-			"Покинуть тело",
-			/* offset = */ 3,
+			"Leave Body",
+			/* offset = */ 4,
 			CALLBACK(src, PROC_REF(open_leave_body)),
 		)
 	)

dependencies.sh

@@ -28,7 +28,7 @@ export AUXLUA_REPO=tgstation/auxlua
 export AUXLUA_VERSION=1.4.4
 
 #hypnagogic repo
-export CUTTER_REPO=actioninja/hypnagogic
+export CUTTER_REPO=spacestation13/hypnagogic
 
 #hypnagogic git tag
 export CUTTER_VERSION=v3.0.1

html/changelogs/AutoChangeLog-pr-82874.yml

@@ -0,0 +1,4 @@
+author: "Ben10Omintrix"
+delete-after: True
+changes:
+  - bugfix: "fixes mobs getting stuck trying to reach something unreachable"

html/changelogs/AutoChangeLog-pr-82875.yml

@@ -0,0 +1,4 @@
+author: "jlsnow301"
+delete-after: True
+changes:
+  - bugfix: "Fixes clipping in the ESC menu between buttons and long station names."

html/changelogs/AutoChangeLog-pr-82883.yml

@@ -0,0 +1,4 @@
+author: "EnterTheJake"
+delete-after: True
+changes:
+  - bugfix: "Spraycan no longer spams your chat when you mouse over it."

html/changelogs/AutoChangeLog-pr-82884.yml

@@ -0,0 +1,4 @@
+author: "Rhials"
+delete-after: True
+changes:
+  - bugfix: "Overwatch Intelligence Agents no longer get their own uplinks, leading to a self-replicating grey goo scenario."

html/changelogs/AutoChangeLog-pr-82893.yml

@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+  - bugfix: "Midround malf can roll again"

html/changelogs/archive/2024-04.yml

@@ -841,3 +841,15 @@
   necromanceranne:
   - bugfix: The plasma flower modsuit core now actually contains a reasonable quantity
       of power.
+2024-04-27:
+  Maurukas:
+  - bugfix: Removed a power loop on icebox
+  - bugfix: Disconnected aux power smes from icebox grid at roundstart
+  - bugfix: Removed some power cables connecting Deltastation's aux power
+  - bugfix: Fixed tramstation's gravity generator SMES, now functions and charged
+      at roundstart.
+  - bugfix: NorthStar's gravity generator SMES is now properly charged at roundstart
+  ZephyrTFA:
+  - admin: The return of IPIntel
+  grungussuss:
+  - bugfix: fixed being able to install multiple of the same upgrade to medical cyborgs