Add lints for "new" override prevention feature (#49672)

* Add lints for "new" override prevention feature

* bEsPoKe

* i'm an idiot

* arg index
This commit is contained in:
Emmett Gaines
2020-03-05 10:22:19 -05:00
committed by GitHub
parent 5622112514
commit 33458640dc
10 changed files with 53 additions and 41 deletions
+1 -17
View File
@@ -30,7 +30,6 @@
var/change_icons = 1
var/can_off_process = 0
var/light_intensity = 2 //how powerful the emitted light is when used.
var/progress_flash_divisor = 10
var/burned_fuel_for = 0 //when fuel was last removed
heat = 3800
tool_behaviour = TOOL_WELDER
@@ -45,6 +44,7 @@
/obj/item/weldingtool/ComponentInitialize()
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
AddElement(/datum/element/tool_flash, light_intensity)
/obj/item/weldingtool/update_icon_state()
if(welding)
@@ -245,22 +245,6 @@
/obj/item/weldingtool/proc/isOn()
return welding
// When welding is about to start, run a normal tool_use_check, then flash a mob if it succeeds.
/obj/item/weldingtool/tool_start_check(mob/living/user, amount=0)
. = tool_use_check(user, amount)
if(. && user && get_dist(get_turf(src), get_turf(user)) <= 1)
user.flash_act(light_intensity)
// Flash the user during welding progress
/obj/item/weldingtool/tool_check_callback(mob/living/user, amount, datum/callback/extra_checks)
. = ..()
if(. && user && get_dist(get_turf(src), get_turf(user)) <= 1)
if (progress_flash_divisor == 0)
user.flash_act(min(light_intensity,1))
progress_flash_divisor = initial(progress_flash_divisor)
else
progress_flash_divisor--
// If welding tool ran out of fuel during a construction task, construction fails.
/obj/item/weldingtool/tool_use_check(mob/living/user, amount)
if(!isOn() || !check_fuel())