diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 962db9f2b20..2b2b55906e3 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -937,7 +937,7 @@ var/list/layer_nodes = list() var/obj/machinery/atmospherics/other_node = null - var/static/image/centre_image = image('icons/obj/atmospherics/pipe_manifold.dmi', "layer_center") + var/static/image/centre_image = image(icon = 'icons/obj/atmospherics/pipe_manifold.dmi', icon_state = "layer_center") /obj/machinery/atmospherics/pipe/layer_manifold/New() for(var/pipelayer = PIPING_LAYER_MIN; pipelayer <= PIPING_LAYER_MAX; pipelayer += PIPING_LAYER_INCREMENT) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index bd2ede53ba8..6913a24ab5e 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -559,8 +559,6 @@ var/global/list/alert_overlays_global = list() to_chat(user, "You don't have the dexterity to do this!") return 0 - if(!user.is_holding_item(src)) - return 1 var/current_turf = get_turf(src) var/turf_face = get_step(current_turf,user.dir) if(SSair.air_blocked(current_turf, turf_face)) @@ -570,7 +568,7 @@ var/global/list/alert_overlays_global = list() if(F && F.dir == user.dir) to_chat(user, "There is already a firedoor facing that direction.") return 1 - if(do_after(user, src, 5 SECONDS)) + if(do_after(user, user, 5 SECONDS)) var/obj/machinery/door/firedoor/border_only/B = new(get_turf(src)) B.change_dir(user.dir) qdel(src) diff --git a/code/game/objects/structures/vehicles/wheelchair.dm b/code/game/objects/structures/vehicles/wheelchair.dm index 67afd0a1d25..840525e2e31 100644 --- a/code/game/objects/structures/vehicles/wheelchair.dm +++ b/code/game/objects/structures/vehicles/wheelchair.dm @@ -220,7 +220,7 @@ /obj/structure/bed/chair/vehicle/wheelchair/motorized/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0, glide_size_override = 0) ..() if(internal_battery) - internal_battery.use(2) //Example use: 100 charge to get from the cargo desk to medbay side entrance + internal_battery.use(min(2, internal_battery.charge)) //Example use: 100 charge to get from the cargo desk to medbay side entrance /obj/structure/bed/chair/vehicle/wheelchair/motorized/getMovementDelay() if(internal_battery && internal_battery.charge) diff --git a/code/game/turfs/simulated/floor_glass.dm b/code/game/turfs/simulated/floor_glass.dm index 2bafce42c75..cddbb34211a 100644 --- a/code/game/turfs/simulated/floor_glass.dm +++ b/code/game/turfs/simulated/floor_glass.dm @@ -9,6 +9,7 @@ plane = SPACE_BACKGROUND_PLANE dynamic_lighting = 0 luminosity = 1 + intact = 0 // make pipes appear above space var/health=40 // same as rwindow. var/sheetamount = 1 //Number of sheets needed to build this floor (determines how much shit is spawned via Destroy())