git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1057 316c924e-a436-60f5-8080-3fe189b3f50e

This commit is contained in:
Atso.Sariola@gmail.com
2011-02-18 03:23:40 +00:00
parent 83dc883551
commit c85f20f54f
63 changed files with 10634 additions and 25 deletions
+5 -1
View File
@@ -441,6 +441,10 @@ proc/process_ghost_teleport_locs()
name = "Atmospherics"
icon_state = "green"
/area/maintenance/incinerator
name = "Incinerator"
icon_state = "disposal"
/area/maintenance/disposal
name = "Waste Disposal"
icon_state = "disposal"
@@ -757,7 +761,7 @@ proc/process_ghost_teleport_locs()
///////////WORK IN PROGRESS//////////
/area/quartermaster/sorting
name = "Construction Area"
name = "Delivery Office"
icon_state = "quartstorage"
////////////WORK IN PROGRESS//////////
+1
View File
@@ -102,6 +102,7 @@ var
wardenMax = 1
cmoMax = 1
mimeMax = 1
sorterMax = 2
list/bombers = list( )
list/admin_log = list ( )
+2
View File
@@ -469,6 +469,7 @@
src.pixel_y = rand(-5.0, 5)
/obj/item/weapon/reagent_containers/food/snacks/grown/attackby(var/obj/item/O as obj, var/mob/user as mob)
..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "This is a \blue [name]"
switch(plant_type)
@@ -492,6 +493,7 @@
return
/obj/item/weapon/grown/attackby(var/obj/item/O as obj, var/mob/user as mob)
..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "This is a \blue [name]"
switch(plant_type)