Welding mask change reverted.

Green lab coat can now be spawned.
Tweak to several sprites, nothing major.
Default sprite added to masks, so that some gimmick items may be spawned now.
Tea has a funnier name and description. Vending machine changed to "Hot" from "Warm" to better reflect contents.
Service Cyborgs can be picked! Shaker, dropper, tray, pen+paper for note/order taking and DOSH to show their class off. When emagged, Colonel Butlertron did it in Atmosia with the Energy Sword. Possibly bugged, must investigate further. (SoS authorized some live testing!)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1197 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
bizarre.babel@gmail.com
2011-03-17 09:18:01 +00:00
parent f9460f5c3c
commit 3b15b2d93c
11 changed files with 36 additions and 28 deletions

View File

@@ -194,25 +194,6 @@
beakers += B1
beakers += B2
icon_state = "chemg_locked"
/*
/obj/item/weapon/chem_grenade/poo
name = "poo grenade"
desc = "A ShiTastic! brand biological warfare charge. Not very effective unless the target is squeamish."
icon_state = "chemg3"
stage = 2
New()
..()
var/obj/item/weapon/reagent_containers/glass/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/B2 = new(src)
B1.reagents.add_reagent("poo", 30)
B2.reagents.add_reagent("poo", 30)
beakers += B1
beakers += B2
*/
///////////////////////////////Grenades
/obj/syringe_gun_dummy
name = ""
@@ -306,8 +287,6 @@
return
/obj/reagent_dispensers
name = "Dispenser"
desc = "..."
@@ -2254,8 +2233,8 @@
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/tea
name = "Sandy Balls Tea"
desc = "The perfect tea for those who enjoy life's simple pleasures."
name = "Duke Purple Tea"
desc = "For excellent taste, you can always bet on Duke Purple."
icon_state = "tea"
New()
..()