cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2792 from VOREStation/aro-persistmessages

Browse Source 
Clean up persist messages in server log
This commit is contained in:
Arokha Sieyes
2018-01-18 18:11:53 -05:00
committed by GitHub
parent d9d0568db5 00b69ca913
commit cfe6c0f1f7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/persist/persist_vr.dm
+10 -10
View File
@@ -40,7 +40,7 @@
*/
/proc/prep_for_persist(var/mob/persister)
if(!istype(persister))
crash_with("prep_for_persist given non-mob [persister]")
crash_with("Persist (P4P): Given non-mob [persister].")
return
// Find out of this mob is a proper mob!
@@ -48,17 +48,17 @@
// Okay this mob has a real loaded-from-savefile mind in it!
var/datum/preferences/prefs = preferences_datums[persister.mind.loaded_from_ckey]
if(!prefs)
WARNING("mind [persister.mind] was loaded from ckey [persister.mind.loaded_from_ckey] but no prefs datum found")
WARNING("Persist (P4P): [persister.mind] was loaded from ckey [persister.mind.loaded_from_ckey] but no prefs datum found.")
return
// Okay, lets do a few checks to see if we should really save tho!
if(!prefs.load_character(persister.mind.loaded_from_slot))
WARNING("mind [persister.mind] was loaded from slot [persister.mind.loaded_from_slot] but loading prefs failed.")
WARNING("Persist (P4P): [persister.mind] was loaded from slot [persister.mind.loaded_from_slot] but loading prefs failed.")
return // Failed to load character
// For now as a safety measure we will only save if the name matches.
if(prefs.real_name != persister.real_name)
log_debug("Skipping persist for [persister] becuase [persister.real_name] != [prefs.real_name]")
log_debug("Persist (P4P): Skipping [persister] becuase ORIG:[persister.real_name] != CURR:[prefs.real_name].")
return
return prefs
@@ -74,12 +74,12 @@
/proc/persist_interround_data(var/mob/occupant, var/datum/spawnpoint/new_spawn_point_type)
if(!istype(occupant))
crash_with("persist_interround_data given non-mob [occupant]")
crash_with("Persist (PID): Given non-mob [occupant].")
return
var/datum/preferences/prefs = prep_for_persist(occupant)
if(!prefs)
WARNING("persist_interround_data failed to prep [occupant] for persisting")
WARNING("Persist (PID): Skipping [occupant] for persisting, as they have no prefs.")
return
//This one doesn't rely on persistence prefs
@@ -94,7 +94,7 @@
prefs.spawnpoint = initial(new_spawn_point_type.display_name)
if(ishuman(occupant) && occupant.stat != DEAD)
var/mob/living/carbon/human/H = occupant
testing("About to try saving stuff from [H] to [prefs] (\ref[prefs])")
testing("Persist (PID): Saving stuff from [H] to [prefs] (\ref[prefs]).")
if(prefs.persistence_settings & PERSIST_ORGANS)
apply_organs_to_prefs(H, prefs)
if(prefs.persistence_settings & PERSIST_MARKINGS)
@@ -225,14 +225,14 @@
*/
/proc/persist_nif_data(var/mob/living/carbon/human/H,var/datum/preferences/prefs)
if(!istype(H))
crash_with("persist_nif_data given a nonhuman: [H]")
crash_with("Persist (NIF): Given a nonhuman: [H]")
return
if(!prefs)
prefs = prep_for_persist(H)
if(!prefs)
WARNING("persist_nif_data failed to prep [H] for persisting")
WARNING("Persist (NIF): [H] has no prefs datum, skipping")
return
var/obj/item/device/nif/nif = H.nif
@@ -254,6 +254,6 @@
var/datum/category_item/player_setup_item/vore/nif/nif_prefs = vore_cat.items_by_name["NIF Data"]
var/savefile/S = new /savefile(prefs.path)
if(!S) WARNING ("Couldn't load NIF save savefile? [prefs.real_name]")
if(!S) WARNING ("Persist (NIF): Couldn't load NIF save savefile? [prefs.real_name]")
S.cd = "/character[prefs.default_slot]"
nif_prefs.save_character(S)