Buckling to chairs no longer causes you to drop anything.

Added Nodrak's Jump to Mob verb.
Added Sieve's lantern fix. Commented out the silicate recipe.
Added Skaer's sec cartridge box to the armoury.

Moved the check_if_buckled() proc to mob/living, rather than having it repeated.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3168 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-02-22 00:36:56 +00:00
parent 6c8a19ae4b
commit f1ee426a8f
14 changed files with 209 additions and 170 deletions
+6 -7
View File
@@ -101,10 +101,11 @@ proc/move_mining_shuttle()
/obj/item/device/flashlight/lantern
name = "Mining Lantern"
icon = 'lighting.dmi'
icon_state = "lantern-off"
desc = "A miner's lantern"
anchored = 0
icon_on = "lantern-on"
icon_off = "lantern-off"
var/brightness = 12 // luminosity when on
/obj/item/device/flashlight/lantern/New()
@@ -113,12 +114,10 @@ proc/move_mining_shuttle()
return
/obj/item/device/flashlight/lantern/attack_self(mob/user)
..()
if (on == 1)
icon_state = "lantern-on"
else
icon_state = "lantern-off"
src.add_fingerprint(user)
on = !on
update_brightness(user)
return
/*****************************Pickaxe********************************/