Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

This commit is contained in:
Aurorablade
2016-08-23 00:53:31 -04:00
100 changed files with 1307 additions and 975 deletions
+1 -6
View File
@@ -1643,9 +1643,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
+1 -1
View File
@@ -86,7 +86,7 @@
end_sound = 'sound/lavaland/ash_storm_end.ogg'
end_overlay = "light_ash"
area_type = /area/mine
area_type = /area/mine/dangerous
target_level = MINING
immunity_type = "ash"