mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 20:15:47 +01:00
Memory Expansion! New memories, and prisoners are tattoo'd to the degree of their crime. (#72457)
## About The Pull Request ### New Memories - Added a memory for catching a fish - Added a memory of who turned you into a revolutionary, this might be very cool later on for mindreading purposes - Added a memory for infusing with something ### Prisoner Tats - Prisoner backgrounds now come with a certain amount of tattoos depending on what you did. Negligence? Zero tats. <details> <summary>Mass Murderer?</summary> BECOME https://youtu.be/7xUtZzLBV5c?t=73 </details> - Because I wanted someone covered head to toe in tats, there is now a "Mass Murderer" background that comes with 6 tattoos, one for each limb. ## Why It's Good For The Game ## Changelog 🆑 add: Some prisoner backgrounds have more or less tattoos. add: More Memories to collect involving fishing and getting converted /🆑
This commit is contained in:
@@ -18,3 +18,128 @@
|
||||
return FALSE
|
||||
|
||||
return istype(preferences.get_highest_priority_job(), /datum/job/prisoner)
|
||||
|
||||
/// Types of Crimes Prisoners will have on their record roundstart.
|
||||
/// (They also can choose Random, which picks from these options... randomly!)
|
||||
GLOBAL_LIST_INIT(prisoner_crimes, init_prisoner_crimes())
|
||||
|
||||
/proc/init_prisoner_crimes()
|
||||
var/list/instances = list()
|
||||
for(var/datum/prisoner_crime/crime as anything in subtypesof(/datum/prisoner_crime))
|
||||
crime = new crime()
|
||||
instances[crime.name] = crime
|
||||
return instances
|
||||
|
||||
/datum/prisoner_crime
|
||||
/// crime name
|
||||
var/name = "Bugged the Game"
|
||||
/// what the record will say about the crime
|
||||
var/desc = "Engaged in widespread gamebreaking, didn't report on Github. By the way, report this on Github!"
|
||||
/// how many tattoos come from the crime. People who committed murder have more than tax evaders!
|
||||
var/tattoos = -1
|
||||
|
||||
/datum/prisoner_crime/New()
|
||||
. = ..()
|
||||
if(tattoos == -1)
|
||||
tattoos = 1
|
||||
stack_trace("\"[src]\" prisoner_crime does not have a set amount of tattoos!")
|
||||
|
||||
/datum/prisoner_crime/negligence
|
||||
name = "Abhorrent Criminal Negligence"
|
||||
desc = "Incompetently risked numerous lives."
|
||||
tattoos = 0
|
||||
|
||||
/datum/prisoner_crime/cloning
|
||||
name = "Attempted Development of Cloning"
|
||||
desc = "Attempted illegal research in the cloning sphere. Cloning, cloning construction, and cloning-related R&D was outlawed in 2560."
|
||||
tattoos = 0
|
||||
|
||||
/datum/prisoner_crime/attempted_murder
|
||||
name = "Attempted Murder"
|
||||
desc = "Attempted to maliciously kill someone."
|
||||
tattoos = 2
|
||||
|
||||
/datum/prisoner_crime/bio_terrorism
|
||||
name = "Biological Terrorism"
|
||||
desc = "Created and or released a lethal biological agent/lifeform."
|
||||
tattoos = 3
|
||||
|
||||
/datum/prisoner_crime/classified
|
||||
name = "Classified"
|
||||
desc = "Consult Legal."
|
||||
tattoos = 0
|
||||
|
||||
/datum/prisoner_crime/espionage
|
||||
name = "Corporate Espionage"
|
||||
desc = "Conducted espionage against Nanotrasen for commercial purposes."
|
||||
tattoos = 1
|
||||
|
||||
/datum/prisoner_crime/counterfeiting
|
||||
name = "Counterfeiting"
|
||||
desc = "Engaged in widespread fraud."
|
||||
tattoos = 1
|
||||
|
||||
/datum/prisoner_crime/enemy_of_the_corp
|
||||
name = "Enemy of the Corporation"
|
||||
desc = "Acted as, or knowingly aided, an enemy of Nanotrasen."
|
||||
tattoos = 1
|
||||
|
||||
/datum/prisoner_crime/grand_sabo
|
||||
name = "Grand Sabotage"
|
||||
desc = "Engaged in malicious destructive actions, seriously threatening Nanotrasen employees and or infrastructure."
|
||||
tattoos = 2
|
||||
|
||||
/datum/prisoner_crime/grand_theft
|
||||
name = "Grand Theft"
|
||||
desc = "Stole items of high value or sensitive nature."
|
||||
tattoos = 1
|
||||
|
||||
/datum/prisoner_crime/identity_theft
|
||||
name = "Identity Theft of High-Ranking Figure"
|
||||
desc = "Impersonated a high-ranking figure."
|
||||
tattoos = 0 //well, obviously can't impersonate people with tats. if they want to go back to doing that
|
||||
|
||||
/datum/prisoner_crime/kidnapping
|
||||
name = "Kidnapping"
|
||||
desc = "Planned and executed a kidnapping."
|
||||
tattoos = 1
|
||||
|
||||
/datum/prisoner_crime/malpractice
|
||||
name = "Medical Malpractice"
|
||||
desc = "Engaged in organ harvesting, limb theft, or other malicious medical procedures."
|
||||
tattoos = 2
|
||||
|
||||
/datum/prisoner_crime/murder
|
||||
name = "Murder"
|
||||
desc = "Maliciously killed someone."
|
||||
tattoos = 3
|
||||
|
||||
/datum/prisoner_crime/mutiny
|
||||
name = "Mutiny"
|
||||
desc = "Attempted to overthrow/subvert Chain of Command."
|
||||
tattoos = 5 //+rep for trying
|
||||
|
||||
/datum/prisoner_crime/other
|
||||
name = "Other"
|
||||
desc = "Consult Legal."
|
||||
tattoos = 1
|
||||
|
||||
/datum/prisoner_crime/ai_tampering
|
||||
name = "Tampering of Artificial Intelligence"
|
||||
desc = "Uploaded malicious, negligent, or otherwise blacklisted directives to an Artificial Intelligence."
|
||||
tattoos = 3
|
||||
|
||||
/datum/prisoner_crime/tax_evasion
|
||||
name = "Tax Evasion"
|
||||
desc = "Outstanding amount of tax evasion."
|
||||
tattoos = 1
|
||||
|
||||
/datum/prisoner_crime/cultist
|
||||
name = "Worship of Blacklisted Deities"
|
||||
desc = "Practiced worship of blacklisted deities."
|
||||
tattoos = 1
|
||||
|
||||
/datum/prisoner_crime/mass_murder
|
||||
name = "Mass Murder"
|
||||
desc = "Maliciously planned and executed the slaughter of many people."
|
||||
tattoos = 6
|
||||
|
||||
Reference in New Issue
Block a user