cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #124 from VOREStation/heatfix

Browse Source 
Initial Simple Fixes
This commit is contained in:
Arokha Sieyes
2016-05-21 13:20:12 -04:00
parent 71366311f3 803dff61f3
commit adace754f0
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/client/preference_setup/general/01_basic.dm
View File

@@ -105,7 +105,7 @@ datum/preferences/proc/set_biological_gender(var/gender)
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["metadata"]) 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)) if(new_metadata && CanUseTopic(user))
pref.metadata = sanitize(new_metadata) pref.metadata = sanitize(new_metadata)
return TOPIC_REFRESH return TOPIC_REFRESH

2
code/modules/mob/living/carbon/human/species/station/prometheans.dm
View File

@@ -22,7 +22,7 @@ var/datum/species/shapeshifter/promethean/prometheans
push_flags = MONKEY|SLIME|SIMPLE_ANIMAL push_flags = MONKEY|SLIME|SIMPLE_ANIMAL
flags = NO_SCAN | NO_SLIP | NO_MINOR_CUT flags = NO_SCAN | NO_SLIP | NO_MINOR_CUT
appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | RADIATION_GLOWS 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 breath_type = null
poison_type = null poison_type = null

14
code/modules/mob/living/carbon/human/species/station/station.dm
View File

@@ -59,17 +59,17 @@
flesh_color = "#34AF10" flesh_color = "#34AF10"
reagent_tag = IS_UNATHI //reagent_tag = IS_UNATHI //VOREStation Removal
base_color = "#066000" base_color = "#066000"
heat_discomfort_level = 295 //heat_discomfort_level = 295 //VOREStation Removal
heat_discomfort_strings = list( heat_discomfort_strings = list(
"You feel soothingly warm.", "You feel soothingly warm.",
"You feel the heat sink into your bones.", "You feel the heat sink into your bones.",
"You feel warm enough to take a nap." "You feel warm enough to take a nap."
) )
cold_discomfort_level = 292 //cold_discomfort_level = 292 //VOREStation Removal
cold_discomfort_strings = list( cold_discomfort_strings = list(
"You feel chilly.", "You feel chilly.",
"You feel sluggish and cold.", "You feel sluggish and cold.",
@@ -122,15 +122,15 @@
flesh_color = "#AFA59E" flesh_color = "#AFA59E"
base_color = "#333333" base_color = "#333333"
reagent_tag = IS_TAJARA //reagent_tag = IS_TAJARA //VOREStation Removal
heat_discomfort_level = 292 //heat_discomfort_level = 292 //VOREStation Removal
heat_discomfort_strings = list( heat_discomfort_strings = list(
"Your fur prickles in the heat.", "Your fur prickles in the heat.",
"You feel uncomfortably warm.", "You feel uncomfortably warm.",
"Your overheated skin itches." "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) /datum/species/tajaran/equip_survival_gear(var/mob/living/carbon/human/H)
..() ..()
@@ -162,7 +162,7 @@
blood_color = "#1D2CBF" blood_color = "#1D2CBF"
base_color = "#006666" base_color = "#006666"
reagent_tag = IS_SKRELL //reagent_tag = IS_SKRELL //VOREStation Removal
has_limbs = list( has_limbs = list(
BP_TORSO = list("path" = /obj/item/organ/external/chest), BP_TORSO = list("path" = /obj/item/organ/external/chest),

5
code/modules/mob/new_player/sprite_accessories_vr.dm
View File

@@ -5,6 +5,9 @@
// would require us to exclude that datum from the global list. // would require us to exclude that datum from the global list.
/datum/sprite_accessory/hair /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 sergal_plain
name = "Sergal Plain" name = "Sergal Plain"
icon = 'icons/mob/human_face_vr.dmi' icon = 'icons/mob/human_face_vr.dmi'
@@ -29,8 +32,6 @@
icon_state = "serg_fairytail" icon_state = "serg_fairytail"
species_allowed = list("Sergal") 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 bald
name = "Bald" name = "Bald"
icon_state = "bald" icon_state = "bald"

2
code/modules/vore/appearance/update_icons_vr.dm
View File

@@ -2,7 +2,7 @@
#define isTaurTail(A) istype(A, /datum/sprite_accessory/tail/taur) #define isTaurTail(A) istype(A, /datum/sprite_accessory/tail/taur)
/mob/living/carbon/human/proc/get_ears_overlay() /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) var/icon/ears_s = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.icon_state)
if(ear_style.do_colouration) if(ear_style.do_colouration)
ears_s.Blend(rgb(src.r_hair, src.g_hair, src.b_hair), ear_style.color_blend_mode) ears_s.Blend(rgb(src.r_hair, src.g_hair, src.b_hair), ear_style.color_blend_mode)

1
code/modules/vore/eating/belly_vr.dm
View File

@@ -374,3 +374,4 @@
var/strsound = pick(struggle_sounds) var/strsound = pick(struggle_sounds)
playsound(R.loc, strsound, 50, 1) playsound(R.loc, strsound, 50, 1)
R << strsound //Might be too loud. We'll see.