cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 20:54:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11600 from VOREStation/upstream-merge-8269

Browse Source 
[MIRROR] Mecha Bugfixes
This commit is contained in:
Aronai Sieyes
2021-09-27 14:45:07 -04:00
committed by Chompstation Bot
parent cfad19ad15
commit 466b9936be
1 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha.dm
+28 -19
View File
@@ -212,6 +212,9 @@
for(var/path in starting_equipment)
var/obj/item/mecha_parts/mecha_equipment/ME = new path(src)
ME.attach(src)
START_PROCESSING(SSobj, src)
update_transform()
/obj/mecha/drain_power(var/drain_check)
@@ -328,6 +331,8 @@
QDEL_NULL(spark_system)
QDEL_NULL(minihud)
STOP_PROCESSING(SSobj, src)
mechas_list -= src //global mech list
. = ..()
@@ -917,27 +922,19 @@
if(istype(obstacle, /mob))//First we check if it is a mob. Mechs mostly shouln't go through them, even while phasing.
var/mob/M = obstacle
M.Move(get_step(obstacle,src.dir))
else if(phasing && get_charge()>=phasing_energy_drain)//Phazon check. This could use an improvement elsewhere.
src.use_power(phasing_energy_drain)
phase()
. = ..(obstacle)
return
else if(istype(obstacle, /obj))//Then we check for regular obstacles.
var/obj/O = obstacle
if(phasing && get_charge()>=phasing_energy_drain)//Phazon check. This could use an improvement elsewhere.
spawn()
if(can_phase)
can_phase = FALSE
flick("[initial_icon]-phase", src)
src.loc = get_step(src,src.dir)
src.use_power(phasing_energy_drain)
sleep(get_step_delay() * 3)
can_phase = TRUE
occupant_message("Phazed.")
. = ..(obstacle)
return
if(istype(O, /obj/effect/portal)) //derpfix
src.anchored = FALSE //I have no idea what this really fix.
src.anchored = 0 // Portals can only move unanchored objects.
O.Crossed(src)
spawn(0)//countering portal teleport spawn(0), hurr
src.anchored = TRUE
else if(O.anchored)
src.anchored = 1
if(O.anchored)
obstacle.Bumped(src)
else
step(obstacle,src.dir)
@@ -946,6 +943,18 @@
. = ..(obstacle)
return
/obj/mecha/proc/phase() // Force the mecha to move forward by phasing.
set waitfor = FALSE
if(can_phase)
can_phase = FALSE
flick("[initial_icon]-phase", src)
forceMove(get_step(src,src.dir))
sleep(get_step_delay() * 3)
can_phase = TRUE
occupant_message("Phazed.")
return TRUE // In the event this is sequenced
return FALSE
///////////////////////////////////
//////// Internal damage ////////
///////////////////////////////////
@@ -1704,8 +1713,7 @@
return
/obj/mecha/remove_air(amount)
var/obj/item/mecha_parts/component/gas/GC = internal_components[MECH_GAS]
if(use_internal_tank && (GC && prob(GC.get_efficiency() * 100)))
if(use_internal_tank)
return cabin_air.remove(amount)
else
var/turf/T = get_turf(src)
@@ -1714,7 +1722,8 @@
return
/obj/mecha/return_air()
if(use_internal_tank)
var/obj/item/mecha_parts/component/gas/GC = internal_components[MECH_GAS]
if(use_internal_tank && (GC && prob(GC.get_efficiency() * 100)))
return cabin_air
return get_turf_air()