Merge branch 'master' into translate

ss220club · Jan 4, 2025 · aaca4eb · aaca4eb
2 parents 5333200 + 12410ff
commit aaca4eb
Show file tree

Hide file tree

Showing 651 changed files with 3,791 additions and 10,584 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -18,27 +18,7 @@
 	"git.branchProtection": ["master"],
 	"gitlens.advanced.blame.customArguments": ["-w"],
 	"tgstationTestExplorer.project.resultsType": "json",
-	"[javascript]": {
-		"editor.rulers": [80],
-		"editor.defaultFormatter": "esbenp.prettier-vscode",
-		"editor.formatOnSave": true
-	},
-	"[javascriptreact]": {
-		"editor.rulers": [80],
-		"editor.defaultFormatter": "esbenp.prettier-vscode",
-		"editor.formatOnSave": true
-	},
-	"[typescript]": {
-		"editor.rulers": [80],
-		"editor.defaultFormatter": "esbenp.prettier-vscode",
-		"editor.formatOnSave": true
-	},
-	"[typescriptreact]": {
-		"editor.rulers": [80],
-		"editor.defaultFormatter": "esbenp.prettier-vscode",
-		"editor.formatOnSave": true
-	},
-	"[scss]": {
+	"[javascript][typescript][typescriptreact][javascriptreact][html][scss][css][json][jsonc][markdown][yaml]": {
 		"editor.rulers": [80],
 		"editor.defaultFormatter": "esbenp.prettier-vscode",
 		"editor.formatOnSave": true

diff --git a/_maps/shuttles/emergency_nebula.dmm b/_maps/shuttles/emergency_nebula.dmm
@@ -864,6 +864,7 @@
 	name = "Emergency Recovery Airlock"
 	},
 /obj/effect/turf_decal/delivery,
+/obj/effect/mapping_helpers/airlock/access/all/command/general,
 /turf/open/floor/iron/dark/textured_large,
 /area/shuttle/escape)
 "sI" = (

diff --git a/code/__DEFINES/bodyparts.dm b/code/__DEFINES/bodyparts.dm
@@ -47,3 +47,5 @@
 // Color priorities for bodyparts
 #define LIMB_COLOR_HULK 10
 #define LIMB_COLOR_CARP_INFUSION 20
+/// Base priority for atom colors, gets atom priorities added to it
+#define LIMB_COLOR_ATOM_COLOR 30
diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm
@@ -468,6 +468,9 @@ GLOBAL_LIST_INIT(heretic_path_to_color, list(
 
 // Lowest priority
 #define EYE_COLOR_ORGAN_PRIORITY 1
+/// Base priority for atom colors, gets atom priorities added to it
+#define EYE_COLOR_ATOM_COLOR_PRIORITY 2
 #define EYE_COLOR_SPECIES_PRIORITY 10
 #define EYE_COLOR_WEED_PRIORITY 20
-#define EYE_COLOR_CULT_PRIORITY 30
+#define EYE_COLOR_LUMINESCENT_PRIORITY 30
+#define EYE_COLOR_CULT_PRIORITY 40
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm
@@ -29,6 +29,7 @@
 #define COMSIG_MOVABLE_IMPACT "movable_impact"
 ///from base of mob/living/hitby(): (mob/living/target, hit_zone, blocked, datum/thrownthing/throwingdatum)
 #define COMSIG_MOVABLE_IMPACT_ZONE "item_impact_zone"
+	#define MOVABLE_IMPACT_ZONE_OVERRIDE (1<<0)
 ///from /atom/movable/proc/buckle_mob(): (mob/living/M, force, check_loc, buckle_mob_flags)
 #define COMSIG_MOVABLE_PREBUCKLE "prebuckle" // this is the last chance to interrupt and block a buckle before it finishes
 	#define COMPONENT_BLOCK_BUCKLE (1<<0)

diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm
@@ -73,10 +73,6 @@
 ///from /mob/living/carbon/doUnEquip(obj/item/I, force, newloc, no_move, invdrop, silent)
 #define COMSIG_CARBON_UNEQUIP_SHOECOVER "carbon_unequip_shoecover"
 #define COMSIG_CARBON_EQUIP_SHOECOVER "carbon_equip_shoecover"
-///defined twice, in carbon and human's topics, fired when interacting with a valid embedded_object to pull it out (mob/living/carbon/target, /obj/item, /obj/item/bodypart/L)
-#define COMSIG_CARBON_EMBED_RIP "item_embed_start_rip"
-///called when removing a given item from a mob, from mob/living/carbon/remove_embedded_object(mob/living/carbon/target, /obj/item)
-#define COMSIG_CARBON_EMBED_REMOVAL "item_embed_remove_safe"
 ///Called when someone attempts to cuff a carbon
 #define COMSIG_CARBON_CUFF_ATTEMPTED "carbon_attempt_cuff"
 	#define COMSIG_CARBON_CUFF_PREVENT (1<<0)

diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm
@@ -198,8 +198,6 @@
 #define COMSIG_TOOL_START_USE "tool_start_use"
 /// From /obj/item/multitool/remove_buffer(): (buffer)
 #define COMSIG_MULTITOOL_REMOVE_BUFFER "multitool_remove_buffer"
-///from [/obj/item/proc/disableEmbedding]:
-#define COMSIG_ITEM_DISABLE_EMBED "item_disable_embed"
 ///from [/obj/effect/mine/proc/triggermine]:
 #define COMSIG_MINE_TRIGGERED "minegoboom"
 ///from [/obj/structure/closet/supplypod/proc/preOpen]:
@@ -404,10 +402,7 @@
 #define COMSIG_PROJECTILE_RANGE_OUT "projectile_range_out"
 ///from the base of /obj/projectile/process(): ()
 #define COMSIG_PROJECTILE_BEFORE_MOVE "projectile_before_move"
-///from [/obj/item/proc/tryEmbed] sent when trying to force an embed (mainly for projectiles and eating glass)
-#define COMSIG_EMBED_TRY_FORCE "item_try_embed"
-	#define COMPONENT_EMBED_SUCCESS (1<<1)
-// FROM [/obj/item/proc/updateEmbedding] sent when an item's embedding properties are changed : ()
+// FROM [/obj/item/proc/set_embed] sent when an item's embedding properties are changed : ()
 #define COMSIG_ITEM_EMBEDDING_UPDATE "item_embedding_update"
 
 ///sent to targets during the process_hit proc of projectiles
@@ -418,9 +413,9 @@
 
 ///sent to the projectile after an item is spawned by the projectile_drop element: (new_item)
 #define COMSIG_PROJECTILE_ON_SPAWN_DROP "projectile_on_spawn_drop"
-///sent to the projectile when spawning the item (shrapnel) that may be embedded: (new_item)
+///sent to the projectile when spawning the item (shrapnel) that may be embedded: (new_item, victim)
 #define COMSIG_PROJECTILE_ON_SPAWN_EMBEDDED "projectile_on_spawn_embedded"
-///sent to the projectile when successfully embedding into something
+///sent to the projectile when successfully embedding into something: (new_item, victim)
 #define COMSIG_PROJECTILE_ON_EMBEDDED "projectile_on_embedded"
 
 // /obj/vehicle/sealed/car/vim signals
@@ -477,12 +472,12 @@
 #define COMSIG_ITEM_ATTACK_SECONDARY "item_attack_secondary"
 ///from base of [obj/item/attack()]: (atom/target, mob/user, proximity_flag, click_parameters)
 #define COMSIG_ITEM_AFTERATTACK "item_afterattack"
-///from base of obj/item/embedded(): (atom/target, obj/item/bodypart/part)
+///from base of datum/embedding/proc/embed_into(): (mob/living/carbon/victim, obj/item/bodypart/limb)
 #define COMSIG_ITEM_EMBEDDED "item_embedded"
-///from base of datum/component/embedded/safeRemove(): (mob/living/carbon/victim)
+///from base of datum/embedding/proc/remove_embedding(): (mob/living/carbon/victim, obj/item/bodypart/limb)
 #define COMSIG_ITEM_UNEMBEDDED "item_unembedded"
-/// from base of obj/item/failedEmbed()
-#define COMSIG_ITEM_FAILED_EMBED "item_failed_embed"
+///from base of datum/embedding/proc/failed_embed(): (mob/living/carbon/victim, hit_zone)
+#define COMSIG_ITEM_FAILED_EMBED "item_unembedded"
 
 /// from base of datum/element/disarm_attack/secondary_attack(), used to prevent shoving: (victim, user, send_message)
 #define COMSIG_ITEM_CAN_DISARM_ATTACK "item_pre_disarm_attack"
@@ -501,9 +496,6 @@
 #define COMSIG_SPEED_POTION_APPLIED "speed_potion"
 	#define SPEED_POTION_STOP (1<<0)
 
-/// from /obj/structure/sign/poster/trap_succeeded() : (mob/user)
-#define COMSIG_POSTER_TRAP_SUCCEED "poster_trap_succeed"
-
 /// from /obj/item/detective_scanner/scan(): (mob/user, list/extra_data)
 #define COMSIG_DETECTIVE_SCANNED "det_scanned"
 

diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm
@@ -46,6 +46,7 @@
 // These are a percentage of how much darkness to cut off (in rgb)
 #define LIGHTING_CUTOFF_VISIBLE 0
 #define LIGHTING_CUTOFF_REAL_LOW 4.5
+#define LIGHTING_CUTOFF_LOW 10
 #define LIGHTING_CUTOFF_MEDIUM 15
 #define LIGHTING_CUTOFF_HIGH 30
 #define LIGHTING_CUTOFF_FULLBRIGHT 100

diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm
@@ -129,6 +129,7 @@
 #define LOG_CATEGORY_DEBUG_ASSET "debug-asset"
 #define LOG_CATEGORY_DEBUG_JOB "debug-job"
 #define LOG_CATEGORY_DEBUG_LUA "debug-lua"
+#define LOG_CATEGORY_DEBUG_TTS "debug-tts"
 #define LOG_CATEGORY_DEBUG_MAPPING "debug-mapping"
 #define LOG_CATEGORY_DEBUG_MOBTAG "debug-mobtag"
 #define LOG_CATEGORY_DEBUG_SQL "debug-sql"

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -867,6 +867,8 @@ GLOBAL_LIST_INIT(layers_to_offset, list(
 #define NOT_INSIDE_TARGET (1<<10)
 /// Checks for base adjacency, but silences the error
 #define SILENT_ADJACENCY (1<<11)
+/// Allows pAIs to perform an action
+#define ALLOW_PAI (1<<12)
 
 /// The default mob sprite size (used for shrinking or enlarging the mob sprite to regular size)
 #define RESIZE_DEFAULT_SIZE 1

diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
@@ -330,6 +330,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_MESON_VISION "meson_vision"
 /// Gives us Night vision
 #define TRAIT_TRUE_NIGHT_VISION "true_night_vision"
+/// Gives us minor night vision
+#define TRAIT_MINOR_NIGHT_VISION "minor_night_vision"
 /// Negates our gravity, letting us move normally on floors in 0-g
 #define TRAIT_NEGATES_GRAVITY "negates_gravity"
 /// We are ignoring gravity

diff --git a/code/__DEFINES/traits/sources.dm b/code/__DEFINES/traits/sources.dm
@@ -315,3 +315,6 @@
 
 /// Trait aquired from being painted a certain color
 #define ATOM_COLOR_TRAIT "atom_color"
+
+/// Permanent trait from an overdose effect
+#define OVERDOSE_TRAIT "overdose"
diff --git a/code/__HELPERS/logging/debug.dm b/code/__HELPERS/logging/debug.dm
@@ -15,6 +15,10 @@
 /proc/log_job_debug(text, list/data)
 	logger.Log(LOG_CATEGORY_DEBUG_JOB, text, data)
 
+/// Logging for TTS
+/proc/log_tts(text, list/data)
+	logger.Log(LOG_CATEGORY_DEBUG_TTS, text, data)
+
 /// Logging for lua scripting
 /proc/log_lua(text, list/data)
 	logger.Log(LOG_CATEGORY_DEBUG_LUA, text, data)

diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
@@ -344,6 +344,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_MIND_READER" = TRAIT_MIND_READER,
 		"TRAIT_MINDSHIELD" = TRAIT_MINDSHIELD,
 		"TRAIT_MIND_TEMPORARILY_GONE" = TRAIT_MIND_TEMPORARILY_GONE,
+		"TRAIT_MINOR_NIGHT_VISION" = TRAIT_MINOR_NIGHT_VISION,
 		"TRAIT_FAKE_SOULLESS" = TRAIT_FAKE_SOULLESS,
 		"TRAIT_MOB_BREEDER" = TRAIT_MOB_BREEDER,
 		"TRAIT_MOB_CAN_DIG" = TRAIT_MOB_CAN_DIG,

diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
@@ -266,8 +266,7 @@
 		return
 
 	var/mob/living/carbon/carbon_owner = owner
-
-	return carbon_owner.help_shake_act(carbon_owner)
+	return carbon_owner.check_self_for_injuries()
 
 /atom/movable/screen/alert/negative
 	name = "Negative Gravity"

diff --git a/code/controllers/subsystem/persistence/trophy_fishes.dm b/code/controllers/subsystem/persistence/trophy_fishes.dm
@@ -32,10 +32,9 @@
 		fish.set_custom_materials(mat_list)
 	fish.persistence_load(data)
 	fish.name = data[PERSISTENCE_FISH_NAME]
-	mount.catcher_name = data[PERSISTENCE_FISH_CATCHER]
-	mount.catch_date = data[PERSISTENCE_FISH_CATCH_DATE]
 	fish.set_status(FISH_DEAD, silent = TRUE)
 	mount.add_fish(fish, from_persistence = TRUE, catcher = data[PERSISTENCE_FISH_CATCHER])
+	mount.catch_date = data[PERSISTENCE_FISH_CATCH_DATE]
 
 /datum/controller/subsystem/persistence/proc/save_trophy_fish(obj/structure/fish_mount/mount)
 	var/obj/item/fish/fish = mount.mounted_fish

diff --git a/code/controllers/subsystem/polling.dm b/code/controllers/subsystem/polling.dm
@@ -155,7 +155,7 @@ SUBSYSTEM_DEF(polling)
 			act_never = "[custom_link_style_start]<a href='byond://?src=[REF(poll_alert_button)];never=1'[custom_link_style_end]>\[Never For This Round\]</a>"
 
 		if(!duplicate_message_check(alert_poll)) //Only notify people once. They'll notice if there are multiple and we don't want to spam people.
-			SEND_SOUND(candidate_mob, 'sound/announcer/notice/notice2.ogg')
+			SEND_SOUND(candidate_mob, sound('sound/misc/prompt.ogg', volume = 70))
 			var/surrounding_icon
 			if(chat_text_border_icon)
 				var/image/surrounding_image

diff --git a/code/controllers/subsystem/tts.dm b/code/controllers/subsystem/tts.dm
@@ -183,6 +183,12 @@ SUBSYSTEM_DEF(tts)
 		var/identifier = current_request.identifier
 		if(current_request.requests_errored())
 			current_request.timed_out = TRUE
+			var/datum/http_response/normal_response = current_request.request.into_response()
+			var/datum/http_response/blips_response = current_request.request_blips.into_response()
+			log_tts("TTS HTTP request errored | Normal: [normal_response.error] | Blips: [blips_response.error]", list(
+				"normal" = normal_response,
+				"blips" = blips_response
+			))
 			continue
 		current_request.audio_length = text2num(response.headers["audio-length"]) * 10
 		if(!current_request.audio_length)

diff --git a/code/datums/actions/items/toggles.dm b/code/datums/actions/items/toggles.dm
@@ -116,6 +116,17 @@
 /datum/action/item_action/call_link
 	name = "Call MODlink"
 
+/datum/action/item_action/toggle_wearable_hud
+	name = "Toggle Wearable HUD"
+	desc = "Toggles your wearable HUD. You can still access examine information while it's off."
+
+/datum/action/item_action/toggle_wearable_hud/Trigger(trigger_flags)
+	. = ..()
+	if(!.)
+		return
+	var/obj/item/clothing/glasses/hud/hud_display = target
+	hud_display.toggle_hud_display(owner)
+
 /datum/action/item_action/toggle_nv
 	name = "Toggle Night Vision"
 	var/stored_cutoffs

diff --git a/code/datums/ai_laws/ai_laws.dm b/code/datums/ai_laws/ai_laws.dm
@@ -79,8 +79,15 @@ GLOBAL_VAR(round_default_lawset)
 /proc/pick_weighted_lawset()
 	var/datum/ai_laws/lawtype
 	var/list/law_weights = CONFIG_GET(keyed_list/law_weight)
+	var/list/specified_law_ids = CONFIG_GET(keyed_list/specified_laws)
+
 	if(HAS_TRAIT(SSstation, STATION_TRAIT_UNIQUE_AI))
-		law_weights -= AI_LAWS_ASIMOV
+		switch(CONFIG_GET(number/default_laws))
+			if(CONFIG_ASIMOV)
+				law_weights -= AI_LAWS_ASIMOV
+			if(CONFIG_CUSTOM)
+				law_weights -= specified_law_ids
+
 	while(!lawtype && law_weights.len)
 		var/possible_id = pick_weight(law_weights)
 		lawtype = lawid_to_type(possible_id)

diff --git a/code/datums/components/armor_plate.dm b/code/datums/components/armor_plate.dm
@@ -35,7 +35,7 @@
 		src.armor_mod = armor_mod
 	if(upgrade_prefix)
 		src.upgrade_prefix = upgrade_prefix
-	var/obj/item/typecast = upgrade_item
+	var/obj/item/typecast = src.upgrade_item
 	src.upgrade_name = initial(typecast.name)
 
 /datum/component/armor_plate/proc/examine(datum/source, mob/user, list/examine_list)

diff --git a/code/datums/components/dart_insert.dm b/code/datums/components/dart_insert.dm
@@ -133,7 +133,7 @@
 	new_overlays += mutable_appearance(projectile_overlay_icon, projectile_overlay_icon_state)
 
 /datum/component/dart_insert/proc/apply_var_modifiers(obj/projectile/projectile)
-	var_modifiers = istype(modifier_getter) ? modifier_getter.Invoke() : list()
+	var_modifiers = istype(modifier_getter) ? modifier_getter.Invoke(projectile) : list()
 	projectile.damage += var_modifiers["damage"]
 	projectile.speed += var_modifiers["speed"]
 	projectile.armour_penetration += var_modifiers["armour_penetration"]