I'm spending too much time trying to fix something rejected.
This commit is contained in:
@@ -6,7 +6,6 @@
|
||||
lose_text = ""
|
||||
resilience = TRAUMA_RESILIENCE_SURGERY
|
||||
var/priority = TRUE
|
||||
|
||||
var/hypnotic_phrase = ""
|
||||
var/regex/target_phrase
|
||||
|
||||
|
||||
@@ -559,9 +559,10 @@ datum/status_effect/pacify
|
||||
"<span class='warning'>[pick("You feel your thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed...")]</span>")
|
||||
return TRUE
|
||||
|
||||
/datum/status_effect/trance/on_creation(mob/living/new_owner, _duration, _stun = TRUE)//priority == FALSE makes no visible message, prevents self antag messages, and places phrase below objectives.
|
||||
/datum/status_effect/trance/on_creation(mob/living/new_owner, _duration, _stun = TRUE, _priority = priority)//priority == FALSE makes no visible message, prevents self antag messages, and places phrase below objectives.
|
||||
duration = _duration
|
||||
stun = _stun
|
||||
priority = _priority
|
||||
return ..()
|
||||
|
||||
/datum/status_effect/trance/on_remove()
|
||||
|
||||
@@ -306,18 +306,24 @@
|
||||
icon_dead = "custom_cat_dead"
|
||||
gender = FEMALE
|
||||
gold_core_spawnable = NO_SPAWN
|
||||
health = 50 //So people can't instakill it
|
||||
health = 50 //So people can't instakill it s
|
||||
maxHealth = 50
|
||||
speak = list("Meowrowr!", "Mew!", "Miauen!")
|
||||
speak_emote = list("wigglepurrs", "mewls")
|
||||
emote_hear = list("meows.", "mews.")
|
||||
emote_see = list("looks at you eagerly for pets!", "wiggles enthusiastically.")
|
||||
gold_core_spawnable = NO_SPAWN
|
||||
var/pseudo_death = FALSE
|
||||
|
||||
/mob/living/simple_animal/pet/cat/custom_cat/death(gibbed)
|
||||
if (src.mind && !name == "White cat") //secret cat chem
|
||||
/mob/living/simple_animal/pet/cat/custom_cat/death()
|
||||
message_admins("dedcat")
|
||||
if (pseudo_death == TRUE) //secret cat chem
|
||||
icon_state = "custom_cat_dead"
|
||||
Stun(1000)
|
||||
canmove = 0
|
||||
message_admins("dedcat")
|
||||
friendly = "deads at"
|
||||
return
|
||||
else
|
||||
message_admins("deddercat")
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user