From 3cd660d79dc6f22741fbe75a7e73f714629d4b50 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 18 May 2016 01:36:14 -0400 Subject: [PATCH] Fixes synths and sets null post-load prefs Fixes digestion button missing, and synths overheating in a belly, and synth custom species --- code/modules/mob/living/carbon/human/examine.dm | 7 ++++--- code/modules/mob/living/carbon/human/life.dm | 1 - code/modules/organs/robolimbs.dm | 3 +-- code/modules/organs/robolimbs_vr.dm | 2 +- code/modules/vore/eating/living_vr.dm | 3 +++ code/modules/vore/eating/vore_vr.dm | 5 +++++ 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index b8c822daf6..f5904e317f 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -41,7 +41,10 @@ var/is_synth = isSynthetic() if(!(skipjumpsuit && skipface)) - if(is_synth) + if(src.custom_species) + msg += ", a [src.custom_species]" + + else if(is_synth) var/use_gender = "a synthetic" if(gender == MALE) use_gender = "an android" @@ -50,8 +53,6 @@ msg += ", [use_gender]!" - else if(src.custom_species) - msg += ", a [src.custom_species]" else if(species.name != "Human") msg += ", \a [species.get_examine_name()]!" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 61540e990f..0b9dcc333f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -563,7 +563,6 @@ /mob/living/carbon/human/handle_environment(datum/gas_mixture/environment) if(!environment) return - if(isliving(loc)) return //VOREStation Code - Ignore environments inside people //Stuff like the xenomorph's plasma regen happens here. species.handle_environment_special(src) diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 5008fc3a6f..e54598d23e 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -6,8 +6,7 @@ var/datum/robolimb/basic_robolimb basic_robolimb = new() for(var/limb_type in typesof(/datum/robolimb)) var/datum/robolimb/R = new limb_type() - if(!R.unavailable_to_produce) //VOREStation Edit - all_robolimbs[R.company] = R + all_robolimbs[R.company] = R if(!R.unavailable_at_chargen) chargen_robolimbs[R.company] = R diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index f0547fc49c..032db60bd8 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -8,4 +8,4 @@ icon = 'icons/mob/human_races/cyberlimbs/kitsuhana.dmi' includes_tail = 1 unavailable_to_produce = 1 - //unavailable_at_chargen = 1 \ No newline at end of file + unavailable_at_chargen = 1 diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 051c30fbe1..1bc4917ab7 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -360,6 +360,9 @@ // Magical pred-air breathing for inside preds // overrides a proc defined on atom called by breathe.dm // +/mob/living/return_air() + return return_air_for_internal_lifeform() + /mob/living/return_air_for_internal_lifeform() //Free air until someone wants to code processing it for reals from predbreaths var/datum/gas_mixture/belly_air/air = new(1000) diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index c4157d2cb2..dda25f84ba 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -102,6 +102,11 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE S["digestable"] >> digestable S["belly_prefs"] >> belly_prefs + if(isnull(digestable)) + digestable = 1 + if(isnull(belly_prefs)) + belly_prefs = list() + return 1 /datum/vore_preferences/proc/save_vore()