TGS Test Merge (#7862)

SpacemanDMM.toml

@@ -13,3 +13,4 @@ engine = "auxtools"
 
 [diagnostics]
 var_in_proc_parameter = "error"
+redefined_proc = "warning"

code/__DEFINES/MC.dm

@@ -118,7 +118,7 @@
 	NEW_SS_GLOBAL(SS##X);\
 	PreInit();\
 }\
-/datum/controller/subsystem/processing/##X/fire() {..() /*just so it shows up on the profiler*/} \
+/datum/controller/subsystem/processing/##X/fire() {CAN_BE_REDEFINED(TRUE); ..() /*just so it shows up on the profiler*/} \
 /datum/controller/subsystem/processing/##X
 
 #define log_qdel(X) log_debug(X)

code/__DEFINES/__spacemandmm.dm

@@ -11,6 +11,7 @@
 	#define SHOULD_BE_PURE(X) set SpacemanDMM_should_be_pure = X
 	#define PRIVATE_PROC(X) set SpacemanDMM_private_proc = X
 	#define PROTECTED_PROC(X) set SpacemanDMM_protected_proc = X
+	#define CAN_BE_REDEFINED(X) set SpacemanDMM_can_be_redefined = X
 	#define VAR_FINAL var/SpacemanDMM_final
 	#define VAR_PRIVATE var/SpacemanDMM_private
 	#define VAR_PROTECTED var/SpacemanDMM_protected
@@ -23,6 +24,7 @@
 	#define SHOULD_BE_PURE(X)
 	#define PRIVATE_PROC(X)
 	#define PROTECTED_PROC(X)
+	#define CAN_BE_REDEFINED(X)
 	#define VAR_FINAL var
 	#define VAR_PRIVATE var
 	#define VAR_PROTECTED var

code/__DEFINES/_globals.dm

@@ -35,6 +35,7 @@
 #ifndef TESTING
 #define GLOBAL_PROTECT(X)\
 /datum/controller/global_vars/InitGlobal##X(){\
+	CAN_BE_REDEFINED(TRUE);\
 	..();\
 	gvars_datum_protected_varlist[#X] = TRUE;\
 }
@@ -44,6 +45,7 @@
 
 #define GLOBAL_SORTED(X)\
 /datum/controller/global_vars/InitGlobal##X(){\
+	CAN_BE_REDEFINED(TRUE);\
 	..();\
 	##X = sortAssoc(##X);\
 }

code/_onclick/ai.dm

@@ -1,43 +1,3 @@
-/*
-	AI ClickOn()
-
-	Note currently ai is_mob_restrained() returns 0 in all cases,
-	therefore restrained code has been removed
-
-	The AI can double click to move the camera (this was already true but is cleaner),
-	or double click a mob to track them.
-
-	Note that AI have no need for the adjacency proc, and so this proc is a lot cleaner.
-*/
-
-/mob/click(atom/A, list/mods)
-	..()
-
-	if(!client || !client.remote_control)
-		return FALSE
-
-	if (mods["middle"])
-		A.AIMiddleClick(src)
-		return 1
-
-	if (mods["shift"])
-		A.AIShiftClick(src)
-		return 1
-
-	if (mods["alt"])
-		A.AIAltClick(src)
-		return 1
-
-	if (mods["ctrl"])
-		A.AICtrlClick(src)
-		return 1
-
-	if (world.time <= next_move)
-		return 1
-
-	A.attack_remote(src)
-	return 1
-
 /*
 	AI has no need for the UnarmedAttack() and RangedAttack() procs,
 	because the AI code is not generic; attack_remote() is used instead.
@@ -49,16 +9,6 @@
 /mob/living/silicon/ai/RangedAttack(atom/A)
 	A.attack_remote(src)
 
-/mob/UnarmedAttack(atom/A)
-	if(!client || !client.remote_control)
-		return FALSE
-	A.attack_remote(src)
-
-/mob/RangedAttack(atom/A)
-	if(!client || !client.remote_control)
-		return FALSE
-	A.attack_remote(src)
-
 /atom/proc/attack_remote(mob/user as mob)
 	return
 

code/_onclick/click.dm

@@ -192,8 +192,43 @@
 	* mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed
 */
 
+/*
+	AI ClickOn()
+
+	Note currently ai is_mob_restrained() returns 0 in all cases,
+	therefore restrained code has been removed
+
+	The AI can double click to move the camera (this was already true but is cleaner),
+	or double click a mob to track them.
+
+	Note that AI have no need for the adjacency proc, and so this proc is a lot cleaner.
+*/
+
 /mob/proc/click(atom/A, list/mods)
-	return FALSE
+	if(!client || !client.remote_control)
+		return FALSE
+
+	if(mods["middle"])
+		A.AIMiddleClick(src)
+		return TRUE
+
+	if(mods["shift"])
+		A.AIShiftClick(src)
+		return TRUE
+
+	if(mods["alt"])
+		A.AIAltClick(src)
+		return TRUE
+
+	if(mods["ctrl"])
+		A.AICtrlClick(src)
+		return TRUE
+
+	if(world.time <= next_move)
+		return TRUE
+
+	A.attack_remote(src)
+	return TRUE
 
 /atom/proc/clicked(mob/user, list/mods)
 	if (mods["shift"] && !mods["middle"])
@@ -230,7 +265,9 @@
 	in human click code to allow glove touches only at melee range.
 */
 /mob/proc/UnarmedAttack(atom/A, proximity_flag, click_parameters)
-	return
+	if(!client || !client.remote_control)
+		return FALSE
+	A.attack_remote(src)
 
 /*
 	Ranged unarmed attack:
@@ -241,7 +278,9 @@
 	animals lunging, etc.
 */
 /mob/proc/RangedAttack(atom/A, params)
-	return
+	if(!client || !client.remote_control)
+		return FALSE
+	A.attack_remote(src)
 
 /*
 	Restrained ClickOn

code/_onclick/click_hold.dm

@@ -14,6 +14,7 @@
 	/// The history of all atoms that were hovered over while the mouse was depressed
 	var/list/mouse_trace_history
 	var/list/lmb_last_mousedown_mods
+	var/datum/entity/clan_player/clan_info
 
 /client/MouseDown(atom/A, turf/T, skin_ctl, params)
 	ignore_next_click = FALSE

code/_onclick/item_attack.dm

@@ -9,7 +9,7 @@
 		dig_out_shrapnel(user)
 
 // No comment
-/atom/proc/attackby(obj/item/W, mob/living/user,list/mods)
+/atom/proc/attackby(obj/item/W, mob/living/user, list/mods)
 	if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, W, user, mods) & COMPONENT_NO_AFTERATTACK)
 		return TRUE
 	SEND_SIGNAL(user, COMSIG_MOB_PARENT_ATTACKBY, src, W)

code/controllers/subsystem/nanoui.dm

@@ -7,9 +7,7 @@ SUBSYSTEM_DEF(nano)
 	var/list/currentrun = list()
 	var/datum/nanomanager/nanomanager
 
-/datum/controller/subsystem/nano/New()
-	. = ..()
-
+/datum/controller/subsystem/nano/PreInit()
 	nanomanager = new()
 
 /datum/controller/subsystem/nano/stat_entry(msg)

code/datums/diseases/advance/symptoms/weight.dm

@@ -107,7 +107,7 @@ Bonus
 	transmittable = -2
 	level = 4
 
-/datum/symptom/weight_loss/Activate(datum/disease/advance/A)
+/datum/symptom/weight_even/Activate(datum/disease/advance/A)
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB))
 		var/mob/living/M = A.affected_mob

code/datums/effects/mob_crit/crit.dm

@@ -3,7 +3,7 @@
 	duration = 30
 	flags = INF_DURATION | NO_PROCESS_ON_DEATH | DEL_ON_UNDEFIBBABLE
 
-/datum/effects/pain/validate_atom(atom/A)
+/datum/effects/crit/validate_atom(atom/A)
 	if(isobj(A))
 		return FALSE
 	. = ..()

code/datums/emergency_calls/upp_commando.dm

@@ -54,7 +54,7 @@
 /datum/emergency_call/upp_commando/low_threat
 	name = "UPP Commandos"
 
-/datum/emergency_call/upp_commando/create_member(datum/mind/mind, turf/override_spawn_loc)
+/datum/emergency_call/upp_commando/low_threat/create_member(datum/mind/mind, turf/override_spawn_loc)
 	var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point()
 
 	if(!istype(spawn_loc))

code/datums/entities/player.dm

@@ -505,6 +505,8 @@ BSQL_PROTECT_DATUM(/datum/entity/player)
 	load_player_data_info(get_player_from_key(ckey))
 
 /client/proc/load_player_data_info(datum/entity/player/player)
+	set waitfor = FALSE
+
 	if(ckey != player.ckey)
 		error("ALARM: MISMATCH. Loaded player data for client [ckey], player data ckey is [player.ckey], id: [player.id]")
 	player_data = player
@@ -524,6 +526,23 @@ BSQL_PROTECT_DATUM(/datum/entity/player)
 	record_login_triplet(player.ckey, address, computer_id)
 	player_data.sync()
 
+	if(isSenator(src))
+		add_verb(src, /client/proc/whitelist_panel)
+	if(isCouncil(src))
+		add_verb(src, /client/proc/other_records)
+
+	if(GLOB.RoleAuthority && check_whitelist_status(WHITELIST_PREDATOR))
+		clan_info = GET_CLAN_PLAYER(player.id)
+		clan_info.sync()
+
+		if(check_whitelist_status(WHITELIST_YAUTJA_LEADER))
+			clan_info.clan_rank = GLOB.clan_ranks_ordered[CLAN_RANK_ADMIN]
+			clan_info.permissions |= CLAN_PERMISSION_ALL
+		else
+			clan_info.permissions &= ~CLAN_PERMISSION_ADMIN_MANAGER // Only the leader can manage the ancients
+
+		clan_info.save()
+
 /datum/entity/player/proc/check_ban(computer_id, address, is_telemetry)
 	. = list()
 

code/game/area/Sulaco.dm

@@ -61,10 +61,7 @@
 	icon_state = "away1"
 
 
-/area/shuttle/drop2/Enter(atom/movable/O, atom/oldloc)
-	if(istype(O, /obj/structure/barricade))
-		return FALSE
-	return TRUE
+
 
 /area/shuttle/drop2
 	//soundscape_playlist = list('sound/soundscape/drum1.ogg')
@@ -74,6 +71,11 @@
 	ceiling = CEILING_REINFORCED_METAL
 	base_lighting_alpha = 0
 
+/area/shuttle/drop2/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
+
 /area/shuttle/drop2/sulaco
 	name = "\improper Dropship Normandy"
 	icon_state = "shuttle"
@@ -114,12 +116,6 @@
 	name = "\improper Normandy Landing Zone"
 	icon_state = "away2"
 
-
-/area/shuttle/drop2/Enter(atom/movable/O, atom/oldloc)
-	if(istype(O, /obj/structure/barricade))
-		return FALSE
-	return TRUE
-
 /area/shuttle/drop3
 	//soundscape_playlist = list('sound/soundscape/drum1.ogg')
 	soundscape_interval = 30 //seconds
@@ -128,6 +124,11 @@
 	ceiling = CEILING_REINFORCED_METAL
 	base_lighting_alpha = 0
 
+/area/shuttle/drop3/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
+
 /area/shuttle/drop3/sulaco
 	name = "\improper Dropship Saipan"
 	icon_state = "shuttle"

code/game/gamemodes/extended/extended.dm

@@ -8,7 +8,7 @@
 	var/next_research_allocation = 0
 	taskbar_icon = 'icons/taskbar/gml_colonyrp.png'
 
-/datum/game_mode/announce()
+/datum/game_mode/extended/announce()
 	to_world("<B>The current game mode is - Extended!</B>")
 
 /datum/game_mode/extended/get_roles_list()

code/game/jobs/whitelist.dm

@@ -21,14 +21,6 @@
 	if(player.check_whitelist_status(WHITELIST_FAX_RESPONDER))
 		LAZYADD(., "responder")
 
-/client/load_player_data_info(datum/entity/player/player)
-	. = ..()
-
-	if(isSenator(src))
-		add_verb(src, /client/proc/whitelist_panel)
-	if(isCouncil(src))
-		add_verb(src, /client/proc/other_records)
-
 /client
 	var/datum/whitelist_panel/wl_panel
 

code/game/machinery/OpTable.dm

@@ -171,10 +171,6 @@
 	else if(ismob(A))
 		..()
 
-/obj/structure/machinery/optable/power_change()
-	..()
-	update_icon()
-
 /obj/structure/machinery/optable/update_icon()
 	if(inoperable())
 		icon_state = "table2-idle"

code/game/machinery/air_alarm.dm

@@ -106,11 +106,13 @@
 	var/apply_danger_level = 1
 	var/post_alert = 1
 
-
-
 /obj/structure/machinery/alarm/Initialize(mapload, direction, building = 0)
 	. = ..()
 
+	set_frequency(frequency)
+	if (!master_is_operating())
+		elect_master()
+
 	if(building)
 		if(loc)
 			forceMove(loc)
@@ -133,7 +135,6 @@
 
 	first_run()
 
-
 /obj/structure/machinery/alarm/proc/first_run()
 	alarm_area = get_area(src)
 	area_uid = alarm_area.uid
@@ -148,13 +149,6 @@
 	TLV["pressure"] = list(ONE_ATMOSPHERE*0.80,ONE_ATMOSPHERE*0.90,ONE_ATMOSPHERE*1.10,ONE_ATMOSPHERE*1.20) /* kpa */
 	TLV["temperature"] = list(T0C-26, T0C, T0C+40, T0C+66) // K
 
-
-/obj/structure/machinery/alarm/Initialize()
-	. = ..()
-	set_frequency(frequency)
-	if (!master_is_operating())
-		elect_master()
-
 /obj/structure/machinery/alarm/Destroy()
 	if(alarm_area.master_air_alarm == src)
 		alarm_area.master_air_alarm = null
@@ -1017,10 +1011,6 @@ table tr:first-child th:first-child { border: none;}
 
 	return ..()
 
-/obj/structure/machinery/alarm/power_change()
-	..()
-	update_icon()
-
 /obj/structure/machinery/alarm/get_examine_text(mob/user)
 	. = ..()
 	if (buildstage < 2)