mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 15:45:25 +01:00
Revert from area to text.
Conflicts: code/modules/power/power.dm
This commit is contained in:
+1
-1
@@ -86,7 +86,7 @@ obj/item/check_airflow_movable(n)
|
||||
return
|
||||
if(src:shoes)
|
||||
if(istype(src:shoes, /obj/item/clothing/shoes/magboots))
|
||||
if(src:shoes:magpulse)
|
||||
if(src:shoes.flags & NOSLIP)
|
||||
return
|
||||
src << "\red You are sucked away by airflow!"
|
||||
var/airflow_falloff = 9 - ul_FalloffAmount(airflow_dest) //It's a fast falloff calc. Very useful.
|
||||
|
||||
@@ -112,7 +112,7 @@ Class Procs:
|
||||
var/global/gl_uid = 1
|
||||
var/custom_aghost_alerts=0
|
||||
var/panel_open = 0
|
||||
var/area/myArea
|
||||
var/myArea
|
||||
|
||||
/obj/machinery/New()
|
||||
addAtProcessing()
|
||||
|
||||
@@ -56,17 +56,21 @@
|
||||
|
||||
|
||||
/obj/machinery/proc/use_power(var/amount, var/chan = -1, var/autocalled = 0) // defaults to power_channel
|
||||
var/area/A = getArea()
|
||||
var/A = getArea()
|
||||
|
||||
if(!A || !isarea(A) || !A.master)
|
||||
if(!A || !isarea(A))
|
||||
return
|
||||
|
||||
if(chan == -1)
|
||||
var/area/B = A
|
||||
|
||||
if (!B.master)
|
||||
return
|
||||
|
||||
if (-1 == chan)
|
||||
chan = power_channel
|
||||
|
||||
A.master.use_power(amount, chan)
|
||||
if(!autocalled)
|
||||
A.master.powerupdate = 2 // Decremented by 2 each GC tick, since it's not auto power change we're going to update power twice.
|
||||
|
||||
B.master.use_power(amount, chan)
|
||||
|
||||
/obj/machinery/proc/power_change() // called whenever the power settings of the containing area change
|
||||
// by default, check equipment channel & set flag
|
||||
|
||||
Reference in New Issue
Block a user