shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10093 from Trilbyspaceclone/donut

Browse Source 
[Ready] Hey why dont I port that one donut pr? Ye just the one food related pr... Just the one... Oh no
This commit is contained in:
Ghom
2019-12-23 02:31:50 +01:00
committed by GitHub
parent fcfdf5e253 784ea3f5e1
commit f3936f2c81
49 changed files with 1289 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/cat.dm
+2 -2
View File
@@ -286,8 +286,8 @@
if(health < maxHealth)
adjustBruteLoss(-8) //Fast life regen
for(var/obj/item/reagent_containers/food/snacks/donut/D in range(1, src)) //Frosts nearby donuts!
if(!D.is_frosted)
D.frost_donut()
if(!D.is_decorated)
D.decorate_donut()
/mob/living/simple_animal/pet/cat/cak/attack_hand(mob/living/L)
..()
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+2 -2
View File
@@ -197,7 +197,7 @@
density = FALSE
speak_chance = 2
turns_per_move = 2
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/chicken = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -246,7 +246,7 @@
density = FALSE
speak_chance = 2
turns_per_move = 3
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/chicken = 2)
var/egg_type = /obj/item/reagent_containers/food/snacks/egg
var/food_type = /obj/item/reagent_containers/food/snacks/grown/wheat
response_help = "pets"