diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 3471a81f95d..b95575cec58 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -25,6 +25,9 @@ var/const/tk_maxrange = 15 /atom/proc/attack_self_tk(mob/user) return +/obj/item/attack_self_tk(mob/user) + attack_self(user) + /obj/attack_tk(mob/user) if(user.stat) return if(anchored) diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 09d63f00e2f..b05c83e0450 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -113,7 +113,7 @@ icon = 'icons/mob/blob.dmi' icon_state = "blobbernaut" icon_living = "blobbernaut" - icon_dead = "blobbernaut_death" + icon_dead = "blobbernaut_dead" pass_flags = PASSBLOB health = 240 maxHealth = 240 @@ -147,3 +147,7 @@ /mob/living/simple_animal/hostile/blobbernaut/blob_act() return + +/mob/living/simple_animal/hostile/blobbernaut/Die() + ..() + flick("blobbernaut_death", src) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 8f8a2d17172..7f91e9f022a 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -260,7 +260,7 @@ src.add_fingerprint(user) if(!src.toggle()) - usr << "It won't budge!" + user << "It won't budge!" /obj/structure/closet/verb/verb_toggleopen() set src in oview(1) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index a29a6925d25..d8e22b4af0b 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -3,7 +3,7 @@ desc = "It's a g-g-g-g-ghooooost!" //jinkies! icon = 'icons/mob/mob.dmi' icon_state = "ghost" - layer = 4 + layer = MOB_LAYER + 1 stat = DEAD density = 0 canmove = 0 diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index c3f3293262c..257bb384c5e 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -7,7 +7,7 @@ status_flags = CANPUSH var/icon_living = "" - var/icon_dead = "" + var/icon_dead = "" //icon when the animal is dead. Don't use animated icons for this. var/icon_gib = null //We only try to show a gibbing animation if this exists. var/list/speak = list() diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm index 1d5ab597f80..b70fe6ad8df 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm @@ -721,7 +721,7 @@ datum/reagent/cryptobiolin id = "cryptobiolin" description = "Cryptobiolin causes confusion and dizzyness." color = "#C8A5DC" // rgb: 200, 165, 220 - metabolization_rate = 0.5 * REAGENTS_METABOLISM + metabolization_rate = 1.5 * REAGENTS_METABOLISM datum/reagent/cryptobiolin/on_mob_life(var/mob/living/M as mob) M.Dizzy(1) diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm index 323b227839d..79e7cb5308b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm @@ -255,7 +255,7 @@ datum/reagent/toxin/chloralhydrate reagent_state = SOLID color = "#000067" // rgb: 0, 0, 103 toxpwr = 0 - metabolization_rate = 0.5 * REAGENTS_METABOLISM + metabolization_rate = 1.5 * REAGENTS_METABOLISM datum/reagent/toxin/chloralhydrate/on_mob_life(var/mob/living/M as mob) if(!data) @@ -278,7 +278,7 @@ datum/reagent/toxin/beer2 //disguised as normal beer for use by emagged brobots id = "beer2" description = "An alcoholic beverage made from malted grains, hops, yeast, and water." color = "#664300" // rgb: 102, 67, 0 - metabolization_rate = 0.5 * REAGENTS_METABOLISM + metabolization_rate = 1.5 * REAGENTS_METABOLISM datum/reagent/toxin/beer2/on_mob_life(var/mob/living/M as mob) if(!data) diff --git a/icons/mob/blob.dmi b/icons/mob/blob.dmi index 7c8af9edad6..21a976f7003 100644 Binary files a/icons/mob/blob.dmi and b/icons/mob/blob.dmi differ