cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes (#20343)

Browse Source 
* MoMMIs can now build firelocks

* Fixed pipes being hidden by glass floors

* Fixed motorized wheelchairs getting infinite power if their cell had an odd amount of charge
This commit is contained in:
BarneyGumball
2018-10-21 06:04:50 +10:00
committed by MadmanMartian
parent 73c1be9608
commit 87cc936dd0
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ATMOSPHERICS/pipes.dm
View File

@@ -937,7 +937,7 @@
var/list/layer_nodes = list() var/list/layer_nodes = list()
var/obj/machinery/atmospherics/other_node = null 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() /obj/machinery/atmospherics/pipe/layer_manifold/New()
for(var/pipelayer = PIPING_LAYER_MIN; pipelayer <= PIPING_LAYER_MAX; pipelayer += PIPING_LAYER_INCREMENT) for(var/pipelayer = PIPING_LAYER_MIN; pipelayer <= PIPING_LAYER_MAX; pipelayer += PIPING_LAYER_INCREMENT)

4
code/game/machinery/doors/firedoor.dm
View File

@@ -559,8 +559,6 @@ var/global/list/alert_overlays_global = list()
to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>") to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
return 0 return 0
if(!user.is_holding_item(src))
return 1
var/current_turf = get_turf(src) var/current_turf = get_turf(src)
var/turf_face = get_step(current_turf,user.dir) var/turf_face = get_step(current_turf,user.dir)
if(SSair.air_blocked(current_turf, turf_face)) 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) if(F && F.dir == user.dir)
to_chat(user, "<span class = 'warning'>There is already a firedoor facing that direction.</span>") to_chat(user, "<span class = 'warning'>There is already a firedoor facing that direction.</span>")
return 1 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)) var/obj/machinery/door/firedoor/border_only/B = new(get_turf(src))
B.change_dir(user.dir) B.change_dir(user.dir)
qdel(src) qdel(src)

2
code/game/objects/structures/vehicles/wheelchair.dm
View File

@@ -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) /obj/structure/bed/chair/vehicle/wheelchair/motorized/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0, glide_size_override = 0)
..() ..()
if(internal_battery) 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() /obj/structure/bed/chair/vehicle/wheelchair/motorized/getMovementDelay()
if(internal_battery && internal_battery.charge) if(internal_battery && internal_battery.charge)

1
code/game/turfs/simulated/floor_glass.dm
View File

@@ -9,6 +9,7 @@
plane = SPACE_BACKGROUND_PLANE plane = SPACE_BACKGROUND_PLANE
dynamic_lighting = 0 dynamic_lighting = 0
luminosity = 1 luminosity = 1
intact = 0 // make pipes appear above space
var/health=40 // same as rwindow. 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()) var/sheetamount = 1 //Number of sheets needed to build this floor (determines how much shit is spawned via Destroy())