Merge remote-tracking branch 'upstream/dev' into span_class=notice

Conflicts:
	code/ZAS/Diagnostic.dm
	code/game/machinery/computer3/laptop.dm
	code/game/machinery/requests_console.dm
	code/game/objects/items/stacks/tiles/plasteel.dm
This commit is contained in:
GinjaNinja32
2015-06-05 00:49:13 +01:00
102 changed files with 2452 additions and 1857 deletions
@@ -26,28 +26,9 @@
stacktype = /obj/item/stack/tile/plasteel
build_type = /obj/item/stack/tile/plasteel
/*
/obj/item/stack/tile/plasteel/attack_self(mob/user as mob)
if (usr.stat)
return
var/T = user.loc
if (!( istype(T, /turf) ))
user << "<span class='warning'>You must be on the ground!</span>"
return
if (!( istype(T, /turf/space) ))
user << "<span class='warning'>You cannot build on or repair this turf!</span>"
return
src.build(T)
src.add_fingerprint(user)
use(1)
return
*/
/obj/item/stack/tile/plasteel/proc/build(turf/S as turf)
if (istype(S,/turf/space))
S.ChangeTurf(/turf/simulated/floor/plating/airless)
else
S.ChangeTurf(/turf/simulated/floor/plating)
// var/turf/simulated/floor/W = S.ReplaceWithFloor()
// W.make_plating()
return