Merge branch 'master' into Heavy_armor

code/__DEFINES/tgs.dm

@@ -1,7 +1,7 @@
 // tgstation-server DMAPI
 // The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in IETF RFC 2119.
 
-#define TGS_DMAPI_VERSION "7.2.1"
+#define TGS_DMAPI_VERSION "7.3.0"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

code/__HELPERS/unsorted.dm

@@ -46,8 +46,8 @@
 #define format_frequency(f) "[floor((f) / 10)].[(f) % 10]"
 
 #define reverse_direction(direction) ( \
-											( dir & (NORTH|SOUTH) ? ~dir & (NORTH|SOUTH) : 0 ) | \
-											( dir & (EAST|WEST) ? ~dir & (EAST|WEST) : 0 ) \
+											( direction & (NORTH|SOUTH) ? ~direction & (NORTH|SOUTH) : 0 ) | \
+											( direction & (EAST|WEST) ? ~direction & (EAST|WEST) : 0 ) \
 										)
 
 // The sane, counter-clockwise angle to turn to get from /direction/ A to /direction/ B

code/game/jobs/job/command/cic/executive.dm

@@ -18,7 +18,8 @@
 	GLOB.marine_leaders -= JOB_XO
 
 AddTimelock(/datum/job/command/executive, list(
-	JOB_COMMAND_ROLES = 5 HOURS,
+	JOB_COMMAND_ROLES = 20 HOURS,
+	JOB_SQUAD_LEADER = 10 HOURS,
 ))
 
 /obj/effect/landmark/start/executive

code/game/objects/items/devices/defibrillator.dm

@@ -166,7 +166,7 @@
 
 	var/mob/dead/observer/G = H.get_ghost()
 	if(istype(G) && G.client)
-		playsound_client(G.client, 'sound/effects/revive_notify.ogg')
+		playsound_client(G.client, 'sound/effects/adminhelp_new.ogg')
 		to_chat(G, SPAN_BOLDNOTICE(FONT_SIZE_LARGE("Someone is trying to revive your body. Return to it if you want to be resurrected! \
 			(Verbs -> Ghost -> Re-enter corpse, or <a href='?src=\ref[G];reentercorpse=1'>click here!</a>)")))
 

code/modules/admin/admin_verbs.dm

@@ -142,7 +142,8 @@ GLOBAL_LIST_INIT(admin_verbs_minor_event, list(
 	/client/proc/toggle_hardcore_perma,
 	/client/proc/toggle_bypass_joe_restriction,
 	/client/proc/toggle_joe_respawns,
-	/datum/admins/proc/open_shuttlepanel
+	/datum/admins/proc/open_shuttlepanel,
+	/client/proc/get_whitelisted_clients,
 ))
 
 GLOBAL_LIST_INIT(admin_verbs_major_event, list(

code/modules/admin/tabs/event_tab.dm

@@ -42,6 +42,23 @@
 
 	CEI.handle_event_info_update(faction)
 
+/client/proc/get_whitelisted_clients()
+	set name = "Find Whitelisted Players"
+	set category = "Admin.Events"
+	if(!admin_holder)
+		return
+
+	var/flag = tgui_input_list(src, "Which flag?", "Whitelist Flags", GLOB.bitfields["whitelist_status"])
+
+	var/list/ckeys = list()
+	for(var/client/test_client in GLOB.clients)
+		if(test_client.check_whitelist_status(GLOB.bitfields["whitelist_status"][flag]))
+			ckeys += test_client.ckey
+	if(!length(ckeys))
+		to_chat(src, SPAN_NOTICE("There are no players with that whitelist online"))
+		return
+	to_chat(src, SPAN_NOTICE("Whitelist holders: [ckeys.Join(", ")]."))
+
 /client/proc/change_security_level()
 	if(!check_rights(R_ADMIN))
 		return

code/modules/mob/living/carbon/human/species/zombie.dm

@@ -127,7 +127,7 @@
 /datum/species/zombie/proc/handle_alert_ghost(mob/living/carbon/human/zombie)
 	var/mob/dead/observer/ghost = zombie.get_ghost()
 	if(ghost?.client)
-		playsound_client(ghost.client, 'sound/effects/revive_notify.ogg')
+		playsound_client(ghost.client, 'sound/effects/adminhelp_new.ogg')
 		to_chat(ghost, SPAN_BOLDNOTICE(FONT_SIZE_LARGE("Your body has risen! (Verbs -> Ghost -> Re-enter corpse, or <a href='?src=\ref[ghost];reentercorpse=1'>click here!</a>)")))
 
 /datum/species/zombie/proc/remove_from_revive(mob/living/carbon/human/zombie)

code/modules/reagents/chemistry_properties/prop_positive.dm

@@ -603,7 +603,7 @@
 		var/mob/dead/observer/ghost = dead.get_ghost()
 		if(ghost?.client)
 			COOLDOWN_START(src, ghost_notif, 30 SECONDS)
-			playsound_client(ghost.client, 'sound/effects/revive_notify.ogg')
+			playsound_client(ghost.client, 'sound/effects/adminhelp_new.ogg')
 			to_chat(ghost, SPAN_BOLDNOTICE("Your heart is struggling to pump! There is a chance you might get up!(Verbs -> Ghost -> Re-enter corpse, or <a href='?src=\ref[ghost];reentercorpse=1'>click here!</a>)"))
 	return TRUE
 

code/modules/shuttle/shuttles/crashable/escape_shuttle.dm

@@ -78,11 +78,11 @@
 			cryos += list(cryotube)
 	if (occupant_count > max_capacity)
 		playsound(src,'sound/effects/escape_pod_warmup.ogg', 50, 1)
+		mode = SHUTTLE_CRASHED
 		sleep(31)
 		var/turf/sploded = return_center_turf()
 		cell_explosion(sploded, 100, 20, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data("escape pod malfunction")) //Clears out walls
 		sleep(25)
-		mode = SHUTTLE_CRASHED
 		for(var/obj/structure/machinery/cryopod/evacuation/cryotube in cryos)
 			cryotube.go_out()
 		door_handler.control_doors("force-unlock")

code/modules/tgs/v5/__interop_version.dm

@@ -1 +1 @@
-"5.9.0"
+"5.10.0"

code/modules/tgs/v5/_defines.dm

@@ -95,6 +95,7 @@
 #define DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION "newServerVersion"
 #define DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE "broadcastMessage"
 
+#define DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT "clientCount"
 #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE "commandResponse"
 #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE "commandResponseMessage"
 #define DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES "chatResponses"

code/modules/tgs/v5/topic.dm

@@ -149,7 +149,9 @@
 		if(DMAPI5_TOPIC_COMMAND_HEALTHCHECK)
 			if(event_handler && event_handler.receive_health_checks)
 				event_handler.HandleEvent(TGS_EVENT_HEALTH_CHECK)
-			return TopicResponse()
+			var/list/health_check_response = TopicResponse()
+			health_check_response[DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT] = TGS_CLIENT_COUNT
+			return health_check_response;
 
 		if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH)
 			detached = FALSE

code/modules/tgs/v5/undefs.dm

@@ -18,7 +18,6 @@
 
 #undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER
 #undef DMAPI5_PARAMETER_CUSTOM_COMMANDS
-#undef DMAPI5_PARAMETER_TOPIC_PORT
 
 #undef DMAPI5_CHUNK
 #undef DMAPI5_CHUNK_PAYLOAD
@@ -95,6 +94,7 @@
 #undef DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION
 #undef DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE
 
+#undef DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT
 #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE
 #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE
 #undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES

html/changelogs/archive/2024-09.yml

@@ -11,3 +11,14 @@
       aesthetic upgrade.
   hislittlecuzingames:
   - qol: Deletes empty pill packets when dropped.
+2024-09-05:
+  benbot16:
+  - bugfix: Fixes stacking explosions in overloaded escape pods.
+  joookschad:
+  - sounddel: removed the new revive notification
+  realforest2001:
+  - rscadd: Added a staff event verb to check for a particular whitelist and report
+      online players that have it. Code for the proc from HarryOB
+2024-09-06:
+  hislittlecuzingames:
+  - config: Adjusted XO Hour Requirements.