From 5e68ee4bd8863551415295b81b1a6e115938cdd9 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 21 Apr 2015 19:55:32 -0400 Subject: [PATCH 1/5] Forgot this jeeze! --- code/modules/mob/living/carbon/species.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index ed59445f8b4..6801dc30432 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -543,6 +543,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 From 1cc53ab186c88324292ea61eaf3347795259842d Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 21 Apr 2015 20:00:19 -0400 Subject: [PATCH 2/5] Yeah and this too. --- code/modules/client/preferences.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 1597f152d7f..0f737fba217 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -994,7 +994,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) @@ -1200,7 +1200,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)) From 54d479e0ae34eb5d4db36f4ac70ab294b2922d74 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 21 Apr 2015 20:18:06 -0400 Subject: [PATCH 3/5] Skittles spritefail --- icons/mob/human_races/r_slime.dmi | Bin 5522 -> 5523 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/human_races/r_slime.dmi b/icons/mob/human_races/r_slime.dmi index 80aa2fa0982bfbae39a4ccb05ea5cc55c109f204..7fa8ecf8748eca3851f551948f4625dd955d5e2e 100644 GIT binary patch literal 5523 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 Na9zhxyHpGD@E_RfaB=_u literal 5522 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 R;73-##K_FB!oV%=-vG&CfM);z From 1b75aacec05955a52b598eda24a390a5c724b211 Mon Sep 17 00:00:00 2001 From: Bram961 Date: Wed, 22 Apr 2015 03:59:10 +0200 Subject: [PATCH 4/5] Popping sound fix Fixes the popping sound heared when white noise is toggled on. --- code/game/area/areas.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 2d93888ea0bf131a67424eed99dbf0147120e71a Mon Sep 17 00:00:00 2001 From: veganzombeh Date: Wed, 22 Apr 2015 10:19:16 +0100 Subject: [PATCH 5/5] Vampires get nutrition from blood, not food. Sucking blood increases nutrition, nutriment reagent does not. Also adds an immunity check for holy water contact. --- code/game/gamemodes/vampire/vampire.dm | 3 +++ code/modules/reagents/Chemistry-Reagents.dm | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) 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/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 0a3f2c40dd3..d9b0b2b626d 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