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

This commit is contained in:
Mark van Alphen
2019-06-03 16:50:42 +02:00
10 changed files with 131 additions and 191 deletions
+7 -4
View File
@@ -6,12 +6,15 @@
plane = FLOOR_PLANE
armor = list(melee = 50, bullet = 30, laser = 70, energy = 50, bomb = 20, bio = 0, rad = 0)
var/id = null
var/on = 1.0
anchored = 1.0
var/on = FALSE
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 2
active_power_usage = 4
/obj/machinery/igniter/on
on = TRUE
/obj/machinery/igniter/attack_ai(mob/user as mob)
return src.attack_hand(user)
@@ -51,8 +54,8 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "migniter"
var/id = null
var/disable = 0
var/last_spark = 0
var/disable = FALSE
var/last_spark = FALSE
var/base_state = "migniter"
anchored = 1
+1 -1
View File
@@ -116,7 +116,7 @@
if(TURF_WET_PERMAFROST) // Permafrost
M.slip("the frosted floor", 0, 5, tilesSlipped = 1, walkSafely = 0, slipAny = 1)
/turf/simulated/ChangeTurf(var/path)
/turf/simulated/ChangeTurf(path, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE)
. = ..()
queue_smooth_neighbors(src)