Merge remote-tracking branch 'ParadiseSS13/master' into nanoui-is-dead

This commit is contained in:
AffectedArc07
2020-11-27 10:21:41 +00:00
29 changed files with 506 additions and 191 deletions
@@ -169,6 +169,7 @@
damtype = BURN
hitsound = 'sound/weapons/sear.ogg'
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
needs_permit = TRUE
var/turf_type = /turf/simulated/floor/plating/lava/smooth
var/transform_string = "lava"
var/reset_turf_type = /turf/simulated/floor/plating/asteroid/basalt
@@ -9,6 +9,7 @@
force = 25
damtype = BURN
hitsound = 'sound/weapons/sear.ogg'
needs_permit = TRUE
var/storm_type = /datum/weather/ash_storm
var/storm_cooldown = 0