yeet gandalf broke my shitcode + a runtime fix (#8837)

This commit is contained in:
Seris02
2021-10-15 13:03:05 -04:00
committed by GitHub
parent 0d5eb8a0c4
commit 1fc674a3d8
2 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -535,7 +535,7 @@
screenmob.client.screen += H.r_store
//SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM
if(H.client.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
if(H.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
if(H.vagina)
H.vagina.screen_loc = ui_vagina
screenmob.client.screen += H.vagina
@@ -88,9 +88,11 @@
if (part in mutant_bodyparts)
mutant_bodyparts -= part
else
mutant_bodyparts[part] = list()
var/datum/preference/choiced/name = GLOB.preference_entries_by_key["feature_[part]"]
var/datum/preference/tri_color/color = GLOB.preference_entries_by_key["[part]_color"]
if (isnull(name) || isnull(color))
return
mutant_bodyparts[part] = list()
mutant_bodyparts[part][MUTANT_INDEX_NAME] = read_preference(name.type)
mutant_bodyparts[part][MUTANT_INDEX_COLOR_LIST] = read_preference(color.type)
if (istype(preference, /datum/preference/choiced))