Adds parent calls to almost all tool_acts (#45582)

* Adds parent calls to almost all tool_acts

* actually compiles
This commit is contained in:
nemvar
2019-08-03 22:25:57 -07:00
committed by Rob Bailey
parent 21cd58ec20
commit e587b970da
73 changed files with 114 additions and 24 deletions
@@ -161,6 +161,7 @@
pixel_y = -32
/obj/item/gps/computer/wrench_act(mob/living/user, obj/item/I)
..()
if(flags_1 & NODECONSTRUCT_1)
return TRUE
@@ -240,6 +241,7 @@
qdel(src)
/obj/structure/fans/wrench_act(mob/living/user, obj/item/I)
..()
if(flags_1 & NODECONSTRUCT_1)
return TRUE
+2 -1
View File
@@ -80,7 +80,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
var/sheets = round(amount) / MINERAL_MATERIAL_AMOUNT
var/ref = REF(M)
if (sheets)
if (sheets >= 1)
if (sheets >= 1)
ui += "<a href='?src=[REF(src)];ejectsheet=[ref];eject_amt=1'>Eject</a>"
else
ui += "<span class='linkOff'>Eject</span>"
@@ -163,6 +163,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
return TRUE
/obj/machinery/ore_silo/multitool_act(mob/living/user, obj/item/multitool/I)
. = ..()
if (istype(I))
to_chat(user, "<span class='notice'>You log [src] in the multitool's buffer.</span>")
I.buffer = src
+1
View File
@@ -86,6 +86,7 @@
. += "<span class='notice'>There is \a [M] installed, using <b>[M.cost]%</b> capacity.</span>"
/mob/living/simple_animal/hostile/mining_drone/welder_act(mob/living/user, obj/item/I)
..()
. = TRUE
if(mode == MINEDRONE_ATTACK)
to_chat(user, "<span class='warning'>[src] can't be repaired while in attack mode!</span>")
+2
View File
@@ -40,6 +40,7 @@
add_overlay(stack_overlays)
/obj/item/stack/ore/welder_act(mob/living/user, obj/item/I)
..()
if(!refined_type)
return TRUE
@@ -451,6 +452,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
..()
/obj/item/coin/wirecutter_act(mob/living/user, obj/item/I)
..()
if(!string_attached)
return TRUE