From b963efb953d866187d4bc1dac9a058a8b0126334 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 24 Nov 2023 01:03:11 +0100 Subject: [PATCH] [MIRROR] Gives roundstart prisoners a key memory of what their crime is [MDB IGNORE] (#25205) * Gives roundstart prisoners a key memory of what their crime is (#79881) ## About The Pull Request Says it on the tin, roundstart permabrig prisoners a key memory so they can remember what crime they committed. ![image](https://github.com/tgstation/tgstation/assets/58376695/325dbd36-bc24-43ea-8f64-1fcf5d613e5f) ## Why It's Good For The Game Prisoners typically remember why they are locked in a jail forever. Also, if you have the "random" crime selected in your preferences, sometimes you can forget what crime you committed if you missed it at the start of the round. ## Changelog :cl: qol: gives roundstart prisoners a key memory of what their crime is /:cl: * Gives roundstart prisoners a key memory of what their crime is --------- Co-authored-by: die_amond <58376695+dieamond13@users.noreply.github.com> --- code/datums/memory/key_memories.dm | 22 ++++++++++++++++++++++ code/modules/jobs/job_types/prisoner.dm | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/code/datums/memory/key_memories.dm b/code/datums/memory/key_memories.dm index 5cc581f14c7..d777df72e38 100644 --- a/code/datums/memory/key_memories.dm +++ b/code/datums/memory/key_memories.dm @@ -191,3 +191,25 @@ "[protagonist_name] being implanted by a scientist.", "[protagonist_name] having surgery done on them by a scientist.", ) + +/datum/memory/key/permabrig_crimes + var/crimes + +/datum/memory/key/permabrig_crimes/New( + datum/mind/memorizer_mind, + atom/protagonist, + atom/deuteragonist, + atom/antagonist, + crimes, +) + src.crimes = crimes + return ..() + +/datum/memory/key/permabrig_crimes/get_names() + return list("[protagonist_name]'s crime of \"[crimes]\".") + +/datum/memory/key/permabrig_crimes/get_starts() + return list( + "[protagonist_name] being arrested by security for [crimes].", + "[protagonist_name] committing the crimes of [crimes].", + ) diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 33369d44ce4..cf4c9f65910 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -45,6 +45,7 @@ var/datum/crime/past_crime = new(crime.name, crime.desc, "Central Command", "Indefinite.") target_record.crimes += past_crime to_chat(crewmember, span_warning("You are imprisoned for \"[crime_name]\".")) + crewmember.add_mob_memory(/datum/memory/key/permabrig_crimes, crimes = crime_name) /datum/outfit/job/prisoner name = "Prisoner" @@ -69,7 +70,6 @@ if(!crime_name) return var/datum/prisoner_crime/crime = GLOB.prisoner_crimes[crime_name] - var/list/limbs_to_tat = new_prisoner.bodyparts.Copy() for(var/i in 1 to crime.tattoos) if(!length(SSpersistence.prison_tattoos_to_use) || visualsOnly)