mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
fixes atmos machines not dropping frame and parts
moves drying rack dropping wood out of Destroy() transfers fingerprints to dropped machine frame, halves obj_integrity of non-disassembled deconstructed pipes and machine frames
This commit is contained in:
@@ -187,7 +187,7 @@ Pipelines + Other Objects -> Pipe network
|
||||
//You unwrenched a pipe full of pressure? let's splat you into the wall silly.
|
||||
if(unsafe_wrenching)
|
||||
unsafe_pressure_release(user,internal_pressure)
|
||||
deconstruct()
|
||||
deconstruct(TRUE)
|
||||
else
|
||||
return ..()
|
||||
|
||||
@@ -208,13 +208,16 @@ Pipelines + Other Objects -> Pipe network
|
||||
//Values based on 2*ONE_ATMOS (the unsafe pressure), resulting in 20 range and 4 speed
|
||||
user.throw_at(general_direction,pressures/10,pressures/50)
|
||||
|
||||
/obj/machinery/atmospherics/deconstruct()
|
||||
if(can_unwrench)
|
||||
stored.loc = get_turf(src)
|
||||
transfer_fingerprints_to(stored)
|
||||
stored = null
|
||||
|
||||
qdel(src)
|
||||
/obj/machinery/atmospherics/deconstruct(disassembled = TRUE)
|
||||
if(can_deconstruct)
|
||||
if(can_unwrench)
|
||||
if(stored)
|
||||
stored.forceMove(get_turf(src))
|
||||
if(!disassembled)
|
||||
stored.obj_integrity = stored.max_integrity * 0.5
|
||||
transfer_fingerprints_to(stored)
|
||||
stored = null
|
||||
..()
|
||||
|
||||
/obj/machinery/atmospherics/on_construction(D, P, C)
|
||||
if(C)
|
||||
@@ -321,7 +324,7 @@ Pipelines + Other Objects -> Pipe network
|
||||
|
||||
/obj/machinery/atmospherics/singularity_pull(S, current_size)
|
||||
if(current_size >= STAGE_FIVE)
|
||||
deconstruct()
|
||||
deconstruct(FALSE)
|
||||
|
||||
/obj/machinery/atmospherics/update_remote_sight(mob/user)
|
||||
user.sight |= (SEE_TURFS|BLIND)
|
||||
|
||||
Reference in New Issue
Block a user