Merge branch 'develop' of https://github.com/AlbertNanotracen/Monkest…

…ation2.0 into develop

.github/workflows/auto_changelog.yml

@@ -21,4 +21,4 @@ jobs:
         script: |
           const { processAutoChangelog } = await import('${{ github.workspace }}/tools/pull_request_hooks/autoChangelog.js')
           await processAutoChangelog({ github, context })
-        github-token: ${{ secrets.COMFY_ORANGE_PAT || secrets.GITHUB_TOKEN }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/compile_changelogs.yml

@@ -51,4 +51,4 @@ jobs:
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: ad-m/github-push-action@master
         with:
-          github_token: ${{ secrets.COMFY_ORANGE_PAT || secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.vscode/launch.json

@@ -8,6 +8,13 @@
 			"preLaunchTask": "Build All",
 			"dmb": "${workspaceFolder}/${command:CurrentDMB}"
 		},
+		{
+			"type": "byond",
+			"request": "launch",
+			"name": "Launch DreamSeeker (low memory mode)",
+			"preLaunchTask": "Build All (low memory mode)",
+			"dmb": "${workspaceFolder}/${command:CurrentDMB}"
+		},
 		{
 			"type": "byond",
 			"request": "launch",
@@ -16,6 +23,14 @@
 			"dmb": "${workspaceFolder}/${command:CurrentDMB}",
 			"dreamDaemon": true
 		},
+		{
+			"type": "byond",
+			"request": "launch",
+			"name": "Launch DreamDaemon (low memory mode)",
+			"preLaunchTask": "Build All (low memory mode)",
+			"dmb": "${workspaceFolder}/${command:CurrentDMB}",
+			"dreamDaemon": true
+		},
 		{
 			"name": "Debug External Libraries",
 			"type": "cppvsdbg",
@@ -27,6 +42,18 @@
 				"-trusted"
 			],
 			"preLaunchTask": "Build All"
+		},
+		{
+			"name": "Debug External Libraries (low memory mode)",
+			"type": "cppvsdbg",
+			"request": "launch",
+			"program": "${command:dreammaker.returnDreamDaemonPath}",
+			"cwd": "${workspaceRoot}",
+			"args": [
+				"${command:dreammaker.getFilenameDmb}",
+				"-trusted"
+			],
+			"preLaunchTask": "Build All (low memory mode)"
 		}
 	]
 }

.vscode/tasks.json

@@ -24,6 +24,30 @@
 			"dependsOn": "dm: reparse",
 			"label": "Build All"
 		},
+		{
+			"type": "process",
+			"command": "tools/build/build",
+			"args": ["-DLOWMEMORYMODE"],
+			"windows": {
+				"command": ".\\tools\\build\\build.bat",
+				"args": ["-DLOWMEMORYMODE"]
+			},
+			"options": {
+				"env": {
+					"DM_EXE": "${config:dreammaker.byondPath}"
+				}
+			},
+			"problemMatcher": [
+				"$dreammaker",
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": {
+				"kind": "build"
+			},
+			"dependsOn": "dm: reparse",
+			"label": "Build All (low memory mode)"
+		},
 		{
 			"type": "dreammaker",
 			"dme": "tgstation.dme",

code/__DEFINES/anomaly.dm

@@ -4,7 +4,7 @@
  */
 
 ///Time in ticks before the anomaly goes poof/explodes depending on type.
-#define ANOMALY_COUNTDOWN_TIMER (99 SECONDS)
+#define ANOMALY_COUNTDOWN_TIMER (200 SECONDS) // monke edit: 99 seconds -> 200 seconds
 
 /**
  * Nuisance/funny anomalies

code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm

@@ -35,7 +35,7 @@
 	/// Should we stop the current living movement attempt
 	#define COMSIG_MOB_CLIENT_BLOCK_PRE_LIVING_MOVE COMPONENT_MOVABLE_BLOCK_PRE_MOVE
 
-/// From base of /client/Move(): (list/move_args)
+/// From base of /client/Move(): (new_loc, direction)
 #define COMSIG_MOB_CLIENT_PRE_MOVE "mob_client_pre_move"
 	/// Should always match COMPONENT_MOVABLE_BLOCK_PRE_MOVE as these are interchangeable and used to block movement.
 	#define COMSIG_MOB_CLIENT_BLOCK_PRE_MOVE COMPONENT_MOVABLE_BLOCK_PRE_MOVE
@@ -140,6 +140,9 @@
 ///Mob is trying to open the wires of a target [/atom], from /datum/wires/interactable(): (atom/target)
 #define COMSIG_TRY_WIRES_INTERACT "try_wires_interact"
 	#define COMPONENT_CANT_INTERACT_WIRES (1<<0)
+///Mob is trying to emote, from /datum/emote/proc/run_emote(): (key, params, type_override, intentional)
+#define COMSIG_MOB_PRE_EMOTED "mob_pre_emoted"
+	#define COMPONENT_CANT_EMOTE (1<<0)
 #define COMSIG_MOB_EMOTED(emote_key) "mob_emoted_[emote_key]"
 ///sent when a mob/login() finishes: (client)
 #define COMSIG_MOB_CLIENT_LOGIN "comsig_mob_client_login"

code/__DEFINES/polls.dm

@@ -5,3 +5,14 @@
 #define POLLTYPE_RATING "NUMVAL"
 #define POLLTYPE_MULTI "MULTICHOICE"
 #define POLLTYPE_IRV "IRV"
+
+///The message sent when you sign up to a poll.
+#define POLL_RESPONSE_SIGNUP "signup"
+///The message sent when you've already signed up for a poll and are trying to sign up again.
+#define POLL_RESPONSE_ALREADY_SIGNED "already_signed"
+///The message sent when you are not signed up for a poll.
+#define POLL_RESPONSE_NOT_SIGNED "not_signed"
+///The message sent when you are too late to unregister from a poll.
+#define POLL_RESPONSE_TOO_LATE_TO_UNREGISTER "failed_unregister"
+///The message sent when you successfully unregister from a poll.
+#define POLL_RESPONSE_UNREGISTERED "unregistered"

code/__DEFINES/role_preferences.dm

@@ -39,7 +39,10 @@
 #define ROLE_SPACE_DRAGON "Space Dragon"
 #define ROLE_SPIDER "Spider"
 #define ROLE_WIZARD_MIDROUND "Wizard (Midround)"
-#define ROLE_DRIFTING_CONTRACTOR "Drifting Contractor" //monkestation edit
+// monke midrounds
+#define ROLE_DRIFTING_CONTRACTOR "Drifting Contractor"
+#define ROLE_FLORIDA_MAN "Florida Man"
+#define ROLE_SLASHER "Slasher"
 
 // Latejoin roles
 #define ROLE_HERETIC_SMUGGLER "Heretic Smuggler"
@@ -68,7 +71,6 @@
 #define ROLE_LAVALAND "Lavaland"
 #define ROLE_LAZARUS_BAD "Slaved Revived Mob"
 #define ROLE_LAZARUS_GOOD "Friendly Revived Mob"
-#define ROLE_SLASHER "Slasher"
 
 #define ROLE_CLOWN_OPERATIVE "Clown Operative"
 #define ROLE_FREE_GOLEM "Free Golem"
@@ -153,6 +155,8 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_DRIFTING_CONTRACTOR = 0,
 	ROLE_VAMPIRICACCIDENT = 0,
 	ROLE_MONSTERHUNTER = 0,
+	ROLE_SLASHER = 0,
+	ROLE_FLORIDA_MAN = 0,
 //monkestation edit end
 
 	// Latejoin

code/__DEFINES/span.dm

@@ -13,6 +13,9 @@
 #define span_alertwarning(str) ("<span class='alertwarning'>" + str + "</span>")
 #define span_alien(str) ("<span class='alien'>" + str + "</span>")
 #define span_announce(str) ("<span class='announce'>" + str + "</span>")
+#define span_announcement_header(str) ("<span class='announcement_header'>" + str + "</span>")
+#define span_average(str) ("<span class='average'" + str + "</span")
+#define span_bad(str) ("<span class='bad'" + str + "</span")
 #define span_big(str) ("<span class='big'>" + str + "</span>")
 #define span_bigicon(str) ("<span class='bigicon'>" + str + "</span>")
 #define span_binarysay(str) ("<span class='binarysay'>" + str + "</span>")
@@ -66,6 +69,7 @@
 #define span_interface(str) ("<span class='interface'>" + str + "</span>")
 #define span_linkify(str) ("<span class='linkify'>" + str + "</span>")
 #define span_looc(str) ("<span class='looc'>" + str + "</span>")
+#define span_major_announcement_text(str) ("<span class='major_announcement_text'>" + str + "</span>")
 #define span_medal(str) ("<span class='medal'>" + str + "</span>")
 #define span_medradio(str) ("<span class='medradio'>" + str + "</span>")
 #define span_memo(str) ("<span class='memo'>" + str + "</span>")

code/__DEFINES/~monkestation/dcs/signals/signals_item.dm

@@ -0,0 +1,6 @@
+/// Called before an item is compressed by a bluespace compression kit: (mob/user, obj/item/compression_kit/kit)
+#define COMSIG_ITEM_PRE_COMPRESS		"item_pre_compress"
+	#define COMPONENT_STOP_COMPRESSION	(1 << 0)
+	#define COMPONENT_HANDLED_MESSAGE	(1 << 1)
+/// Called after an item is compressed by a bluespace compression kit: (mob/user, obj/item/compression_kit/kit)
+#define COMSIG_ITEM_COMPRESSED			"item_compressed"

code/__DEFINES/~monkestation/traits.dm

@@ -16,3 +16,7 @@
 #define TRAIT_PERFECT_SURGEON "perfect_surgeon"
 /// Station trait for when the clown has bridge access *shudders*
 #define STATION_TRAIT_CLOWN_BRIDGE "clown_bridge"
+
+// /obj/item
+/// Whether a storage item can be compressed by the bluespace compression kit, without the usual storage limitation.
+#define TRAIT_BYPASS_COMPRESS_CHECK "can_compress_anyways"

code/__HELPERS/announcements.dm

@@ -0,0 +1,76 @@
+/**
+ * Sends a div formatted chat box announcement
+ *
+ * Formatted like:
+ *
+ * " Server Announcement " (or sender_override)
+ *
+ * " Title "
+ *
+ * " Text "
+ *
+ * Arguments
+ * * text - required, the text to announce
+ * * title - optional, the title of the announcement.
+ * * players - optional, a list of all players to send the message to. defaults to the entire world
+ * * play_sound - if TRUE, play a sound with the announcement (based on player option)
+ * * sound_override - optional, override the default announcement sound
+ * * sender_override - optional, modifies the sender of the announcement
+ * * encode_title - if TRUE, the title will be HTML encoded
+ * * encode_text - if TRUE, the text will be HTML encoded
+ * * color_override - optional, set a color for the announcement box
+ */
+
+/proc/send_formatted_announcement(
+	text,
+	title = "",
+	players,
+	play_sound = TRUE,
+	sound_override = 'sound/ai/default/attention.ogg',
+	sender_override = "Server Admin Announcement",
+	encode_title = TRUE,
+	encode_text = TRUE,
+	color_override = "grey",
+)
+	if(isnull(text))
+		return
+
+	var/list/announcement_strings = list()
+
+	if(encode_title && title && length(title) > 0)
+		title = html_encode(title)
+		if(encode_text)
+			text = html_encode(text)
+			if(!length(text))
+				return
+
+		announcement_strings += span_announcement_header(generate_unique_announcement_header(title, sender_override))
+		announcement_strings += span_major_announcement_text(text)
+		var/finalized_announcement = create_announcement_div(jointext(announcement_strings, ""), color_override)
+
+		if(islist(players))
+			for(var/mob/target in players)
+				to_chat(target, finalized_announcement)
+				if(play_sound && target.client?.prefs.read_preference(/datum/preference/toggle/sound_announcements))
+					SEND_SOUND(target, sound(sound_override))
+		else
+			to_chat(world, finalized_announcement)
+
+			if(!play_sound)
+				return
+
+			for(var/mob/player in GLOB.player_list)
+				if(player.client?.prefs.read_preference(/datum/preference/toggle/sound_announcements))
+					SEND_SOUND(player, sound(sound_override))
+
+/**
+ * Inserts a span styled message into an alert box div
+ *
+ *
+ * Arguments
+ * * message - required, the message contents
+ * * color - optional, set a div color other than default
+ */
+/proc/create_announcement_div(message, color = "default")
+	var/processed_message = "<div class='chat_alert_[color]'>[message]</div>"
+	return processed_message