another huge sync

This commit is contained in:
LetterJay
2017-06-21 18:00:00 -05:00
parent 0719541100
commit d04001c09d
51 changed files with 1443 additions and 981 deletions
@@ -180,7 +180,7 @@
. += "You recognise the footprints as belonging to:\n"
for(var/shoe in shoe_types)
var/obj/item/clothing/shoes/S = shoe
. += "some <B>[initial(S.name)]</B> \icon[S]\n"
. += "some <B>[initial(S.name)]</B> [bicon(initial(S.icon))]\n"
to_chat(user, .)
+2 -3
View File
@@ -25,13 +25,12 @@
/obj/effect/turf_decal/proc/get_decal()
return image(icon='icons/turf/decals.dmi',icon_state=icon_state,dir=dir,layer=TURF_LAYER)
/obj/effect/turf_decal/Initialize(mapload)
/obj/effect/turf_decal/Initialize()
..()
var/turf/T = loc
if(!istype(T)) //you know this will happen somehow
CRASH("Turf decal initialized in an object/nullspace")
T.add_decal(get_decal(),group)
qdel(src)
/obj/effect/turf_decal/stripes/line
icon_state = "warningline"