cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

adds double upstreams too

Browse Source
This commit is contained in:
Verkister
2021-10-22 17:23:07 +03:00
parent 0dcff8498b
commit 2bccef7423
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/mecha/equipment/mecha_equipment.dm
View File

@@ -234,6 +234,8 @@
return ..() return ..()
/obj/item/mecha_parts/mecha_equipment/proc/detach(atom/moveto=null) /obj/item/mecha_parts/mecha_equipment/proc/detach(atom/moveto=null)
if(!chassis)
return
moveto = moveto || get_turf(chassis) moveto = moveto || get_turf(chassis)
forceMove(moveto) forceMove(moveto)
chassis.equipment -= src chassis.equipment -= src

2
code/game/objects/effects/decals/Cleanable/fuel.dm
View File

@@ -38,7 +38,7 @@
for(var/d in cardinal) for(var/d in cardinal)
var/turf/simulated/target = get_step(src,d) var/turf/simulated/target = get_step(src,d)
var/turf/simulated/origin = get_turf(src) var/turf/simulated/origin = get_turf(src)
if(origin.CanPass(null, target, 0, 0) && target.CanPass(null, origin, 0, 0)) if(origin.CanPass(src, target, 0, 0) && target.CanPass(src, origin, 0, 0))
var/obj/effect/decal/cleanable/liquid_fuel/other_fuel = locate() in target var/obj/effect/decal/cleanable/liquid_fuel/other_fuel = locate() in target
if(other_fuel) if(other_fuel)
other_fuel.amount += amount*0.25 other_fuel.amount += amount*0.25

2
code/game/objects/structures/girders.dm
View File

@@ -1,4 +1,5 @@
/obj/structure/girder /obj/structure/girder
name = "girder"
icon_state = "girder" icon_state = "girder"
anchored = TRUE anchored = TRUE
density = TRUE density = TRUE
@@ -418,4 +419,3 @@
/obj/structure/girder/eris /obj/structure/girder/eris
wall_type = /turf/simulated/wall/eris wall_type = /turf/simulated/wall/eris