From 61d90a6c75b02237e9c8e4b02c166b551fa8c33d Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 21 May 2016 00:06:56 -0400 Subject: [PATCH 1/5] Species heat/cold messages, allows prometheans --- .../living/carbon/human/species/station/prometheans.dm | 2 +- .../mob/living/carbon/human/species/station/station.dm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index 2ada0dd7c7..0ee2540796 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -22,7 +22,7 @@ var/datum/species/shapeshifter/promethean/prometheans push_flags = MONKEY|SLIME|SIMPLE_ANIMAL flags = NO_SCAN | NO_SLIP | NO_MINOR_CUT appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | RADIATION_GLOWS - spawn_flags = SPECIES_IS_RESTRICTED + spawn_flags = SPECIES_IS_WHITELISTED //VOREStation Edit breath_type = null poison_type = null diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index b9e10e5077..92c96e23b9 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -62,14 +62,14 @@ reagent_tag = IS_UNATHI base_color = "#066000" - heat_discomfort_level = 295 + //heat_discomfort_level = 295 //VOREStation Removal heat_discomfort_strings = list( "You feel soothingly warm.", "You feel the heat sink into your bones.", "You feel warm enough to take a nap." ) - cold_discomfort_level = 292 + //cold_discomfort_level = 292 //VOREStation Removal cold_discomfort_strings = list( "You feel chilly.", "You feel sluggish and cold.", @@ -124,13 +124,13 @@ reagent_tag = IS_TAJARA - heat_discomfort_level = 292 + //heat_discomfort_level = 292 //VOREStation Removal heat_discomfort_strings = list( "Your fur prickles in the heat.", "You feel uncomfortably warm.", "Your overheated skin itches." ) - cold_discomfort_level = 275 + //cold_discomfort_level = 275 //VOREStation Removal /datum/species/tajaran/equip_survival_gear(var/mob/living/carbon/human/H) ..() From 79cf3390ccd45c7ef25bf6e0b29bc838550a0322 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 21 May 2016 11:44:05 -0400 Subject: [PATCH 2/5] Fixes #140 Plays sound to prey directly (might be too loud? Edit if so.) --- code/modules/vore/eating/belly_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/vore/eating/belly_vr.dm b/code/modules/vore/eating/belly_vr.dm index d4d9d4e7fe..0981ed7258 100644 --- a/code/modules/vore/eating/belly_vr.dm +++ b/code/modules/vore/eating/belly_vr.dm @@ -374,3 +374,4 @@ var/strsound = pick(struggle_sounds) playsound(R.loc, strsound, 50, 1) + R << strsound //Might be too loud. We'll see. From 232dd87922e1cfcd4f6921a13c689daa65761911 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 21 May 2016 11:49:45 -0400 Subject: [PATCH 3/5] Fixes #133 Removes reagent tag so reagents treat them as humans. --- .../mob/living/carbon/human/species/station/station.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 92c96e23b9..889f019aa0 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -59,7 +59,7 @@ flesh_color = "#34AF10" - reagent_tag = IS_UNATHI + //reagent_tag = IS_UNATHI //VOREStation Removal base_color = "#066000" //heat_discomfort_level = 295 //VOREStation Removal @@ -122,7 +122,7 @@ flesh_color = "#AFA59E" base_color = "#333333" - reagent_tag = IS_TAJARA + //reagent_tag = IS_TAJARA //VOREStation Removal //heat_discomfort_level = 292 //VOREStation Removal heat_discomfort_strings = list( @@ -162,7 +162,7 @@ blood_color = "#1D2CBF" base_color = "#006666" - reagent_tag = IS_SKRELL + //reagent_tag = IS_SKRELL //VOREStation Removal has_limbs = list( BP_TORSO = list("path" = /obj/item/organ/external/chest), From 10030a30fd46e335256b6c3253d7b8aae778ce19 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 21 May 2016 12:31:37 -0400 Subject: [PATCH 4/5] Fixes #132 As message. --- code/modules/client/preference_setup/general/01_basic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm index 2588836df5..c99d0d860a 100644 --- a/code/modules/client/preference_setup/general/01_basic.dm +++ b/code/modules/client/preference_setup/general/01_basic.dm @@ -105,7 +105,7 @@ datum/preferences/proc/set_biological_gender(var/gender) return TOPIC_REFRESH else if(href_list["metadata"]) - var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , pref.metadata)) as message|null + var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , pref.metadata) as message|null) as message|null if(new_metadata && CanUseTopic(user)) pref.metadata = sanitize(new_metadata) return TOPIC_REFRESH From 803dff61f35635f06760bcd73dccb14341522213 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 21 May 2016 12:32:21 -0400 Subject: [PATCH 5/5] Fixes #134 --- code/modules/mob/new_player/sprite_accessories_vr.dm | 5 +++-- code/modules/vore/appearance/update_icons_vr.dm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 4a4d418d13..8ea9c6e090 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -5,6 +5,9 @@ // would require us to exclude that datum from the global list. /datum/sprite_accessory/hair + + species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren") //This lets all races use the default hairstyles. + sergal_plain name = "Sergal Plain" icon = 'icons/mob/human_face_vr.dmi' @@ -29,8 +32,6 @@ icon_state = "serg_fairytail" species_allowed = list("Sergal") - species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren") //This lets all races use the default hairstyles. - bald name = "Bald" icon_state = "bald" diff --git a/code/modules/vore/appearance/update_icons_vr.dm b/code/modules/vore/appearance/update_icons_vr.dm index a8fa51b06b..381b045615 100644 --- a/code/modules/vore/appearance/update_icons_vr.dm +++ b/code/modules/vore/appearance/update_icons_vr.dm @@ -2,7 +2,7 @@ #define isTaurTail(A) istype(A, /datum/sprite_accessory/tail/taur) /mob/living/carbon/human/proc/get_ears_overlay() - if(ear_style && !(head && (head.flags_inv & BLOCKHEADHAIR)) && (src.species.get_bodytype() in ear_style.species_allowed)) + if(ear_style && !(head && (head.flags_inv & BLOCKHEADHAIR))) var/icon/ears_s = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.icon_state) if(ear_style.do_colouration) ears_s.Blend(rgb(src.r_hair, src.g_hair, src.b_hair), ear_style.color_blend_mode)