Merge branch 'master' into special-fran

Author: FalloutFalcon

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)