diff --git a/code/datums/brain_damage/hypnosis.dm b/code/datums/brain_damage/hypnosis.dm
index c0c969503d..8ffffa8693 100644
--- a/code/datums/brain_damage/hypnosis.dm
+++ b/code/datums/brain_damage/hypnosis.dm
@@ -6,7 +6,6 @@
lose_text = ""
resilience = TRAUMA_RESILIENCE_SURGERY
var/priority = TRUE
-
var/hypnotic_phrase = ""
var/regex/target_phrase
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index ecddad2e27..0ec09f4965 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -559,9 +559,10 @@ datum/status_effect/pacify
"[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...")]")
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()
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 1b3e569286..19e7d58912 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -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")
..()
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
index 4aa4d571ef..9376519954 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
@@ -42,6 +42,7 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
G.health = 5
G.melee_damage_lower = 0
G.melee_damage_upper = 0
+ G.obj_damage = 0
G.deathmessage = "disappears as if it was never really there to begin with"
G.incorporeal_move = 1
G.alpha = 35
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
index e1615c9e44..921e27eda3 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -396,6 +396,7 @@
catto.name = H.name
catto.desc = "A cute catto! They remind you of [H] somehow."
catto.color = "#[H.dna.features["mcolor"]]"
+ catto.pseudo_death = TRUE
H.forceMove(catto)
log_game("FERMICHEM: [H] ckey: [H.key] has been made into a cute catto.")
//Just to deal with rascally ghosts
@@ -403,13 +404,10 @@
//catto.health = 1000 //To simulate fake death, while preventing ghosts escaping.
/datum/reagent/fermi/secretcatchem/on_mob_life(mob/living/carbon/H)
- /*
- if(catto.health <= 950) //So the dead can't ghost
- catto.icon_state = "custom_cat_dead"
- catto.Stun(1000)
- catto.canmove = 0
- */
- if(prob(5))
+ if(catto.health <= 0) //So the dead can't ghost
+ if(prob(10))
+ to_chat(H, "You feel your body start to slowly shift back from it's dead form.")
+ else if(prob(5))
playsound(get_turf(catto), 'modular_citadel/sound/voice/merowr.ogg', 50, 1, -1)
catto.say("lets out a meowrowr!*")
..()
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index 9913098efc..2a5450a79b 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -467,7 +467,7 @@
var/additions = list("aluminium", "silver", "gold", "plasma", "silicon", "bluespace", "uranium", "milk")
required_reagents[pick(additions)] = rand(1, 5)//weird
-/datum/chemical_reaction/fermi/secretcatchem/FermiFinish(datum/reagents/holder, var/atom/my_atom)//Strange how this doesn't work but the other does.
+/datum/chemical_reaction/fermi/secretcatchem/FermiFinish(datum/reagents/holder, var/atom/my_atom)
SSblackbox.record_feedback("tally", "catgirlium")//log
/datum/chemical_reaction/fermi/secretcatchem/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH)
@@ -476,7 +476,7 @@
for(var/mob/M in seen)
to_chat(M, "The reaction suddenly gives out a meow, condensing into a chemcat!")//meow!
playsound(get_turf(my_atom), 'modular_citadel/sound/voice/merowr.ogg', 50, 1, -1)
- catto.name = "FermiCat"
- catto.desc = "A cute Fermichem cat, created by a lot of compicated and confusing chemistry!"
+ catto.name = "Chemcat"
+ catto.desc = "A cute chem cat, created by a lot of compicated and confusing chemistry!"
catto.color = "#770000"
my_atom.reagents.remove_any(10)
diff --git a/modular_citadel/code/modules/reagents/objects/items.dm b/modular_citadel/code/modules/reagents/objects/items.dm
index ee8ca1e94c..96e4e6fd53 100644
--- a/modular_citadel/code/modules/reagents/objects/items.dm
+++ b/modular_citadel/code/modules/reagents/objects/items.dm
@@ -34,7 +34,8 @@
if(!I)
user.put_in_active_hand(src)
-/obj/item/FermiChem/pHbooklet/MouseDrop(atom/over_object, mob/living/user)
+/obj/item/FermiChem/pHbooklet/MouseDrop()
+ var/mob/living/user = usr
if(numberOfPages >= 1)
var/obj/item/FermiChem/pHpaper/P = new /obj/item/FermiChem/pHpaper
P.add_fingerprint(user)