Removed /obj/effect/deskclutter at last.

Updated all maps. (and updated stationCollision.dmm to have new hivebots, cmon kor)

Removed the action button from the flare, as you only ever turn it on once.
Removed a bunch of unused sprites in items.dmi.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5190 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-11-25 19:58:28 +00:00
parent 2386920be8
commit c69f0cab36
7 changed files with 305 additions and 251 deletions

View File

@@ -128,13 +128,6 @@
anchored = 1
unacidable = 1//temporary until I decide whether the borg can be removed. -veyveyr
/obj/effect/deskclutter
name = "desk clutter"
icon = 'icons/obj/items.dmi'
icon_state = "deskclutter"
desc = "Some clutter the detective has accumalated over the years..."
anchored = 1
/obj/item/mouse_drag_pointer = MOUSE_ACTIVE_POINTER
// TODO: robust mixology system! (and merge with beakers, maybe)

View File

@@ -147,6 +147,7 @@
brightness_on = 7 // Pretty bright.
icon_state = "flare"
item_state = "flare"
icon_action_button = null //just pull it manually, neckbeard.
var/fuel = 0
var/on_damage = 7
var/produce_heat = 1500