attack_self refactor (#6754)

Changes proc header
This commit is contained in:
silicons
2024-09-16 13:09:37 -06:00
committed by GitHub
parent 12b1f0bb76
commit ac3e0a73a9
297 changed files with 441 additions and 430 deletions
+1 -1
View File
@@ -19,7 +19,7 @@ LINEN BINS
drop_sound = 'sound/items/drop/backpack.ogg'
pickup_sound = 'sound/items/pickup/backpack.ogg'
/obj/item/bedsheet/attack_self(mob/user)
/obj/item/bedsheet/attack_self(mob/user, datum/event_args/actor/actor)
. = ..()
if(.)
return
@@ -262,7 +262,7 @@
drop_sound = 'sound/items/drop/axe.ogg'
pickup_sound = 'sound/items/pickup/axe.ogg'
/obj/item/roller/attack_self(mob/user)
/obj/item/roller/attack_self(mob/user, datum/event_args/actor/actor)
. = ..()
if(.)
return
@@ -301,7 +301,7 @@
. = ..()
held = new /obj/item/roller(src)
/obj/item/roller_holder/attack_self(mob/user)
/obj/item/roller_holder/attack_self(mob/user, datum/event_args/actor/actor)
. = ..()
if(.)
return
@@ -195,7 +195,7 @@
/// What we unfold to
var/unfolded_type = /obj/structure/bed/chair/wheelchair
/obj/item/wheelchair/attack_self(mob/user)
/obj/item/wheelchair/attack_self(mob/user, datum/event_args/actor/actor)
. = ..()
if(.)
return
+1 -1
View File
@@ -131,7 +131,7 @@
reagents.add_reagent("chlorine", 3)
reagents.add_reagent("ammonia", 1)
/obj/item/reagent_containers/food/urinalcake/attack_self(mob/user)
/obj/item/reagent_containers/food/urinalcake/attack_self(mob/user, datum/event_args/actor/actor)
user.visible_message("<span class='notice'>[user] squishes [src]!</span>", "<span class='notice'>You squish [src].</span>", "<i>You hear a squish.</i>")
icon_state = "urinalcake_squish"
addtimer(VARSET_CALLBACK(src, icon_state, "urinalcake"), 8)