Darkpack Pull 3/23/2026

code/__DEFINES/~darkpack/guestbook.dm

@@ -7,3 +7,5 @@
 #define GUESTBOOK_DEPARTMENT (1 << 2)
 /// We will not be known by others, even if they pass checks in any way otherwise
 #define GUESTBOOK_FORGETMENOT (1 << 3)
+
+#define GET_GUESTBOOK_NAME(mob, guest) (mob?.mind?.guestbook?.get_known_name(mob, guest) ? mob?.mind?.guestbook?.get_known_name(mob, guest) : guest.name)

code/controllers/subsystem/persistence/_persistence.dm

@@ -94,8 +94,6 @@ SUBSYSTEM_DEF(persistence)
 		for(var/datum/transport_controller/linear/tram/transport as anything in SStransport.transports_by_type[TRANSPORT_TYPE_TRAM])
 			save_tram_history(transport.specific_transport_id)
 		save_tram_counter()
-	save_guestbooks() // DARKPACK EDIT ADD
-
 
 ///Loads up Poly's speech buffer.
 /datum/controller/subsystem/persistence/proc/load_poly()

code/controllers/subsystem/ticker.dm

@@ -377,6 +377,7 @@ SUBSYSTEM_DEF(ticker)
 
 		iter_human.increment_scar_slot()
 		iter_human.load_persistent_scars()
+		iter_human.load_guestbook() // DARKPACK EDIT ADDITION
 
 		if(!iter_human.hardcore_survival_score)
 			continue

code/datums/emotes.dm

@@ -149,22 +149,22 @@
 					runechat_flags = EMOTE_MESSAGE,
 				)
 			else if(is_important)
-				to_chat(viewer, span_emote("<b>[user]</b>[space][msg]"))
+				to_chat(viewer, span_emote("<b>[GET_GUESTBOOK_NAME(viewer, user)]</b>[space][msg]")) // DARKPACK EDIT, ORIGINAL: to_chat(viewer, span_emote("<b>[user]</b> [msg]"))
 			else if(is_audible && is_visual)
 				viewer.show_message(
-					span_emote("<b>[user]</b>[space][msg]"), MSG_AUDIBLE,
-					span_emote("You see how <b>[user]</b>[space][msg]"), MSG_VISUAL,
+					span_emote("<b>[GET_GUESTBOOK_NAME(viewer, user)]</b>[space][msg]"), MSG_AUDIBLE, // DARKPACK EDIT, ORIGINAL: span_emote("<b>[user]</b> [msg]"), MSG_AUDIBLE,
+					span_emote("You see how <b>[GET_GUESTBOOK_NAME(viewer, user)]</b>[space][msg]"), MSG_VISUAL, // DARKPACK EDIT, ORIGINAL: span_emote("You see how <b>[user]</b> [msg]"), MSG_VISUAL,
 				)
 			else if(is_audible)
-				viewer.show_message(span_emote("<b>[user]</b>[space][msg]"), MSG_AUDIBLE)
+				viewer.show_message(span_emote("<b>[GET_GUESTBOOK_NAME(viewer, user)]</b>[space][msg]"), MSG_AUDIBLE) // DARKPACK EDIT, ORIGINAL: viewer.show_message(span_emote("<b>[user]</b> [msg]"), MSG_AUDIBLE)
 			else if(is_visual)
-				viewer.show_message(span_emote("<b>[user]</b>[space][msg]"), MSG_VISUAL)
+				viewer.show_message(span_emote("<b>[GET_GUESTBOOK_NAME(viewer, user)]</b>[space][msg]"), MSG_VISUAL) // DARKPACK EDIT, ORIGINAL: viewer.show_message(span_emote("<b>[user]</b> [msg]"), MSG_VISUAL)
 		return // Early exit so no dchat message
 
 	// The emote has some important information, and should always be shown to the user
 	else if(is_important)
 		for(var/mob/viewer as anything in viewers(user))
-			to_chat(viewer, span_emote("<b>[user]</b>[space][msg]"))
+			to_chat(viewer, span_emote("<b>[GET_GUESTBOOK_NAME(viewer, user)]</b>[space][msg]")) // DARKPACK EDIT, ORIGINAL: to_chat(viewer, span_emote("<b>[user]</b>[space][msg]"))
 			if(user.runechat_prefs_check(viewer, EMOTE_MESSAGE))
 				viewer.create_chat_message(
 					speaker = user,
@@ -198,12 +198,13 @@
 		CRASH("Emote [type] has no valid emote type set!")
 
 	if(!isnull(user.client))
-		var/dchatmsg = "<b>[user]</b>[space][msg]"
+		// var/dchatmsg = "<b>[user]</b>[space][msg]" // DARKPACK EDIT REMOVAL
 		for(var/mob/ghost as anything in GLOB.dead_mob_list - viewers(get_turf(user)))
 			if(isnull(ghost.client) || isnewplayer(ghost))
 				continue
 			if(!(get_chat_toggles(ghost.client) & CHAT_GHOSTSIGHT))
 				continue
+			var/dchatmsg = "<b>[GET_GUESTBOOK_NAME(ghost, user)]</b>[space][msg]" // DARKPACK EDIT ADDITION
 			to_chat(ghost, span_emote("[FOLLOW_LINK(ghost, user)][space][dchatmsg]"))
 	// DARKPACK EDIT CHANGE END
 

code/game/objects/items/storage/boxes/fishing_boxes.dm

@@ -46,7 +46,7 @@
 	icon_state = "plasticbox"
 	foldable_result = null
 	illustration = "fish"
-	custom_price = PAYCHECK_CREW * 9
+	custom_price = 120 // DARKPACK EDIT CHANGE - ECONOMY
 	storage_type = /datum/storage/box/fishing_lures
 
 /obj/item/storage/box/fishing_lures/PopulateContents()

code/game/say.dm

@@ -168,13 +168,12 @@ GLOBAL_LIST_INIT(freqtospan, list(
 	if(ismob(src) && ishuman(reliable_narrator) && (namepart != "Unknown"))
 		var/mob/receiver_mob = src
 		if(receiver_mob.mind?.guestbook)
-			var/mob/living/carbon/human/speaker_human = reliable_narrator
-			var/known_name = receiver_mob.mind.guestbook.get_known_name(src, reliable_narrator, speaker_human.real_name)
+			var/known_name = GET_GUESTBOOK_NAME(receiver_mob, reliable_narrator)
 			if(known_name)
 				namepart = "[known_name]"
 			else
-				var/mob/living/carbon/human/human_narrator = reliable_narrator
-				namepart = "[human_narrator.get_generic_name(prefixed = TRUE, lowercase = TRUE)]"
+				var/mob/living/living_narrator = reliable_narrator
+				namepart = "[living_narrator.get_generic_name(prefixed = TRUE, lowercase = TRUE)]"
 
 	if(text2num(radio_freq) >= USABLE_RADIO_FREQUENCY_FOR_PHONE_RANGE)
 		var/icon/phone_icon = icon('modular_darkpack/modules/phones/icons/chat_icon.dmi', "phone")

code/modules/client/preferences/names.dm

@@ -46,7 +46,7 @@
 
 /datum/preference/name/real_name/apply_to_human(mob/living/carbon/human/target, value)
 	target.real_name = value
-	target.name = value
+	target.update_visible_name() // DARKPACK EDIT, ORIGINAL: target.name = value
 	target.log_mob_tag("TAG: [target.tag] RENAMED: [key_name(target)]")
 
 /datum/preference/name/real_name/create_informed_default_value(datum/preferences/preferences)

code/modules/fishing/bait.dm

@@ -49,17 +49,20 @@
 	name = "can o' worm"
 	desc = "This can got worms."
 	bait_type = /obj/item/food/bait/worm
+	custom_price = 12 // DARKPACK EDIT ADD - ECONOMY
 
 /obj/item/bait_can/worm/premium
 	name = "can o' worm deluxe"
 	desc = "This can got fancy worms."
 	bait_type = /obj/item/food/bait/worm/premium
+	custom_price = 20 // DARKPACK EDIT ADD - ECONOMY
 
 /obj/item/bait_can/super_baits
 	name = "can o' super-baits"
 	desc = "This can got the nectar of god."
 	bait_type = /obj/item/food/bait/doughball/synthetic/super
 	uses_left = 12
+	custom_price = 30 // DARKPACK EDIT ADD - ECONOMY
 
 /obj/item/fishing_lure
 	name = "fishing lure"
@@ -72,6 +75,7 @@
 	 * This is passed down to the fishing rod, and then to the lure during the minigame.
 	 */
 	var/spin_frequency = list(2 SECONDS, 3 SECONDS)
+	custom_price = 10 // DARKPACK EDIT ADD - ECONOMY
 
 /obj/item/fishing_lure/Initialize(mapload)
 	. = ..()

code/modules/fishing/fishing_equipment.dm

@@ -95,6 +95,7 @@
 	wiki_desc = "Automatically starts the minigame and helps guide the bait a little. It also spin fishing lures for you without need of an input. \
 		It can also be used to snag in objects from a distance and throw them in your direction.<br>\
 		<b>It requires the Advanced Fishing Technology Node to be researched to be printed.</b>"
+	custom_price = 60
 
 /obj/item/fishing_line/auto_reel/Initialize(mapload)
 	. = ..()

code/modules/mob/dead/new_player/new_player.dm

@@ -250,6 +250,7 @@
 
 		humanc.increment_scar_slot()
 		humanc.load_persistent_scars()
+		humanc.load_guestbook() // DARKPACK EDIT ADDITION
 
 		if(GLOB.curse_of_madness_triggered)
 			give_madness(humanc, GLOB.curse_of_madness_triggered)

code/modules/mob/living/carbon/human/human_helpers.dm

@@ -70,9 +70,7 @@
 			return "[face_name] (as [id_name])"
 
 	// DARKPACK EDIT ADD START
-	var/known_name
-	if(!face_name)
-		known_name = examiner?.mind?.guestbook?.get_known_name(examiner, src, real_name)
+	var/known_name = face_name ? null : (examiner ? GET_GUESTBOOK_NAME(examiner, src) : null)
 	// DARKPACK EDIT ADD END
 
 	// Just go down the list of stuff we recorded

code/modules/mob/mob.dm

@@ -293,15 +293,22 @@
 	var/space = should_have_space_before_emote(html_decode(message)[1]) ? " " : "" // DARKPACK EDIT ADD
 	if(visible_message_flags & WITH_EMPHASIS_MESSAGE)
 		message = apply_message_emphasis(message)
+	/* // DARKPACK EDIT REMOVAL START
 	if(visible_message_flags & EMOTE_MESSAGE)
-		message = span_emote("<b>[src]</b>[space][message]") // DARKPACK EDIT CHANGE, ORIGINAL: message = span_emote("<b>[src]</b> [message]")
+		message = span_emote("<b>[src]</b> [message]")
+	*/ // DARKPACK EDIT REMOVAL END
 
 	for(var/mob/hearing_mob as anything in hearers)
 		if(!hearing_mob?.client)
 			continue
 		if(self_message && hearing_mob == src)
 			continue
 
+		// DARKPACK EDIT ADDITION START
+		if(visible_message_flags & EMOTE_MESSAGE)
+			message = span_emote("<b>[GET_GUESTBOOK_NAME(hearing_mob, src)]</b>[space][message]")
+		// DARKPACK EDIT ADDITION END
+
 		//This entire if/else chain could be in two lines but isn't for readibilties sake.
 		var/msg = message
 		var/msg_type = MSG_VISUAL
@@ -336,7 +343,7 @@
 	if(visible_message_flags & WITH_EMPHASIS_MESSAGE)
 		self_message = apply_message_emphasis(self_message)
 	if(visible_message_flags & EMOTE_MESSAGE)
-		self_message = span_emote("<b>[src]</b>[space][self_message]") // May make more sense as "You do x" // DARKPACK EDIT CHANGE, ORIGINAL: self_message = span_emote("<b>[src]</b> [self_message]")
+		self_message = span_emote("<b>[real_name]</b>[space][self_message]") // May make more sense as "You do x" // DARKPACK EDIT CHANGE, ORIGINAL: self_message = span_emote("<b>[src]</b> [self_message]")
 
 	if(visible_message_flags & ALWAYS_SHOW_SELF_MESSAGE)
 		to_chat(src, self_message, avoid_highlighting = block_self_highlight)
@@ -365,13 +372,19 @@
 	var/space = should_have_space_before_emote(html_decode(message)[1]) ? " " : "" // DARKPACK EDIT ADD
 	if(audible_message_flags & WITH_EMPHASIS_MESSAGE)
 		message = apply_message_emphasis(message)
+	/* // DARKPACK EDIT REMOVAL START
 	if(audible_message_flags & EMOTE_MESSAGE)
-		message = span_emote("<b>[src]</b>[space][message]") // DARKPACK EDIT CHANGE, ORIGINAL: message = span_emote("<b>[src]</b> [message]")
+		message = span_emote("<b>[src]</b> [message]")
+	*/ // DARKPACK EDIT REMOVAL END
 	for(var/mob/hearing_mob as anything in hearers)
 		if(!hearing_mob?.client)
 			continue
 		if(self_message && hearing_mob == src)
 			continue
+		// DARKPACK EDIT ADDITION START
+		if(audible_message_flags & EMOTE_MESSAGE)
+			message = span_emote("<b>[GET_GUESTBOOK_NAME(hearing_mob, src)]</b>[space][message]")
+		// DARKPACK EDIT ADDITION END
 		if(audible_message_flags & EMOTE_MESSAGE && runechat_prefs_check(hearing_mob, audible_message_flags) && !HAS_TRAIT(hearing_mob, TRAIT_DEAF))
 			hearing_mob.create_chat_message(src, raw_message = raw_msg, runechat_flags = audible_message_flags)
 		hearing_mob.show_message(message, MSG_AUDIBLE, deaf_message, MSG_VISUAL)
@@ -398,7 +411,7 @@
 	if(audible_message_flags & WITH_EMPHASIS_MESSAGE)
 		self_message = apply_message_emphasis(self_message)
 	if(audible_message_flags & EMOTE_MESSAGE)
-		self_message = span_emote("<b>[src]</b>[space][self_message]") // DARKPACK EDIT CHANGE, ORIGINAL: self_message = span_emote("<b>[src]</b> [self_message]")
+		self_message = span_emote("<b>[GET_GUESTBOOK_NAME(src, src)]</b>[space][self_message]") // DARKPACK EDIT CHANGE, ORIGINAL: self_message = span_emote("<b>[src]</b> [self_message]")
 
 	if(audible_message_flags & ALWAYS_SHOW_SELF_MESSAGE)
 		to_chat(src, self_message, avoid_highlighting = block_self_highlight)

config/darkpack_config.txt

@@ -37,3 +37,5 @@ EXTRA_SAVE_SLOTS_BYOND_MEMBER 5
 LOG_STATS
 
 #HUMANITY_SUNLIGHT_RESISTANCE
+
+#EXTRA_ISSUE_URLS https://github.com/DarkPack13/SecondCity

html/changelogs/AutoChangeLog-pr-793.yml

@@ -0,0 +1,4 @@
+author: "LucifersCoils"
+delete-after: True
+changes:
+  - balance: "Anyone can now bash doors, but bashing a reinforced door is extra difficult."

html/changelogs/archive/2026-03.yml

@@ -288,3 +288,28 @@
   - code_imp: Reimplemented permanent ghouling and embracing
   minzeyes, XeonMations:
   - rscadd: Reimplements Vicissitude
+2026-03-23:
+  FalloutFalcon:
+  - rscadd: Fishing supplies can now be found in camping and hardware stores
+  - qol: You can now choose to report a bug upstream when making an issue report
+  - admin: All Second City verbs sorted into their own catagory
+  - admin: Setting starlight is R_ADMIN instead of R_FUN
+  - qol: Auras now layer underneath the mob
+  - code_imp: Fetches enlightenment directly from Path.
+  - bugfix: lock/unlock of doors displays as a notice (blue)
+  - refactor: Cleans up some syntax on splat helpers
+  - code_imp: List index for stats was made its type instead of a type as a string
+  LucifersCoils:
+  - spellcheck: Renamed Metis to Crinos
+  Marshmellow105:
+  - bugfix: endron bouncers now wear the correct uniforms, camarilla bouncers now
+      wear red turtlenecks and armoured vests
+  - rscadd: black, blue, and green variants of barstools
+  XeonMations:
+  - bugfix: Fixed some guestbook related bugs
+  chazzyjazzy:
+  - balance: finance rolls for selling clothes are now much more fair
+  dwinters99:
+  - rscadd: Melpominee
+  - code_imp: Moves Emotion to /mob
+  - code_imp: Proc to convert Emotion to a quality (i.e. Afraid -> fear)

interface/interface.dm

@@ -69,11 +69,21 @@
 	set name = "report-issue"
 	set desc = "Report an issue"
 
-	var/githuburl = CONFIG_GET(string/githuburl)
-	if(!githuburl)
+	// DARKPACK EDIT CHANGE START
+	// "our" url, all other ones should be upstreams
+	var/main_url = CONFIG_GET(string/githuburl)
+	var/all_options = CONFIG_GET(str_list/extra_issue_urls)
+	all_options |= main_url
+
+	if(!all_options || !length(all_options))
 		to_chat(src, span_danger("The Github URL is not set in the server configuration."))
 		return
 
+	var/githuburl = tgui_input_list(src, "Choose a codebase to report the issue to", "Choose Codebase", all_options, main_url)
+	if(!githuburl)
+		return
+	// DARKPACK EDIT CHANGE END
+
 	var/testmerge_data = GLOB.revdata.testmerge
 	var/has_testmerge_data = (length(testmerge_data) != 0)
 
@@ -93,16 +103,32 @@
 	var/client_version = "[byond_version].[byond_build]"
 	concatable += ("&reporting-version=" + client_version)
 
+	// DARKPACK EDIT CHANGE START
+	var/server_name = CONFIG_GET(string/servername)
+	var/server_link
+	if(server_name)
+		server_link = "\[[server_name]\]([main_url])"
+	else
+		server_link = main_url // Someone forgot to set a config or your in a dev enviro
+
 	// the way it works is that we use the ID's that are baked into the template YML and replace them with values that we can collect in game.
-	if(GLOB.round_id)
-		concatable += ("&round-id=" + GLOB.round_id)
+	if(githuburl == main_url) // Why would we report the url when its the same server lol
+		if(GLOB.round_id)
+			concatable += ("&round-id=" + GLOB.round_id)
+	else
+		if(GLOB.round_id)
+			concatable += ("&round-id=[server_link] [GLOB.round_id]")
+		else
+			// Likely a dev enviroment or db is down, still worth noting.
+			concatable += ("&round-id=[server_link]")
+	// DARKPACK EDIT CHANGE END
 
 	// Insert testmerges
 	if(has_testmerge_data)
 		var/list/all_tms = list()
 		for(var/entry in testmerge_data)
 			var/datum/tgs_revision_information/test_merge/tm = entry
-			all_tms += "- \[[tm.title]\]([githuburl]/pull/[tm.number])"
+			all_tms += "- \[[tm.title]\]([main_url]/pull/[tm.number])" // DARKPACK EDIT CHANGE
 		var/all_tms_joined = jointext(all_tms, "\n")
 
 		concatable += ("&test-merges=" + url_encode(all_tms_joined))

modular_darkpack/master_files/code/controllers/configuration/entries/general.dm

@@ -10,5 +10,10 @@
 /datum/config_entry/string/githuburl
 	default = "https://github.com/DarkPack13/SecondCity"
 
+// We have an upstream where we can be pretty confident often that its there instead. Makes it easier to report.
+/datum/config_entry/str_list/extra_issue_urls // Not an existing override, bite me.
+	default = list("https://github.com/DarkPack13/SecondCity")
+	dupes_allowed = FALSE
+
 /datum/config_entry/flag/disable_ghost_looc
 	default = TRUE

modular_darkpack/master_files/code/datums/mind/_mind.dm

@@ -5,6 +5,8 @@
 /datum/mind/New(_key)
 	. = ..()
 	guestbook = new()
+	if(current?.real_name)
+		LAZYADDASSOC(guestbook.known_names, current.real_name, current.real_name)
 
 /datum/mind/Destroy()
 	QDEL_NULL(guestbook)

modular_darkpack/master_files/code/modules/mob/living/carbon/human/human_defines.dm

@@ -2,7 +2,7 @@
 	// Humans have a default bloodpool of 10
 	maxbloodpool = 10
 	bloodpool = 10
-
+	mob_flags = MOB_HAS_SCREENTIPS_NAME_OVERRIDE
 	// NPC humans get the area of effect, player humans dont.
 	var/violation_aoe = FALSE
 	/// List of ownership types the player has claimed keys for (e.g., "apartment", "car")