From 21ae24c0837d0ec24be0e202d9871f52caf67add Mon Sep 17 00:00:00 2001 From: "VivianFoxfoot@gmail.com" Date: Sun, 1 Apr 2012 17:32:42 +0000 Subject: [PATCH] Makes allow_ERP for a player start off by default. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3388 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/mob_ERP.dm | 2 +- code/modules/mob/new_player/preferences.dm | 2 +- code/modules/mob/new_player/savefile.dm | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/mob_ERP.dm b/code/modules/mob/mob_ERP.dm index 29209b5c5ca..22eb64feaf7 100644 --- a/code/modules/mob/mob_ERP.dm +++ b/code/modules/mob/mob_ERP.dm @@ -805,7 +805,7 @@ var/list/ERPVerbs = typesof(/client/ERP/command/proc/) -/* TODO: Finish these. +/* TODO: Finish these. Add vore by request. /client/ERP/command/proc/ERP_Kiss() set name = "Kiss" set desc = "The loving part." diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 6c2c077d34a..60bd4f97cf2 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -115,7 +115,7 @@ datum/preferences // Naughty. - allow_ERP = 1 + allow_ERP = 0 ERP_Notes = "" diff --git a/code/modules/mob/new_player/savefile.dm b/code/modules/mob/new_player/savefile.dm index 57917f35abe..6328e1b291d 100644 --- a/code/modules/mob/new_player/savefile.dm +++ b/code/modules/mob/new_player/savefile.dm @@ -131,6 +131,11 @@ datum/preferences/proc/savefile_load(mob/user) 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 = "" + //NOTE: Conversion things go inside this if statement //When updating the save file remember to add 1 to BOTH the savefile constants //Also take the old conversion things that no longer apply out of this if