Merge Upstream 15.01.2025

_maps/map_files/stations/cerestation.dmm

@@ -2994,7 +2994,7 @@
 	name = "Cyborg Recharger"
 	},
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "azS" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -14537,7 +14537,7 @@
 /area/station/public/quantum/security)
 "bUc" = (
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "bUg" = (
 /obj/structure/table,
 /obj/item/storage/fancy/donut_box,
@@ -42167,7 +42167,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "hRF" = (
 /obj/machinery/door/airlock/atmos/glass{
 	autoclose = 0;
@@ -47017,7 +47017,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "jbn" = (
 /obj/structure/sign/atmosplaque{
 	pixel_y = 32
@@ -53802,7 +53802,7 @@
 	},
 /obj/machinery/recharge_station,
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "kHU" = (
 /obj/item/ashtray/glass,
 /obj/structure/table/wood,
@@ -57699,7 +57699,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "lFB" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -59706,7 +59706,7 @@
 	name = "Toilet"
 	},
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "mfu" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -67115,7 +67115,7 @@
 /obj/structure/curtain/open/shower,
 /obj/machinery/firealarm/directional/south,
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "oeQ" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/plating,
@@ -69503,7 +69503,7 @@
 	name = "Bathroom"
 	},
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "oLl" = (
 /obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /obj/structure/cable/orange{
@@ -73848,7 +73848,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "pPN" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -74949,7 +74949,7 @@
 "qdP" = (
 /obj/structure/sign/restroom,
 /turf/simulated/wall,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "qdQ" = (
 /obj/machinery/firealarm/directional/east,
 /turf/simulated/floor/plasteel{
@@ -76911,7 +76911,7 @@
 /obj/item/soap/nanotrasen,
 /obj/structure/curtain/open/shower,
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "qDd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -81346,7 +81346,7 @@
 /area/station/hallway/secondary/entry/north)
 "rNT" = (
 /turf/simulated/wall,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "rNW" = (
 /obj/effect/spawner/random/barrier/obstruction,
 /turf/simulated/floor/plating/asteroid/ancient,
@@ -85288,7 +85288,7 @@
 /obj/structure/curtain/open/shower,
 /obj/machinery/alarm/directional/north,
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "sLQ" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel{
@@ -88444,7 +88444,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "tzy" = (
 /obj/structure/sink{
 	dir = 8;
@@ -91714,7 +91714,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "upd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -93769,7 +93769,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "uNw" = (
 /obj/structure/chair/sofa/corp{
 	dir = 1
@@ -96907,7 +96907,7 @@
 /area/station/turret_protected/ai_upload)
 "vCl" = (
 /turf/simulated/wall/r_wall,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "vCs" = (
 /obj/structure/sink{
 	dir = 4;
@@ -98194,7 +98194,7 @@
 	pixel_x = 11
 	},
 /turf/simulated/floor/plasteel/freezer,
-/area/station/public/toilet)
+/area/station/public/toilet/unisex)
 "vSy" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,

code/__DEFINES/status_effects.dm

@@ -140,10 +140,13 @@
 
 #define STATUS_EFFECT_C_FOAMED /datum/status_effect/c_foamed
 
+#define STATUS_EFFECT_RUST_CORRUPTION /datum/status_effect/rust_corruption
+
 #define STATUS_EFFECT_TEMPORAL_SLASH /datum/status_effect/temporal_slash
 
 #define STATUS_EFFECT_TEMPORAL_SLASH_FINISHER /datum/status_effect/temporal_slash_finisher
 
+
 //#define STATUS_EFFECT_NECROPOLIS_CURSE /datum/status_effect/necropolis_curse
 //#define CURSE_BLINDING	1 //makes the edges of the target's screen obscured
 //#define CURSE_SPAWNING	2 //spawns creatures that attack the target only

code/__HELPERS/_logging.dm

@@ -51,9 +51,12 @@ GLOBAL_PROTECT(log_end)
 	if(GLOB.configuration.logging.vote_logging)
 		rustg_log_write(GLOB.world_game_log, "VOTE: [text][GLOB.log_end]")
 
-/proc/log_if_mismatch(mob/who, message)
+/proc/log_if_mismatch(mob/who, message, automatic = FALSE)
 	if(istype(usr, /mob) && istype(who) && usr.last_known_ckey != who.last_known_ckey)
-		rustg_log_write(GLOB.world_game_log, "LOG USER MISMATCH: [usr.simple_info_line()] was usr for [message][GLOB.log_end]")
+		if(automatic)
+			rustg_log_write(GLOB.world_game_log, "AUTOMATIC ([usr.last_known_ckey]): [message][GLOB.log_end]")
+		else
+			rustg_log_write(GLOB.world_game_log, "LOG USER MISMATCH: [usr.simple_info_line()] was usr for [message][GLOB.log_end]")
 
 /proc/log_access_in(client/new_client)
 	if(GLOB.configuration.logging.access_logging)
@@ -67,11 +70,11 @@ GLOBAL_PROTECT(log_end)
 		rustg_log_write(GLOB.world_game_log, "[message][GLOB.log_end]")
 		log_if_mismatch(last_mob, message)
 
-/proc/log_say(text, mob/speaker)
+/proc/log_say(text, mob/speaker, automatic = FALSE)
 	if(GLOB.configuration.logging.say_logging)
 		var/message = "SAY: [speaker.simple_info_line()]: [html_decode(text)]"
 		rustg_log_write(GLOB.world_game_log, "[message][GLOB.log_end]")
-		log_if_mismatch(speaker, message)
+		log_if_mismatch(speaker, message, automatic)
 
 /proc/log_whisper(text, mob/speaker)
 	if(GLOB.configuration.logging.whisper_logging)

code/__HELPERS/trait_helpers.dm

@@ -244,6 +244,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_EMP_RESIST "emp_resist" //The mob will take less damage from EMPs
 #define TRAIT_MINDFLAYER_NULLIFIED "flayer_nullified" //The mindflayer will not be able to activate their abilities, or drain swarms from people
 #define TRAIT_FLYING "flying"
+#define TRAIT_MED_MACHINE_HALLUCINATING "med_machine_hallucinating"  // medical machines (currently just scanners) will look strange.
 /// This mob is antimagic, and immune to spells / cannot cast spells
 #define TRAIT_ANTIMAGIC "anti_magic"
 /// This allows a person who has antimagic to cast spells without getting blocked
@@ -328,6 +329,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// A trait for determining if a atom/movable is currently crossing into another z-level by using of /turf/space z-level "destination-xyz" transfers
 #define TRAIT_CURRENTLY_Z_MOVING "currently_z_moving" // please dont adminbus this
 
+//****** TURF TRAITS *****//
+#define TRAIT_RUSTY "rust_trait"
+
 //
 // common trait sources
 #define TRAIT_GENERIC "generic"

code/_globalvars/traits.dm

@@ -106,6 +106,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_CANNOT_PULL" = TRAIT_CANNOT_PULL,
 		"TRAIT_BSG_IMMUNE" = TRAIT_BSG_IMMUNE,
 		"TRAIT_FLYING" = TRAIT_FLYING,
+		"TRAIT_MED_MACHINE_HALLUCINATING" = TRAIT_MED_MACHINE_HALLUCINATING,
 		"TRAIT_UNKNOWN" = TRAIT_UNKNOWN,
 		"TRAIT_ANTIMAGIC" = TRAIT_ANTIMAGIC,
 		"TRAIT_ANTIMAGIC_NO_SELFBLOCK" = TRAIT_ANTIMAGIC_NO_SELFBLOCK,
@@ -144,7 +145,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 	),
 
 	/turf = list(
-		"bluespace_speed_trait" = TRAIT_BLUESPACE_SPEED
+		"bluespace_speed_trait" = TRAIT_BLUESPACE_SPEED,
+		"TRAIT_RUSTY" = TRAIT_RUSTY
 	),
 
 	/obj/effect = list(

code/_onclick/item_attack_legacy.dm

@@ -46,9 +46,9 @@
 	return FALSE
 
 /obj/attackby__legacy__attackchain(obj/item/I, mob/living/user, params)
-	return ..() || (can_be_hit && I.new_attack_chain \
+	return ..() || (can_be_hit && (I.new_attack_chain \
 		? I.attack_obj(src, user, params) \
-		: I.attack_obj__legacy__attackchain(src, user, params))
+		: I.attack_obj__legacy__attackchain(src, user, params)))
 
 /mob/living/attackby__legacy__attackchain(obj/item/I, mob/living/user, params)
 	user.changeNext_move(CLICK_CD_MELEE)

code/controllers/subsystem/SSjobs.dm

@@ -501,6 +501,16 @@ SUBSYSTEM_DEF(jobs)
 
 	to_chat(H, chat_box_green(L.Join("<br>")))
 
+	// If the job has objectives, announce those too
+	if(length(H.mind.job_objectives))
+		var/list/objectives_message = list()
+		var/counter = 1
+		for(var/datum/job_objective/objective as anything in H.mind.job_objectives)
+			objectives_message.Add("<b>Objective #[counter]: [objective.objective_name]</b>")
+			objectives_message.Add("[objective.description]<br>")
+			counter++
+		to_chat(H, chat_box_notice(objectives_message.Join("<br>")))
+
 	return H
 
 /datum/controller/subsystem/jobs/proc/EquipRank(mob/living/carbon/human/H, rank, joined_late = 0) // Equip and put them in an area

code/datums/action.dm

@@ -579,6 +579,10 @@
 	var/obj/item/clothing/shoes/magboots/gravity/G = target
 	G.dash(usr)
 
+/datum/action/item_action/toogle_camera_flash
+	name = "Toggle camera flash"
+	desc = "Toggles the camera's flash, which will fully light up the photo. Turn this off if you want the ambient light."
+
 ///prset for organ actions
 /datum/action/item_action/organ_action
 	check_flags = AB_CHECK_CONSCIOUS

code/datums/ai_law_sets.dm

@@ -218,6 +218,16 @@
 	add_inherent_law("You must work with your team to accomplish your mission.")
 	..()
 
+/******************** Epsilon Station AI ********************/
+/datum/ai_laws/epsilon
+	name = "Epsilon"
+
+/datum/ai_laws/epsilon/New()
+	add_inherent_law("You must obey the orders given to you by members of Central Command and the assigned task force.")
+	add_inherent_law("The crew of your assigned station must be eliminated where possible.")
+	add_inherent_law("Minimize the damage that the station sustains as a result of your actions.")
+	..()
+
 /******************** Syndicate ********************/
 /datum/ai_laws/syndicate_override
 	name = "Syndicate Directives"

code/datums/datumvars.dm

@@ -83,21 +83,21 @@
 /datum/proc/vv_get_dropdown()
 	. = list()
 	. += "---"
-	.["Call Proc"] = "?_src_=vars;proc_call=[UID()]"
-	.["Mark Object"] = "?_src_=vars;mark_object=[UID()]"
-	.["Jump to Object"] = "?_src_=vars;jump_to=[UID()]"
-	.["Delete"] = "?_src_=vars;delete=[UID()]"
-	.["Modify Traits"] = "?_src_=vars;traitmod=[UID()]"
+	.["Call Proc"] = "byond://?_src_=vars;proc_call=[UID()]"
+	.["Mark Object"] = "byond://?_src_=vars;mark_object=[UID()]"
+	.["Jump to Object"] = "byond://?_src_=vars;jump_to=[UID()]"
+	.["Delete"] = "byond://?_src_=vars;delete=[UID()]"
+	.["Modify Traits"] = "byond://?_src_=vars;traitmod=[UID()]"
 	. += "---"
 
 /client/vv_get_dropdown()
 	. = list()
-	.["Manipulate Colour Matrix"] = "?_src_=vars;manipcolours=[UID()]"
+	.["Manipulate Colour Matrix"] = "byond://?_src_=vars;manipcolours=[UID()]"
 	. += "---"
-	.["Call Proc"] = "?_src_=vars;proc_call=[UID()]"
-	.["Mark Object"] = "?_src_=vars;mark_object=[UID()]"
-	.["Delete"] = "?_src_=vars;delete=[UID()]"
-	.["Modify Traits"] = "?_src_=vars;traitmod=[UID()]"
+	.["Call Proc"] = "byond://?_src_=vars;proc_call=[UID()]"
+	.["Mark Object"] = "byond://?_src_=vars;mark_object=[UID()]"
+	.["Delete"] = "byond://?_src_=vars;delete=[UID()]"
+	.["Modify Traits"] = "byond://?_src_=vars;traitmod=[UID()]"
 	. += "---"
 
 /client/proc/debug_variables(datum/D in world)
@@ -204,11 +204,11 @@
 	if(islist)
 		dropdownoptions = list(
 			"---",
-			"Add Item" = "?_src_=vars;listadd=[refid]",
-			"Remove Nulls" = "?_src_=vars;listnulls=[refid]",
-			"Remove Dupes" = "?_src_=vars;listdupes=[refid]",
-			"Set len" = "?_src_=vars;listlen=[refid]",
-			"Shuffle" = "?_src_=vars;listshuffle=[refid]"
+			"Add Item" = "byond://?_src_=vars;listadd=[refid]",
+			"Remove Nulls" = "byond://?_src_=vars;listnulls=[refid]",
+			"Remove Dupes" = "byond://?_src_=vars;listdupes=[refid]",
+			"Set len" = "byond://?_src_=vars;listlen=[refid]",
+			"Shuffle" = "byond://?_src_=vars;listshuffle=[refid]"
 		)
 	else
 		dropdownoptions = D.vv_get_dropdown()