Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction

Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
This commit is contained in:
phil235
2016-04-24 21:22:37 +02:00
132 changed files with 72880 additions and 1732 deletions
+7 -3
View File
@@ -1,9 +1,13 @@
/obj/effect/decal/point
name = "arrow"
/obj/effect/overlay/temp/point
name = "pointer"
icon = 'icons/mob/screen_gen.dmi'
icon_state = "arrow"
layer = 16
mouse_opacity = 0
duration = 25
/obj/effect/overlay/temp/point/New(loc, set_invis = 0)
..()
invisibility = set_invis
// Used for spray that you spray at walls, tables, hydrovats etc
/obj/effect/decal/spraystill