this fixes the PR

This commit is contained in:
Unknown
2017-07-29 03:52:55 +02:00
parent 7ecbb8a1b2
commit 2efdc78681
9 changed files with 27 additions and 66 deletions
+1 -11
View File
@@ -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,"<span class='warning'>What the hell is this?!</span>")
M.adjust_disgust(25 + 30 * fraction)
else if(foodtype & H.dna.species.disliked_food)
to_chat(M,"<span class='notice'>That didn't taste very good...</span>")
M.adjust_disgust(11 + 15 * fraction)
else if(foodtype & H.dna.species.liked_food)
to_chat(M,"<span class='notice'>I love this taste!</span>")
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)
+14
View File
@@ -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,"<span class='warning'>What the hell was that thing?!</span>")
H.adjust_disgust(25 + 30 * fraction)
else if(foodtype & H.dna.species.disliked_food)
to_chat(H,"<span class='notice'>That didn't taste very good...</span>")
H.adjust_disgust(11 + 15 * fraction)
else if(foodtype & H.dna.species.liked_food)
to_chat(H,"<span class='notice'>I love this taste!</span>")
H.adjust_disgust(-5 + -2.5 * fraction)
+1 -11
View File
@@ -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,"<span class='warning'>What the hell was that thing?!</span>")
M.adjust_disgust(25 + 30 * fraction)
else if(foodtype & H.dna.species.disliked_food)
to_chat(M,"<span class='notice'>That didn't taste very good...</span>")
M.adjust_disgust(11 + 15 * fraction)
else if(foodtype & H.dna.species.liked_food)
to_chat(M,"<span class='notice'>I love this taste!</span>")
M.adjust_disgust(-5 + -2.5 * fraction)
checkLiked(fraction, M)
return 1
return 0
@@ -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"
@@ -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
@@ -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
@@ -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)
..()
+2 -2
View File
@@ -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.