Merging SkyMarshal's stuff.

This commit is contained in:
Ren Erthilo
2012-03-30 16:26:04 +01:00
54 changed files with 3110 additions and 2211 deletions
+1 -1
View File
@@ -464,7 +464,7 @@ mob/proc
target_locked
icon = 'icons/effects/Targeted.dmi'
icon_state = "locked"
layer = 99
layer = 17.9
// captured
// icon = 'Captured.dmi'
// layer = 99