Merge pull request #7959 from phil235/AttackSelfTKFix

A bunch of fixes
This commit is contained in:
hornygranny
2015-02-25 19:54:36 -08:00
8 changed files with 14 additions and 7 deletions
+3
View File
@@ -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)
+5 -1
View File
@@ -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)
@@ -260,7 +260,7 @@
src.add_fingerprint(user)
if(!src.toggle())
usr << "<span class='notice'>It won't budge!</span>"
user << "<span class='notice'>It won't budge!</span>"
/obj/structure/closet/verb/verb_toggleopen()
set src in oview(1)
+1 -1
View File
@@ -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
@@ -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()
@@ -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)
@@ -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)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 KiB

After

Width:  |  Height:  |  Size: 461 KiB