diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index ef556feb9a83..9ebcf6eced5d 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -922,6 +922,16 @@ var/global/list/animal_count = list() //Stores types, and amount of animals of t else return FALSE +/mob/living/simple_animal/proc/atepoison() //reusable function + health -= 5 + if(prob(10)) + if(istype(loc, /turf/simulated)) + var/turf/simulated/T = loc + T.add_vomit_floor(src, 1, 0, 1) + Stun(5) + visible_message("[src] throws up!","You throw up!") + playsound(loc, 'sound/effects/splat.ogg', 50, 1) + // Simplemobs do not have hands. /mob/living/simple_animal/put_in_hand_check(obj/item/W, index) return 0 diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 5bd8629ffec5..d4a98e803781 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -23,6 +23,7 @@ var/nutriment_factor = 0 var/pain_resistance = 0 var/sport = SPORTINESS_NONE //High sport helps you show off on a treadmill. Multiplicative + var/harms_animal_type //What kind of animal does this harm? var/custom_metabolism = REAGENTS_METABOLISM var/overdose_am = 0 var/overdose_tick = 0 @@ -139,6 +140,9 @@ M.reagent_act(self.id, method, volume) + if(self.harms_animal_type && istype(M,self.harms_animal_type)) + M.atepoison() + /datum/reagent/proc/reaction_obj(var/obj/O, var/volume, var/list/splashplosion=list()) set waitfor = 0 diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 1ae5aa399c4d..96369ad5608f 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -31,6 +31,7 @@ var/wrapped = 0 //Is the food wrapped (preventing one from eating until unwrapped) var/dried_type = null //What can we dry the food into var/deepfried = 0 //Is the food deep-fried ? + var/harmfultocorgis = 0 //Is it harmful for corgis to eat? var/filling_color = "#FFFFFF" //What color would a filling of this item be ? var/list/random_filling_colors = list() var/plate_offset_y = 0 @@ -718,6 +719,9 @@ after_consume(M, reagents) playsound(M,'sound/items/eatfood.ogg', rand(10,50), 1) M.delayNextAttack(10) + if(harmfultocorgis) + var/mob/living/simple_animal/corgi/C = M + C.atepoison() if(!reagents || !reagents.total_volume) M.visible_message("[M] [pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where \the [src] was")].", "You swallow up the last of \the [src].") qdel(src) @@ -1663,6 +1667,7 @@ icon_state = "avocadoburger" food_flags = FOOD_MEAT base_crumb_chance = 20 + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/avocadoburger/New() ..() @@ -2917,6 +2922,7 @@ crumb_icon = "dribbles" filling_color = "#CBD15B" valid_utensils = UTENSILE_SPOON + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/avocadosoup/New() ..() @@ -3236,6 +3242,7 @@ desc = "Salted avocado on a slice of toast. For the authentic experience, make sure you pay an exorbitant price for it." icon_state = "avocadotoast" food_flags = FOOD_DIPPABLE + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/avocadotoast/New() ..() @@ -5762,6 +5769,7 @@ base_crumb_chance = 0 crumb_icon = "dribbles" valid_utensils = UTENSILE_SPOON + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/avocadomilkshake/New() ..() @@ -6318,6 +6326,7 @@ icon_state = "garlicbread" bitesize = 3 food_flags = FOOD_DIPPABLE + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/garlicbread/New() ..() @@ -7264,6 +7273,7 @@ var/global/list/bomb_like_items = list(/obj/item/device/transfer_valve, /obj/ite desc = "A simple sushi consisting of avocado and rice." icon = 'icons/obj/seafood.dmi' icon_state = "sushi_avocado" + harmfultocorgis = TRUE //// END SUSHI //// @@ -7713,6 +7723,7 @@ var/global/list/bomb_like_items = list(/obj/item/device/transfer_valve, /obj/ite icon = 'icons/obj/food2.dmi' icon_state = "peanutbutter" base_crumb_chance = 0 + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/peanutbutter/New() ..() @@ -7725,6 +7736,7 @@ var/global/list/bomb_like_items = list(/obj/item/device/transfer_valve, /obj/ite icon = 'icons/obj/food2.dmi' icon_state = "saltednuts" base_crumb_chance = 0 + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/saltednuts/New() ..() @@ -7738,6 +7750,7 @@ var/global/list/bomb_like_items = list(/obj/item/device/transfer_valve, /obj/ite icon = 'icons/obj/food2.dmi' icon_state = "pbj" base_crumb_chance = 0 + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/pbj/New() ..() diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index 7184c5a76b43..2244dcd17ebb 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -394,6 +394,7 @@ var/list/strange_seed_product_blacklist = subtypesof(/obj/item/weapon/reagent_co desc = "Nutritious!" filling_color = "#A332AD" plantname = "grapes" + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes name = "bunch of green grapes" @@ -401,6 +402,7 @@ var/list/strange_seed_product_blacklist = subtypesof(/obj/item/weapon/reagent_co potency = 25 filling_color = "#A6FFA3" plantname = "greengrapes" + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/grown/peanut name = "peanut" @@ -408,6 +410,7 @@ var/list/strange_seed_product_blacklist = subtypesof(/obj/item/weapon/reagent_co filling_color = "857e27" potency = 25 plantname = "peanut" + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/grown/rocknut name = "rocknut" @@ -486,6 +489,7 @@ var/list/strange_seed_product_blacklist = subtypesof(/obj/item/weapon/reagent_co potency = 50 filling_color = "#9C8E54" plantname = "cocoa" + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane name = "sugarcane" @@ -902,6 +906,7 @@ var/list/strange_seed_product_blacklist = subtypesof(/obj/item/weapon/reagent_co filling_color = "EDEDE1" plantname = "garlic" hydroflags = HYDRO_VOX + harmfultocorgis = TRUE /obj/item/weapon/reagent_containers/food/snacks/grown/breadfruit name = "breadfruit" @@ -1041,6 +1046,7 @@ var/list/strange_seed_product_blacklist = subtypesof(/obj/item/weapon/reagent_co icon = 'icons/obj/hydroponics/avocado.dmi' filling_color = "#EAE791" plantname = "avocado" + harmfultocorgis = TRUE var/cant_eat_msg = "'s skin is much too tough to chew." var/cut = FALSE diff --git a/code/modules/reagents/reagents/reagents_drink.dm b/code/modules/reagents/reagents/reagents_drink.dm index a5a7eb6f7170..d090c51c4a00 100644 --- a/code/modules/reagents/reagents/reagents_drink.dm +++ b/code/modules/reagents/reagents/reagents_drink.dm @@ -183,6 +183,7 @@ description = "Freshly squeezed juice from red grapes. Quite sweet." color = "#512284" //rgb: 81, 34, 132 nutriment_factor = 2.5 * REAGENTS_METABOLISM + harms_animal_type = /mob/living/simple_animal/corgi /datum/reagent/drink/ggrapejuice name = "Green Grape Juice" @@ -190,6 +191,7 @@ description = "Freshly squeezed juice from green grapes. Smoothly sweet." color = "#B79E42" //rgb: 183, 158, 66 nutriment_factor = 2.5 * REAGENTS_METABOLISM + harms_animal_type = /mob/living/simple_animal/corgi /datum/reagent/drink/berryjuice name = "Berry Juice" diff --git a/code/modules/reagents/reagents/reagents_food.dm b/code/modules/reagents/reagents/reagents_food.dm index 187b4991da2c..3c166695fe72 100644 --- a/code/modules/reagents/reagents/reagents_food.dm +++ b/code/modules/reagents/reagents/reagents_food.dm @@ -159,6 +159,7 @@ reagent_state = REAGENT_STATE_SOLID nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" //rgb: 48, 32, 0 + harms_animal_type = /mob/living/simple_animal/corgi /datum/reagent/condensedcapsaicin name = "Condensed Capsaicin"