Merge branch 'master' into cumcom

This commit is contained in:
Dahlular
2021-03-24 07:55:15 -06:00
111 changed files with 87427 additions and 2576 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
var/obj/item/assembly/signaler/anomaly/aSignal
var/area/impact_area
var/lifespan = 1190
var/lifespan = 1690
var/death_time
var/countdown_colour