cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Bones death description (#9085)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2020-06-11 21:10:03 +02:00
committed by GitHub
parent 025bb51440
commit ae24768189
2 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/cat.dm
+10 -12
View File
@@ -233,13 +233,14 @@
befriend_job = "Chief Medical Officer"
holder_type = /obj/item/holder/cat/black
/mob/living/simple_animal/cat/fluff/Runtime/death()
.=..()
desc = "Oh no, Runtime is dead! What kind of monster would do this?"
/mob/living/simple_animal/cat/fluff/examine(mob/user)
..()
if(stat == DEAD)
to_chat(user, "Oh no, [name] is dead! What kind of monster would do this?")
/mob/living/simple_animal/cat/kitten
name = "kitten"
desc = "D'aaawwww"
desc = "D'aaawwww."
icon_state = "kitten"
item_state = "kitten"
icon_living = "kitten"
@@ -248,13 +249,14 @@
gender = NEUTER
holder_type = /obj/item/holder/cat/kitten
/mob/living/simple_animal/cat/kitten/death()
.=..()
desc = "It's a dead kitten! What kind of monster would do this?"
/mob/living/simple_animal/cat/kitten/examine(mob/user)
..()
if(stat == DEAD)
to_chat(user, "It's a dead kitten! What kind of monster would do this?")
/mob/living/simple_animal/cat/fluff/bones
name = "Bones"
desc = "That's Bones the cat. He's a laid back, black cat. Meow."
desc = "He's a laid back, black cat. Meow."
gender = MALE
icon_state = "cat3"
item_state = "cat3"
@@ -265,10 +267,6 @@
var/friend_name = "Erstatz Vryroxes"
holder_type = /obj/item/holder/cat/black
/mob/living/simple_animal/cat/fluff/bones/death()
.=..()
desc = "Bones is dead"
/mob/living/simple_animal/cat/kitten/Initialize()
. = ..()
gender = pick(MALE, FEMALE)