mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 15:08:02 +01:00
Cak submission && "Sprinkles" fix
This commit is contained in:
@@ -345,7 +345,7 @@
|
||||
/obj/item/reagent_containers/food/snacks/donut/sprinkles
|
||||
name = "frosted donut"
|
||||
icon_state = "donut2"
|
||||
list_reagents = list("nutriment" = 3, "sugar" = 2, "spinkles" = 2)
|
||||
list_reagents = list("nutriment" = 3, "sugar" = 2, "sprinkles" = 2)
|
||||
filling_color = "#FF69B4"
|
||||
randomized_sprinkles = 0
|
||||
|
||||
|
||||
@@ -252,4 +252,12 @@
|
||||
)
|
||||
tools = list(/obj/item/kitchen/sushimat)
|
||||
result = /obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
|
||||
category = CAT_FOOD
|
||||
|
||||
/datum/crafting_recipe/food/cak
|
||||
name = "Living cat/cake hybrid"
|
||||
reqs = list(
|
||||
/obj/item/organ/internal/heart = 1,
|
||||
)
|
||||
result = /mob/living/simple_animal/pet/cat/cak
|
||||
category = CAT_FOOD
|
||||
@@ -13,7 +13,7 @@
|
||||
if(INTENT_HARM, INTENT_DISARM)
|
||||
M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
|
||||
visible_message("<span class='danger'>[M] [response_harm] [src]!</span>")
|
||||
playsound(loc, "punch", 25, 1, -1)
|
||||
playsound(loc, attacked_sound, 25, 1, -1)
|
||||
attack_threshold_check(harm_intent_damage)
|
||||
add_attack_logs(M, src, "Melee attacked with fists")
|
||||
updatehealth()
|
||||
|
||||
@@ -177,3 +177,94 @@
|
||||
minbodytemp = 0
|
||||
melee_damage_lower = 5
|
||||
melee_damage_upper = 15
|
||||
|
||||
/mob/living/simple_animal/pet/cat/cak
|
||||
name = "Keeki"
|
||||
desc = "It's a cat made out of cake. It looks like a brain would fit into its head."
|
||||
icon_state = "cak"
|
||||
icon_living = "cak"
|
||||
icon_resting = "cak_rest"
|
||||
icon_dead = "cak_dead"
|
||||
health = 50
|
||||
maxHealth = 50
|
||||
harm_intent_damage = 10
|
||||
butcher_results = list(
|
||||
/obj/item/organ/internal/heart = 1,
|
||||
/obj/item/reagent_containers/food/snacks/birthdaycakeslice = 3,
|
||||
/obj/item/reagent_containers/food/snacks/meat = 2
|
||||
)
|
||||
response_harm = "takes a bite out of"
|
||||
attacked_sound = "sound/items/eatfood.ogg"
|
||||
deathmessage = "loses its false life and collapses!"
|
||||
death_sound = "bodyfall"
|
||||
var/obj/item/organ/internal/brain/brain = null
|
||||
|
||||
/mob/living/simple_animal/pet/cat/cak/Life()
|
||||
..()
|
||||
if(stat)
|
||||
return
|
||||
if(health < maxHealth)
|
||||
adjustBruteLoss(-4)
|
||||
for(var/obj/item/reagent_containers/food/snacks/donut/D in range(1, src))
|
||||
if(D.icon_state != "donut2")
|
||||
D.name = "frosted donut"
|
||||
D.icon_state = "donut2"
|
||||
D.reagents.add_reagent("sprinkles", 2)
|
||||
D.filling_color = "#FF69B4"
|
||||
|
||||
/mob/living/simple_animal/pet/cat/cak/attackby(obj/item/O, mob/living/user, params)
|
||||
if(istype(O, /obj/item/organ/internal/brain))
|
||||
var/obj/item/organ/internal/brain/B = O
|
||||
if(brain) //There's already a brain in it.
|
||||
to_chat(user, "<span class='warning'>There's already a brain in [src]!</span>")
|
||||
return
|
||||
if(!B.brainmob.key)
|
||||
var/ghost_can_reenter = 0
|
||||
if(B.brainmob.mind)
|
||||
for(var/mob/dead/observer/G in GLOB.player_list)
|
||||
if(G.can_reenter_corpse && G.mind == B.brainmob.mind)
|
||||
ghost_can_reenter = 1
|
||||
break
|
||||
for(var/mob/living/simple_animal/S in GLOB.player_list)
|
||||
if(S in GLOB.respawnable_list)
|
||||
ghost_can_reenter = 1
|
||||
break
|
||||
if(!ghost_can_reenter)
|
||||
to_chat(user, "<span class='notice'>[B] is completely unresponsive; there's no point.</span>")
|
||||
return
|
||||
|
||||
to_chat(user, "<span class='notice'>You install [B] in [src]!</span>")
|
||||
|
||||
user.drop_item()
|
||||
B.forceMove(src)
|
||||
brain = B
|
||||
transfer_personality(B)
|
||||
|
||||
return 1
|
||||
|
||||
|
||||
if(istype(O, /obj/item/kitchen/knife))
|
||||
to_chat(user, "<span class='warning'>You cut out the brain from [src].</span>")
|
||||
eject_brain()
|
||||
return 1
|
||||
|
||||
else if(user.a_intent == INTENT_HARM && user.reagents)
|
||||
user.reagents.add_reagent("nutriment", 0.4)
|
||||
user.reagents.add_reagent("vitamin", 0.4)
|
||||
|
||||
/mob/living/simple_animal/pet/cat/cak/proc/transfer_personality(obj/item/organ/internal/brain/B)
|
||||
mind = B.brainmob.mind
|
||||
mind.key = B.brainmob.key
|
||||
ckey = B.brainmob.ckey
|
||||
name = "Keeki"
|
||||
desc = "It's a cat made out of cake. It looks like a real brain is in it's head."
|
||||
rename_self("cake cat")
|
||||
|
||||
/mob/living/simple_animal/pet/cat/cak/proc/eject_brain()
|
||||
var/turf/T = get_turf(src)
|
||||
brain.forceMove(T)
|
||||
desc = "It's a cat made out of cake. It looks like a brain would fit into its head."
|
||||
if(mind)
|
||||
mind.transfer_to(brain.brainmob)
|
||||
brain = null
|
||||
name = "Keeki"
|
||||
@@ -76,6 +76,7 @@
|
||||
var/sentience_type = SENTIENCE_ORGANIC // Sentience type, for slime potions
|
||||
var/list/loot = list() //list of things spawned at mob's loc when it dies
|
||||
var/del_on_death = 0 //causes mob to be deleted on death, useful for mobs that spawn lootable corpses
|
||||
var/attacked_sound = "punch"
|
||||
var/deathmessage = ""
|
||||
var/death_sound = null //The sound played on death
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 66 KiB |
Reference in New Issue
Block a user