diff --git a/code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm b/code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm index ebe512c08b6..98485e6907c 100644 --- a/code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm +++ b/code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm @@ -108,6 +108,10 @@ else user << "\red Access denied." + else if(istype(W, /obj/item/weapon/wrench)) + src.anchored = !src.anchored + src.visible_message("\blue \icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].") + else src.add_fingerprint(user) user << "\red You hit the [src.name] with your [W.name]!" diff --git a/code/WorkInProgress/Cael_Aislinn/shield_gen.dm b/code/WorkInProgress/Cael_Aislinn/shield_gen.dm index 46f1f4c6abb..9eacb37d7b8 100644 --- a/code/WorkInProgress/Cael_Aislinn/shield_gen.dm +++ b/code/WorkInProgress/Cael_Aislinn/shield_gen.dm @@ -25,7 +25,7 @@ var/max_field_strength = 10 var/time_since_fail = 100 var/energy_conversion_rate = 0.01 //how many renwicks per watt? - var/flicker_shield_glitch = 1 //shield is slightly faulty, and flickers + var/flicker_shield_glitch = 1 //shield is slightly faulty and flickers - don't think this is working as intended // use_power = 1 //0 use nothing //1 use idle power @@ -129,15 +129,8 @@ if(E.strength < target_field_strength) E.strength += strengthen_rate - retry: if(stored_renwicks - E.strength < 0) - if(owned_capacitor.stored_charge > 0) - var/emergency_renwicks = min(E.strength, owned_capacitor.stored_charge * energy_conversion_rate) - owned_capacitor.stored_charge -= emergency_renwicks / energy_conversion_rate - stored_renwicks += emergency_renwicks - goto retry - else - E.strength = stored_renwicks + E.strength = stored_renwicks stored_renwicks -= E.strength average_field_strength += E.strength @@ -175,6 +168,10 @@ else user << "\red Access denied." + else if(istype(W, /obj/item/weapon/wrench)) + src.anchored = !src.anchored + src.visible_message("\blue \icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].") + else src.add_fingerprint(user) user << "\red You hit the [src.name] with your [W.name]!" diff --git a/code/WorkInProgress/Cael_Aislinn/shielding.dmi b/code/WorkInProgress/Cael_Aislinn/shielding.dmi index 99eadeba4d7..58dd98641bc 100644 Binary files a/code/WorkInProgress/Cael_Aislinn/shielding.dmi and b/code/WorkInProgress/Cael_Aislinn/shielding.dmi differ