cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further fixes

Browse Source 
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
This commit is contained in:
Arokha Sieyes
2017-02-21 14:15:59 -05:00
parent dcfa4014a7
commit dd733371bc
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/client/preference_setup/vore/04_resleeving.dm
View File

@@ -30,8 +30,8 @@
/datum/category_item/player_setup_item/vore/resleeve/content(var/mob/user) /datum/category_item/player_setup_item/vore/resleeve/content(var/mob/user)
. += "<br>" . += "<br>"
. += "<b>Start With Scan:</b> <a [pref.resleeve_scan ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_resleeve_scan=1'><b>[pref.resleeve_scan ? "Yes" : "No"]</b></a><br>" . += "<b>Start With Body Scan:</b> <a [pref.resleeve_scan ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_resleeve_scan=1'><b>[pref.resleeve_scan ? "Yes" : "No"]</b></a><br>"
. += "<b>Resleeving Lock:</b> <a [pref.resleeve_lock ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_resleeve_lock=1'><b>[pref.resleeve_lock ? "Yes" : "No"]</b></a><br>" . += "<b>Prevent Body Impersonation:</b> <a [pref.resleeve_lock ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_resleeve_lock=1'><b>[pref.resleeve_lock ? "Yes" : "No"]</b></a><br>"
/datum/category_item/player_setup_item/vore/resleeve/OnTopic(var/href, var/list/href_list, var/mob/user) /datum/category_item/player_setup_item/vore/resleeve/OnTopic(var/href, var/list/href_list, var/mob/user)
if(href_list["toggle_resleeve_lock"]) if(href_list["toggle_resleeve_lock"])

2
code/modules/resleeving/infocore.dm
View File

@@ -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/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/list/organ_data = list(O_HEART, O_EYES, O_LUNGS, O_BRAIN)
var/toocomplex var/toocomplex
var/sizemult
/datum/transhuman/body_record/New(var/mob/living/carbon/human/M,var/add_to_db = 1,var/ckeylock = 0) /datum/transhuman/body_record/New(var/mob/living/carbon/human/M,var/add_to_db = 1,var/ckeylock = 0)
ASSERT(M) 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 speciesname = M.custom_species ? M.custom_species : M.dna.species
bodygender = M.gender bodygender = M.gender
body_oocnotes = M.ooc_notes body_oocnotes = M.ooc_notes
sizemult = M.size_multiplier
//Probably should //Probably should
M.dna.check_integrity() M.dna.check_integrity()

3
code/modules/resleeving/machines.dm
View File

@@ -88,6 +88,7 @@
update_icon() update_icon()
H.ooc_notes = current_project.body_oocnotes H.ooc_notes = current_project.body_oocnotes
H.flavor_texts = R.flavor.Copy() H.flavor_texts = R.flavor.Copy()
H.size_multiplier = current_project.sizemult
H.suiciding = 0 H.suiciding = 0
attempting = 0 attempting = 0
return 1 return 1
@@ -250,6 +251,8 @@
H.adjustBruteLoss(20) H.adjustBruteLoss(20)
H.adjustFireLoss(20) H.adjustFireLoss(20)
H.size_multiplier = current_project.sizemult
//Cha-ching. //Cha-ching.
stored_material[DEFAULT_WALL_MATERIAL] -= body_cost stored_material[DEFAULT_WALL_MATERIAL] -= body_cost
stored_material["glass"] -= body_cost stored_material["glass"] -= body_cost

1
vorestation.dme
View File

@@ -1246,6 +1246,7 @@
#include "code\modules\client\preference_setup\occupation\occupation.dm" #include "code\modules\client\preference_setup\occupation\occupation.dm"
#include "code\modules\client\preference_setup\skills\skills.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\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\03_egg.dm"
#include "code\modules\client\preference_setup\vore\04_resleeving.dm" #include "code\modules\client\preference_setup\vore\04_resleeving.dm"
#include "code\modules\clothing\chameleon.dm" #include "code\modules\clothing\chameleon.dm"