pleases the gods

This commit is contained in:
Qustinnus
2017-07-20 17:10:16 +02:00
parent cb9b57adcc
commit fedf7ba7fd
9 changed files with 24 additions and 22 deletions
@@ -553,7 +553,7 @@
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/New()
/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)
@@ -47,7 +47,7 @@
add_logs(user, M, "fed", reagentlist(src))
var/fraction = min(gulp_size/reagents.total_volume, 1)
if(ishuman(M))
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>")
@@ -173,7 +173,7 @@
desc = "A bottle filled with nothing."
icon_state = "bottleofnothing"
list_reagents = list("nothing" = 100)
foodtype = null
foodtype = NONE
/obj/item/weapon/reagent_containers/food/drinks/bottle/patron
name = "Wrapp Artiste Patron"
@@ -192,7 +192,7 @@
desc = "A flask of the chaplain's holy water."
icon_state = "holyflask"
list_reagents = list("holywater" = 100)
foodtype = null
foodtype = NONE
/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater/hell
desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
+1 -1
View File
@@ -6,7 +6,7 @@
volume = 50 //Sets the default container amount for all food items.
container_type = INJECTABLE
resistance_flags = FLAMMABLE
var/foodtype
var/foodtype = NONE
/obj/item/weapon/reagent_containers/food/New()
..()
+13 -13
View File
@@ -103,24 +103,24 @@
if(M.satiety > -200)
M.satiety -= junkiness
playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
var/fraction = min(bitesize / reagents.total_volume, 1)
if(ishuman(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)
if(reagents.total_volume)
var/fraction = min(bitesize / reagents.total_volume, 1)
reagents.reaction(M, INGEST, fraction)
reagents.trans_to(M, bitesize)
bitecount++
On_Consume()
return 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 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)
return 1
return 0
@@ -11,6 +11,8 @@
var/obj/item/handcuffed = null //Whether or not the mob is handcuffed
var/obj/item/legcuffed = null //Same as handcuffs but for legs. Bear traps use this.
var/disgust = 0
//inventory slots
var/obj/item/back = null
var/obj/item/clothing/mask/wear_mask = null
@@ -47,4 +49,4 @@
var/list/hand_bodyparts = list() //a collection of arms (or actually whatever the fug /bodyparts you monsters use to wreck my systems)
var/icon_render_key = ""
var/static/list/limb_icon_cache = list()
var/static/list/limb_icon_cache = list()
@@ -29,7 +29,7 @@
var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc)
var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing
var/skinned_type
var/liked_food
var/liked_food = NONE
var/disliked_food = GROSS
var/toxic_food = TOXIC
var/list/no_equip = list() // slots the race can't equip stuff to
@@ -72,7 +72,8 @@
disgust = max(disgust+amount, 0)
/mob/living/carbon/set_disgust(amount)
disgust = amount
if(amount >= 0)
disgust = amount
/mob/living/carbon/cure_blind()
if(disabilities & BLIND)
-1
View File
@@ -46,7 +46,6 @@
var/cultslurring = 0 //Carbon
var/real_name = null
var/druggy = 0 //Carbon
var/disgust = 0 //Carbon
var/confused = 0 //Carbon
var/resting = 0 //Carbon
var/lying = 0