Conflict resolution and adds sanitization to marking SQL handling.

This commit is contained in:
KasparoVy
2016-08-21 00:01:12 -04:00
74 changed files with 461 additions and 205 deletions
+1 -6
View File
@@ -1644,9 +1644,4 @@
/mob/living/simple_animal/construct/armoured/mind_initialize()
..()
mind.assigned_role = "Juggernaut"
mind.special_role = SPECIAL_ROLE_CULTIST
/mob/living/simple_animal/vox/armalis/mind_initialize()
..()
mind.assigned_role = "Armalis"
mind.special_role = SPECIAL_ROLE_RAIDER
mind.special_role = SPECIAL_ROLE_CULTIST