mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 22:47:59 +01:00
Removes the ERP system because it has bugs in it/generates runtimes and I don't feel like maintaining/expanding it. If any of the other coders want to, they can re-add it.
Converts the metadata system into its own thing Makes ghost_ears hear emotes as well as a test. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3392 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -115,7 +115,6 @@ datum/preferences
|
||||
|
||||
|
||||
// Naughty.
|
||||
allow_ERP = 0
|
||||
ERP_Notes = ""
|
||||
|
||||
|
||||
@@ -147,8 +146,7 @@ datum/preferences
|
||||
dat += "<b>Ghost ears:</b> <a href=\"byond://?src=\ref[user];preferences=1;ghost_ears=input\"><b>[ghost_ears == 0 ? "Nearest Creatures" : "All Speech"]</b></a><br>"
|
||||
|
||||
|
||||
if(config.allow_ERP)
|
||||
dat += "<b>Allow ERP?</b> <a href='byond://?src=\ref[user];preferences=1;ERP=input'>[allow_ERP == 1 ? "Yes" : "No"]</a><br>"
|
||||
if(config.allow_Metadata)
|
||||
dat += "<b>OOC Notes/ERP Preferences:</b> <a href='byond://?src=\ref[user];preferences=1;OOC=input'> Edit </a><br>"
|
||||
|
||||
|
||||
@@ -429,8 +427,6 @@ datum/preferences
|
||||
if("random")
|
||||
age = rand (20, 45)
|
||||
|
||||
if(link_tags["ERP"])
|
||||
allow_ERP = !allow_ERP
|
||||
|
||||
if(link_tags["OOC"])
|
||||
var/tempnote = ""
|
||||
|
||||
@@ -60,7 +60,6 @@ datum/preferences/proc/savefile_save(mob/user)
|
||||
F["ooccolor"] << src.ooccolor
|
||||
F["lastchangelog"] << src.lastchangelog
|
||||
|
||||
F["allow_ERP"] << src.allow_ERP
|
||||
F["ERP_Notes"] << src.ERP_Notes
|
||||
|
||||
return 1
|
||||
@@ -128,11 +127,8 @@ datum/preferences/proc/savefile_load(mob/user)
|
||||
F["job_engsec_med"] >> src.job_engsec_med
|
||||
F["job_engsec_low"] >> src.job_engsec_low
|
||||
|
||||
F["allow_ERP"] >> src.allow_ERP
|
||||
F["ERP_Notes"] >> src.ERP_Notes
|
||||
|
||||
if(isnull(allow_ERP))
|
||||
allow_ERP = 0
|
||||
if(isnull(ERP_Notes))
|
||||
ERP_Notes = ""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user