cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-24 21:56:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

SSmachines instancing PR (#9080)

Browse Source 
* Consistency Pass #1
Power cells of all types are now considered stock parts
Went through materials.dm and did some copy+paste work make material definitions consistent across the codebase (eg "steel" = 50 -> MAT_STEEL = 50)

* Machines are now instances in SSMachines

* Performance improvements by way of instancing all of SSmachines

* Fixes the powersink

* Revert "Consistency Pass #1"

This reverts commit cbeef1b5db.

* Update machines.dm

Styling changes

* Update machines.dm

* Update machines.dm

forgot to update the doc
This commit is contained in:
enbyfriend
2023-07-18 22:45:49 -08:00
committed by GitHub
parent 567f003541
commit 4889b33cea
17 changed files with 150 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/powersink.dm
+9 -24
View File
@@ -19,14 +19,12 @@
var/power_drained = 0 // Amount of power drained.
var/max_power = 1e9 // Detonation point.
var/mode = 0 // 0 = off, 1=clamped (off), 2=operating
var/drained_this_tick = 0 // This is unfortunately necessary to ensure we process powersinks BEFORE other machinery such as APCs.
var/datum/powernet/PN // Our powernet
var/obj/structure/cable/attached // the attached cable
/obj/item/powersink/Destroy()
STOP_PROCESSING(SSobj, src)
STOP_PROCESSING_POWER_OBJECT(src)
STOP_PROCESSING_MACHINERY(src, SSMACHINES_POWEROBJS_LIST)
..()
/obj/item/powersink/attackby(var/obj/item/I, var/mob/user)
@@ -49,8 +47,7 @@
return
else
if (mode == 2)
STOP_PROCESSING(SSobj, src) // Now the power sink actually stops draining the station's power if you unhook it. --NeoFite
STOP_PROCESSING_POWER_OBJECT(src)
START_PROCESSING_MACHINERY(src, SSMACHINES_POWEROBJS_LIST)
anchored = 0
mode = 0
src.visible_message("<span class='notice'>[user] detaches [src] from the cable!</span>")
@@ -73,38 +70,31 @@
src.visible_message("<span class='notice'>[user] activates [src]!</span>")
mode = 2
icon_state = "powersink1"
START_PROCESSING(SSobj, src)
datum_flags &= ~DF_ISPROCESSING // Have to reset this flag so that PROCESSING_POWER_OBJECT can re-add it. It fails if the flag is already present. - Ater
START_PROCESSING_POWER_OBJECT(src)
START_PROCESSING_MACHINERY(src, SSMACHINES_POWEROBJS_LIST)
if(2) //This switch option wasn't originally included. It exists now. --NeoFite
src.visible_message("<span class='notice'>[user] deactivates [src]!</span>")
mode = 1
set_light(0)
icon_state = "powersink0"
STOP_PROCESSING(SSobj, src)
STOP_PROCESSING_POWER_OBJECT(src)
STOP_PROCESSING_MACHINERY(src, SSMACHINES_POWEROBJS_LIST)
/obj/item/powersink/pwr_drain()
if(!attached)
return 0
if(drained_this_tick)
return 1
drained_this_tick = 1
var/drained = 0
if(!PN)
if(!attached.powernet)
return 1
set_light(12)
PN.trigger_warning()
attached.powernet.trigger_warning()
// found a powernet, so drain up to max power from it
drained = PN.draw_power(drain_rate)
drained = attached.powernet.draw_power(drain_rate)
// if tried to drain more than available on powernet
// now look for APCs and drain their cells
if(drained < drain_rate)
for(var/obj/machinery/power/terminal/T in PN.nodes)
for(var/obj/machinery/power/terminal/T in attached.powernet.nodes)
// Enough power drained this tick, no need to torture more APCs
if(drained >= drain_rate)
break
@@ -120,7 +110,6 @@
/obj/item/powersink/process()
drained_this_tick = 0
power_drained -= min(dissipation_rate, power_drained)
if(power_drained > max_power * 0.95)
playsound(src, 'sound/effects/screech.ogg', 100, 1, 1)
@@ -128,7 +117,3 @@
explosion(src.loc, 3,6,9,12)
qdel(src)
return
if(attached && attached.powernet)
PN = attached.powernet
else
PN = null