cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-09 23:21:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69 from eyespy2222/testbranch

Browse Source 
finishing what i started (and cake people!))
This commit is contained in:
MrSky12
2023-02-20 11:12:30 +00:00
committed by GitHub
parent 0da9b31887 66ec391d8e
commit 84fe4065e6
4 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
+4 -4
View File
@@ -190,16 +190,16 @@
result = /obj/item/reagent_containers/food/snacks/store/cake/trumpet
subcategory = CAT_CAKE
/datum/crafting_recipe/food/cak
/datum/crafting_recipe/food/cakeperson
name = "Living cake person"
reqs = list(
/obj/item/organ/brain = 1,
/obj/item/organ/heart = 1,
/obj/item/reagent_containers/food/snacks/store/cake/birthday = 3, //the cake person is quite fat, so more cake is needed. good thing b-day cakes are in mealvendors
/obj/item/reagent_containers/food/snacks/store/cake/birthday = 1,
/obj/item/reagent_containers/food/snacks/meat/slab = 3,
/datum/reagent/blood = 30,
/datum/reagent/consumable/sprinkles = 5,
/datum/reagent/teslium = 1 //To shock the whole thing into life
)
// result = /mob/living/simple_animal/cakegolem
// subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Catpeople
result = /mob/living/simple_animal/friendly/cakegolem
subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Catpeople
code/modules/projectiles/projectile/magic.dm
+1 -1
View File
@@ -209,7 +209,7 @@
/mob/living/simple_animal/hostile/lizard,
/mob/living/simple_animal/pet/fox,
/mob/living/simple_animal/butterfly,
// /mob/living/simple_animal/cakegolem //pet/cat/cak,
/mob/living/simple_animal/friendly/cakegolem //pet/cat/cak,
/mob/living/simple_animal/chick)
new_mob = new path(M.loc)