Merge pull request #4057 from deathride58/manualmirrors2

Manually mirrors #32838 and #32462 from upstream
This commit is contained in:
deathride58
2017-11-21 20:00:18 +00:00
committed by GitHub
6 changed files with 4 additions and 57 deletions
+1
View File
@@ -520,6 +520,7 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
//Hook for running code when a dir change occurs
/atom/proc/setDir(newdir)
SendSignal(COMSIG_ATOM_DIR_CHANGE, dir, newdir)
dir = newdir
/atom/proc/mech_melee_attack(obj/mecha/M)
+1 -1
View File
@@ -31,7 +31,7 @@
var/turf/T = loc
if(!istype(T)) //you know this will happen somehow
CRASH("Turf decal initialized in an object/nullspace")
T.AddComponent(/datum/component/turf_decal, dir, icon, icon_state)
T.AddComponent(/datum/component/decal, icon, icon_state, dir)
/obj/effect/turf_decal/stripes/line
icon_state = "warningline"