diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index cba9e44ecde..2115b5e68e6 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -388,7 +388,7 @@ if(!L.client.ambience_playing && L && L.client && (L.client.prefs.sound & SOUND_BUZZ)) //split off the white noise from the rest of the ambience because of annoyance complaints - Kluys L.client.ambience_playing = 1 L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2) - else L.client.ambience_playing = 0 + else if (L && L.client && !(L.client.prefs.sound & SOUND_BUZZ)) L.client.ambience_playing = 0 if(prob(35) && !newarea.media_source && L && L.client && (L.client.prefs.sound & SOUND_AMBIENCE)) // TODO: This is dumb. - N3X diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 32541587e28..fd41c77e985 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -291,6 +291,9 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha src << "\blue You have accumulated [src.mind.vampire.bloodtotal] [src.mind.vampire.bloodtotal > 1 ? "units" : "unit"] of blood[src.mind.vampire.bloodusable != bloodusable ?", and have [src.mind.vampire.bloodusable] left to use" : "."]" check_vampire_upgrade(mind) H.vessel.remove_reagent("blood",25) + if(ishuman(src)) + var/mob/living/carbon/human/V = src + V.nutrition += blood src.mind.vampire.draining = null src << "\blue You stop draining [H.name] of blood." diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 29b3ccc999e..77e005c0422 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -996,7 +996,7 @@ datum/preferences if(species == "Human") s_tone = random_skin_tone() if("s_color") - if(species == "Unathi" || species == "Tajaran" || species == "Skrell") + if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People") r_skin = rand(0,255) g_skin = rand(0,255) b_skin = rand(0,255) @@ -1202,7 +1202,7 @@ datum/preferences s_tone = 35 - max(min( round(new_s_tone), 220),1) if("skin") - if(species == "Unathi" || species == "Tajaran" || species == "Skrell") + if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People") var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference") as color|null if(new_skin) r_skin = hex2num(copytext(new_skin, 2, 4)) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index fa020cd646b..663a624b6c8 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -544,6 +544,8 @@ name = "Slime People" default_language = "Galactic Common" language = "Bubblish" + icobase = 'icons/mob/human_races/r_slime.dmi' + deform = 'icons/mob/human_races/r_slime.dmi' path = /mob/living/carbon/human/slime primitive = /mob/living/carbon/slime unarmed_type = /datum/unarmed_attack/punch diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 5092f9ed310..1cd6338a51c 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -463,7 +463,7 @@ datum reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) // Vampires have their powers weakened by holy water applied to the skin. if(ishuman(M)) - if((M.mind in ticker.mode.vampires)) + if((M.mind in ticker.mode.vampires) && !(VAMP_FULL in M.mind.vampire.powers)) var/mob/living/carbon/human/H=M if(method == TOUCH) if(H.wear_mask) @@ -1474,7 +1474,8 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(prob(50)) M.heal_organ_damage(1,0) - M.nutrition += nutriment_factor // For hunger and fatness + if(!(M.mind in ticker.mode.vampires)) + M.nutrition += nutriment_factor // For hunger and fatness ..() return diff --git a/icons/mob/human_races/r_slime.dmi b/icons/mob/human_races/r_slime.dmi index 80aa2fa0982..7fa8ecf8748 100644 Binary files a/icons/mob/human_races/r_slime.dmi and b/icons/mob/human_races/r_slime.dmi differ