Reverted r3944, with the exception of stock_parts.dmi

Fixed issue 605.

Committing minor adjustments to watercloset.dm and paperbin.dm too!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3947 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-06-29 15:56:51 +00:00
parent feeb0fa395
commit 7f5de70b91
15 changed files with 654 additions and 293 deletions
-2
View File
@@ -177,13 +177,11 @@ var/global/list/obj/item/device/pda/PDAs = list()
if (fon)
sd_SetLuminosity(0)
user.total_luminosity += f_lum
sd_Update()
/obj/item/device/pda/dropped(mob/user)
if (fon)
user.total_luminosity -= f_lum
sd_SetLuminosity(f_lum)
sd_Update()
/obj/item/device/pda/New()
..()
-2
View File
@@ -85,14 +85,12 @@
if(on)
user.total_luminosity += brightness_on
src.sd_SetLuminosity(0)
sd_Update()
/obj/item/device/flashlight/dropped(mob/user)
if(on)
user.total_luminosity -= brightness_on
src.sd_SetLuminosity(brightness_on)
sd_Update()
/obj/item/device/flashlight/pen
+3 -3
View File
@@ -144,7 +144,7 @@
wash(M)
check_heat(M)
/obj/machinery/shower/attackby(var/obj/item/I as obj, var/mob/user as mob)
/obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob)
if(I.type == /obj/item/device/analyzer)
user << "<span class='notice'>The water temperature seems to be [watertemp].</span>"
if(istype(I, /obj/item/weapon/wrench))
@@ -312,7 +312,7 @@
for(var/mob/V in viewers(src, null))
V.show_message("\blue [M] washes their hands using \the [src].")
/obj/structure/sink/attackby(var/obj/item/O as obj, var/mob/user as mob)
/obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob)
if(busy)
user << "\red Someone's already washing here."
return
@@ -383,7 +383,7 @@
..()
icon_state = "puddle"
/obj/structure/sink/puddle/attackby(var/obj/item/O as obj, var/mob/user as mob)
/obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob)
icon_state = "puddle-splash"
..()
icon_state = "puddle"