•Fixed bug where placing a welder, even turned off, on a reinforced table would weaken it. Fucked things up when engineers stopped by the bar

•Fixed Inadlozoblahblah not fixing injury or deficiency eye damage.
•Added plasma canister next to engine radiation collectors so they can fill up dem tanks.
•Added 2 new soda machines, as they get no love :3

Bullet points~

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@565 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
polyxenitopalidou
2010-12-07 22:54:02 +00:00
parent 3b0abb0712
commit 71c31dd08e
3 changed files with 5158 additions and 5150 deletions

View File

@@ -913,6 +913,7 @@ datum
if(!M) M = holder.my_atom
M:eye_blurry = max(M:eye_blurry-5 , 0)
M:eye_blind = max(M:eye_blind-5 , 0)
M:sdisabilities &= 1
..()
return

View File

@@ -129,18 +129,22 @@
return
if (istype(W, /obj/item/weapon/weldingtool))
if(src.status == 2)
user << "\blue Now weakening the reinforced table"
playsound(src.loc, 'Welder.ogg', 50, 1)
sleep(50)
user << "\blue Table weakened"
src.status = 1
else
user << "\blue Now strengthening the reinforced table"
playsound(src.loc, 'Welder.ogg', 50, 1)
sleep(50)
user << "\blue Table strengthened"
src.status = 2
if(W:welding == 1)
if(src.status == 2)
user << "\blue Now weakening the reinforced table"
playsound(src.loc, 'Welder.ogg', 50, 1)
sleep(50)
user << "\blue Table weakened"
src.status = 1
else
user << "\blue Now strengthening the reinforced table"
playsound(src.loc, 'Welder.ogg', 50, 1)
sleep(50)
user << "\blue Table strengthened"
src.status = 2
return
user.drop_item()
if(W && W.loc) W.loc = src.loc
return
if (istype(W, /obj/item/weapon/wrench))

File diff suppressed because it is too large Load Diff