From 2efdc786811e3792941b666ed2946944a7c073f0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 29 Jul 2017 03:52:55 +0200 Subject: [PATCH] this fixes the PR --- .../items/weapons/grenades/chem_grenade.dm | 22 ------------------- code/modules/food_and_drinks/drinks/drinks.dm | 12 +--------- code/modules/food_and_drinks/food.dm | 14 ++++++++++++ code/modules/food_and_drinks/food/snacks.dm | 12 +--------- .../mob/living/carbon/human/examine.dm | 14 ++++++------ .../carbon/human/species_types/skeletons.dm | 2 +- .../carbon/human/species_types/zombies.dm | 2 +- .../chemistry/reagents/other_reagents.dm | 11 ---------- code/modules/surgery/organs/stomach.dm | 4 ++-- 9 files changed, 27 insertions(+), 66 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 16e0cb8e77f..0db6f104389 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -547,25 +547,3 @@ beakers += B1 beakers += B2 - -/obj/item/weapon/grenade/chem_grenade/pukonium - name = "pukonium grenade" - desc = "Filled with some of the most rancid stuff ever, will probably make anyone within a mile of it dry heave." - stage = READY - -/obj/item/weapon/grenade/chem_grenade/pukonium/Initialize() - ..() - var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src) - - B1.reagents.add_reagent("pukonium", 60) - B1.reagents.add_reagent("potassium", 40) - B2.reagents.add_reagent("phosphorus", 40) - B2.reagents.add_reagent("sugar", 40) - - beakers += B1 - beakers += B2 - -#undef EMPTY -#undef WIRED -#undef READY diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 99951928ed6..fbc1dccdc55 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -47,17 +47,7 @@ add_logs(user, M, "fed", reagentlist(src)) var/fraction = min(gulp_size/reagents.total_volume, 1) - if(iscarbon(M)) - var/mob/living/carbon/human/H = M - if(foodtype & H.dna.species.toxic_food) - to_chat(M,"What the hell is this?!") - M.adjust_disgust(25 + 30 * fraction) - else if(foodtype & H.dna.species.disliked_food) - to_chat(M,"That didn't taste very good...") - M.adjust_disgust(11 + 15 * fraction) - else if(foodtype & H.dna.species.liked_food) - to_chat(M,"I love this taste!") - M.adjust_disgust(-5 + -2.5 * fraction) + checkLiked(fraction, M) reagents.reaction(M, INGEST, fraction) reagents.trans_to(M, gulp_size) playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 7bab6adcf9c..03f5e79bb02 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -12,3 +12,17 @@ ..() pixel_x = rand(-5, 5) //Randomizes postion slightly. pixel_y = rand(-5, 5) + + +/obj/item/weapon/reagent_containers/food/proc/checkLiked(var/fraction, mob/M) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(foodtype & H.dna.species.toxic_food) + to_chat(H,"What the hell was that thing?!") + H.adjust_disgust(25 + 30 * fraction) + else if(foodtype & H.dna.species.disliked_food) + to_chat(H,"That didn't taste very good...") + H.adjust_disgust(11 + 15 * fraction) + else if(foodtype & H.dna.species.liked_food) + to_chat(H,"I love this taste!") + H.adjust_disgust(-5 + -2.5 * fraction) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 2f68240984a..004a52cb302 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -109,17 +109,7 @@ reagents.trans_to(M, bitesize) bitecount++ On_Consume() - if(iscarbon(M)) - var/mob/living/carbon/human/H = M - if(foodtype & H.dna.species.toxic_food) - to_chat(M,"What the hell was that thing?!") - M.adjust_disgust(25 + 30 * fraction) - else if(foodtype & H.dna.species.disliked_food) - to_chat(M,"That didn't taste very good...") - M.adjust_disgust(11 + 15 * fraction) - else if(foodtype & H.dna.species.liked_food) - to_chat(M,"I love this taste!") - M.adjust_disgust(-5 + -2.5 * fraction) + checkLiked(fraction, M) return 1 return 0 diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 5dd0bf69f4c..7172ecf62a5 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -224,13 +224,13 @@ msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n" else msg += "[t_He] [t_is] quite chubby.\n" - - if(disgust >= DISGUST_LEVEL_DISGUSTED) - msg += "[t_He] looks disgusted.\n" - else if(disgust >= DISGUST_LEVEL_VERYGROSS) - msg += "[t_He] looks really grossed out.\n" - else if(disgust >= DISGUST_LEVEL_GROSS) - msg += "[t_He] looks a bit grossed out.\n" + switch(disgust) + if(0 to DISGUST_LEVEL_GROSS) + msg += "[t_He] looks a bit grossed out.\n" + if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS) + msg += "[t_He] looks really grossed out.\n" + if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED) + msg += "[t_He] looks disgusted.\n" if(blood_volume < BLOOD_VOLUME_SAFE) msg += "[t_He] [t_has] pale skin.\n" diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index 63213243c67..d2b8ed6220d 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -9,5 +9,5 @@ species_traits = list(NOBREATH,RESISTHOT,RESISTCOLD,RESISTPRESSURE,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NOHUNGER,EASYDISMEMBER,EASYLIMBATTACHMENT) mutant_organs = list(/obj/item/organ/tongue/bone) damage_overlay_type = ""//let's not show bloody wounds or burns over bones. - disliked_food = null + disliked_food = NONE liked_food = GROSS | MEAT | RAW diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index 3889c22d0ee..01c63db0c14 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -9,7 +9,7 @@ species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOBLOOD,RADIMMUNE,NOZOMBIE,EASYDISMEMBER,EASYLIMBATTACHMENT) mutant_organs = list(/obj/item/organ/tongue/zombie) var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg') - disliked_food = null + disliked_food = NONE liked_food = GROSS | MEAT | RAW /datum/species/zombie/infectious diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 3f01451ec63..876029e1282 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1630,14 +1630,3 @@ description = "blue sparkles that get everywhere" color = "#4040FF" //A blueish color glitter_type = /obj/effect/decal/cleanable/glitter/blue - -/datum/reagent/pukonium - name = "pukonium" - id = "pukonium" - description = "Vile liquid that is refined in the faraway lands of Ko-Der-Buus" - color = "360f0f" - metabolization_rate = 5 - -/datum/reagent/pukonium/on_mob_life(mob/living/M) - M.adjust_disgust(10) - ..() diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index a728d9d695a..e3228fa100a 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -49,12 +49,12 @@ H.throw_alert("disgust", /obj/screen/alert/disgusted) /obj/item/organ/stomach/Remove() - ..() var/mob/living/carbon/human/H = owner - if(istype(H)) H.clear_alert("disgust") + ..() + /obj/item/organ/stomach/fly name = "insectoid stomach" icon_state = "stomach-x" //xenomorph liver? It's just a black liver so it fits.