cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10686 from VOREStation/upstream-merge-8146

Browse Source 
[MIRROR] Removes Global Iterators
This commit is contained in:
Novacat
2021-06-19 09:43:39 -04:00
committed by GitHub
parent c8ede566f3 80f20d7174
commit 65ba367501
30 changed files with 4412 additions and 4743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shieldgen/directional_shield.dm
+3 -3
View File
@@ -363,15 +363,15 @@
if((my_tool && loc != my_tool) && (my_mecha && loc != my_mecha))
forceMove(my_tool)
if(active)
my_tool.set_ready_state(0)
my_tool.set_ready_state(FALSE)
if(my_mecha.has_charge(my_tool.energy_drain * 50)) //Stops at around 1000 charge.
my_mecha.use_power(my_tool.energy_drain)
else
destroy_shields()
my_tool.set_ready_state(1)
my_tool.set_ready_state(TRUE)
my_tool.log_message("Power lost.")
else
my_tool.set_ready_state(1)
my_tool.set_ready_state(TRUE)
/obj/item/shield_projector/line/exosuit/attack_self(var/mob/living/user)
if(active)