Merge remote-tracking branch 'upstream/master' into system-corruption

This commit is contained in:
DeltaFire
2020-11-13 01:00:50 +01:00
121 changed files with 27775 additions and 488 deletions
+1 -1
View File
@@ -508,7 +508,7 @@
if("constructwraith")
M.change_mob_type( /mob/living/simple_animal/hostile/construct/wraith , null, null, delmob )
if("shade")
M.change_mob_type( /mob/living/simple_animal/shade , null, null, delmob )
M.change_mob_type( /mob/living/simple_animal/hostile/construct/shade , null, null, delmob )
/////////////////////////////////////new ban stuff