From 9c32a6dc0ad9ac8aad2cf551b28b37121c7c74a6 Mon Sep 17 00:00:00 2001 From: Leshana Date: Fri, 9 Jun 2017 16:21:01 -0400 Subject: [PATCH] Fixes un-sanitized preferences runtimes * Puts back in code that sanitized preferences after loading, it was overwritten in polaris sync commit 3f1e5c80f25af98e27be802cb06a218026a33769 * Also removes a VOREStation Edit comment on lines that were no longer different from Polaris, introduced at the same time. * Fixes Runtime in 02_language.dm,21: Cannot read null.language --- code/modules/client/preferences.dm | 2 ++ code/modules/xenoarcheaology/artifacts/replicator.dm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3489b25d8c..ef5f7af0f9 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -243,6 +243,7 @@ datum/preferences load_preferences() load_character() attempt_vr(client.prefs_vr,"load_vore","") //VOREStation Edit + sanitize_preferences() else if(href_list["load"]) if(!IsGuestKey(usr.key)) open_load_dialog(usr) @@ -250,6 +251,7 @@ datum/preferences else if(href_list["changeslot"]) load_character(text2num(href_list["changeslot"])) attempt_vr(client.prefs_vr,"load_vore","") //VOREStation Edit + sanitize_preferences() close_load_dialog(usr) else if(href_list["resetslot"]) if("No" == alert("This will reset the current slot. Continue?", "Reset current slot?", "No", "Yes")) diff --git a/code/modules/xenoarcheaology/artifacts/replicator.dm b/code/modules/xenoarcheaology/artifacts/replicator.dm index ef00d5db1b..2e3f9e8874 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator.dm @@ -63,7 +63,7 @@ /obj/item/weapon/wrench, /obj/item/weapon/screwdriver, /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/metalfoam) // Vorestation edit for vore mimic. + /obj/item/weapon/grenade/chem_grenade/metalfoam) var/quantity = rand(5, 15) for(var/i=0, i