From dd733371bcfa446b34282fa73a92cf9f7bd2205b Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Tue, 21 Feb 2017 14:15:59 -0500 Subject: [PATCH] Further fixes Apparently the weight prefs were accidentally removed (this also fixes size prefs when spawning), fixes size when resleeving, renames char setup options to be more explanatory --- code/modules/client/preference_setup/vore/04_resleeving.dm | 4 ++-- code/modules/resleeving/infocore.dm | 2 ++ code/modules/resleeving/machines.dm | 3 +++ vorestation.dme | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/vore/04_resleeving.dm b/code/modules/client/preference_setup/vore/04_resleeving.dm index cf63cf091c..36d82ae0fd 100644 --- a/code/modules/client/preference_setup/vore/04_resleeving.dm +++ b/code/modules/client/preference_setup/vore/04_resleeving.dm @@ -30,8 +30,8 @@ /datum/category_item/player_setup_item/vore/resleeve/content(var/mob/user) . += "
" - . += "Start With Scan: [pref.resleeve_scan ? "Yes" : "No"]
" - . += "Resleeving Lock: [pref.resleeve_lock ? "Yes" : "No"]
" + . += "Start With Body Scan: [pref.resleeve_scan ? "Yes" : "No"]
" + . += "Prevent Body Impersonation: [pref.resleeve_lock ? "Yes" : "No"]
" /datum/category_item/player_setup_item/vore/resleeve/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["toggle_resleeve_lock"]) diff --git a/code/modules/resleeving/infocore.dm b/code/modules/resleeving/infocore.dm index 18f7dbf359..b989e4f5ae 100644 --- a/code/modules/resleeving/infocore.dm +++ b/code/modules/resleeving/infocore.dm @@ -139,6 +139,7 @@ var/datum/transhuman/infocore/transcore = new/datum/transhuman/infocore var/list/limb_data = list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO) var/list/organ_data = list(O_HEART, O_EYES, O_LUNGS, O_BRAIN) var/toocomplex + var/sizemult /datum/transhuman/body_record/New(var/mob/living/carbon/human/M,var/add_to_db = 1,var/ckeylock = 0) ASSERT(M) @@ -156,6 +157,7 @@ var/datum/transhuman/infocore/transcore = new/datum/transhuman/infocore speciesname = M.custom_species ? M.custom_species : M.dna.species bodygender = M.gender body_oocnotes = M.ooc_notes + sizemult = M.size_multiplier //Probably should M.dna.check_integrity() diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 0abf435dc3..bd746a080f 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -88,6 +88,7 @@ update_icon() H.ooc_notes = current_project.body_oocnotes H.flavor_texts = R.flavor.Copy() + H.size_multiplier = current_project.sizemult H.suiciding = 0 attempting = 0 return 1 @@ -250,6 +251,8 @@ H.adjustBruteLoss(20) H.adjustFireLoss(20) + H.size_multiplier = current_project.sizemult + //Cha-ching. stored_material[DEFAULT_WALL_MATERIAL] -= body_cost stored_material["glass"] -= body_cost diff --git a/vorestation.dme b/vorestation.dme index 46163e6593..b25c759bfc 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1246,6 +1246,7 @@ #include "code\modules\client\preference_setup\occupation\occupation.dm" #include "code\modules\client\preference_setup\skills\skills.dm" #include "code\modules\client\preference_setup\vore\01_ears.dm" +#include "code\modules\client\preference_setup\vore\02_size.dm" #include "code\modules\client\preference_setup\vore\03_egg.dm" #include "code\modules\client\preference_setup\vore\04_resleeving.dm" #include "code\modules\clothing\chameleon.dm"