Just deleted about 400 bot accounts and a bunch of spam. To mitigate this in the future, we've enabled reCaptcha on signup. Let me know if someone got caught in the crossfire.

Commit 652ffb4f authored by clusterfack's avatar clusterfack Committed by GitHub
Browse files

Fix not all alien spells showing up in the tab (#11610)

Using multiple bitflags doesn't work with a switch, thus an if else-if change is necessary here.
parent cb5b4ed8
......@@ -1455,13 +1455,13 @@ var/list/slot_equipment_priority = list( \
for(var/spell/S in spell_list)
if((!S.connected_button) || !statpanel(S.panel))
continue //Not showing the noclothes spell
switch(S.charge_type)
if(Sp_RECHARGE)
statpanel(S.panel,"[S.charge_max? "[S.charge_counter/10.0]/[S.charge_max/10]" : "Free"]",S.connected_button)
if(Sp_CHARGES)
statpanel(S.panel,"[S.charge_max? "[S.charge_counter]/[S.charge_max]" : "Free"]",S.connected_button)
if(Sp_HOLDVAR)
statpanel(S.panel,"Required [S.holder_var_type]: [S.holder_var_amount]",S.connected_button)
var/charge_type = S.charge_type
if(charge_type & Sp_HOLDVAR)
statpanel(S.panel,"Required [S.holder_var_type]: [S.holder_var_amount]",S.connected_button)
else if(charge_type & Sp_CHARGES)
statpanel(S.panel,"[S.charge_max? "[S.charge_counter]/[S.charge_max] charges" : "Free"]",S.connected_button)
else if(charge_type & Sp_RECHARGE)
statpanel(S.panel,"[S.charge_max? "[S.charge_counter/10.0]/[S.charge_max/10] seconds" : "Free"]",S.connected_button)
sleep(world.tick_lag * 2)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment