Merge remote-tracking branch 'upstream/dev-freeze' into dev

This commit is contained in:
Mloc-Argent
2014-01-09 17:42:30 +00:00
29 changed files with 1154 additions and 1212 deletions
@@ -39,14 +39,7 @@
layer = 2
icon = 'icons/effects/effects.dmi'
icon_state = "dirt"
/obj/effect/decal/cleanable/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(!istype(W,/obj/item/weapon/mop) && !istype(W,/obj/item/weapon/soap))
var/turf/T = get_turf(src)
if(T)
T.attackby(W,user)
return
..()
mouse_opacity = 0
/obj/effect/decal/cleanable/flour
name = "flour"
+2 -2
View File
@@ -93,7 +93,7 @@ RCD
if(useResource(1, user))
user << "Building Floor..."
activate()
A:ChangeTurf(/turf/simulated/floor/plating)
A:ChangeTurf(/turf/simulated/floor/plating/airless)
return 1
return 0
@@ -132,7 +132,7 @@ RCD
if(do_after(user, 40))
if(!useResource(5, user)) return 0
activate()
A:ChangeTurf(/turf/simulated/floor/plating)
A:ChangeTurf(/turf/simulated/floor/plating/airless)
return 1
return 0