diff --git a/code/game/click/telekinesis.dm b/code/game/click/telekinesis.dm index c73cbb1d65b..15aad96ce43 100644 --- a/code/game/click/telekinesis.dm +++ b/code/game/click/telekinesis.dm @@ -80,7 +80,7 @@ var/const/tk_maxrange = 15 if(slot != SLOT_ID_HANDS) qdel(src) -/obj/item/tk_grab/attack_self(mob/user) +/obj/item/tk_grab/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/content/enigmas/unsorted/deadringer.dm b/code/game/content/enigmas/unsorted/deadringer.dm index 1c96ad0b932..713930a2cb3 100644 --- a/code/game/content/enigmas/unsorted/deadringer.dm +++ b/code/game/content/enigmas/unsorted/deadringer.dm @@ -28,7 +28,7 @@ reveal() watchowner = null -/obj/item/deadringer/attack_self(mob/user) +/obj/item/deadringer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm index 34fc9bd363d..2a0bd9d563b 100644 --- a/code/game/gamemodes/changeling/powers/armor.dm +++ b/code/game/gamemodes/changeling/powers/armor.dm @@ -67,7 +67,7 @@ encumbrance = ITEM_ENCUMBRANCE_CHANGELING_MAGBOOTS encumbrance_on = ITEM_ENCUMBRANCE_CHANGELING_MAGBOOTS_PULSE -/obj/item/clothing/shoes/magboots/changeling/attack_self(mob/user) +/obj/item/clothing/shoes/magboots/changeling/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 5f9c08ac077..ef8947180eb 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -308,7 +308,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," O.show_message("\The [user] beats \the [L] with \the [src]!", 1) to_chat(target, "You feel searing heat inside!") -/obj/item/book/tome/attack_self(mob/user) +/obj/item/book/tome/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -426,7 +426,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," w_class = WEIGHT_CLASS_SMALL var/cultistsonly = 1 -/obj/item/book/tome/imbued/attack_self(mob/user) +/obj/item/book/tome/imbued/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/gamemodes/cult/soulstone.dm b/code/game/gamemodes/cult/soulstone.dm index 961eda8e053..a7ecb33efbe 100644 --- a/code/game/gamemodes/cult/soulstone.dm +++ b/code/game/gamemodes/cult/soulstone.dm @@ -36,7 +36,7 @@ ///////////////////Options for using captured souls/////////////////////////////////////// -/obj/item/soulstone/attack_self(mob/user) +/obj/item/soulstone/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 2f0c72a15df..97d5f141afa 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -5,7 +5,7 @@ var/uses = 0 info = "


" -/obj/item/paper/talisman/attack_self(mob/user) +/obj/item/paper/talisman/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index e086731d45d..e69ce927d90 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -13,7 +13,7 @@ var/active = 0 -/obj/item/pinpointer/attack_self(mob/user) +/obj/item/pinpointer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -64,7 +64,7 @@ var/turf/location = null var/obj/target = null -/obj/item/pinpointer/advpinpointer/attack_self(mob/user) +/obj/item/pinpointer/advpinpointer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -189,7 +189,7 @@ var/mode = 0 //Mode 0 locates disk, mode 1 locates the shuttle var/obj/machinery/computer/shuttle_control/multi/syndicate/home = null -/obj/item/pinpointer/nukeop/attack_self(mob/user) +/obj/item/pinpointer/nukeop/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -278,7 +278,7 @@ var/shuttle_comp_id = null var/obj/machinery/computer/shuttle_control/our_shuttle = null -/obj/item/pinpointer/shuttle/attack_self(mob/user) +/obj/item/pinpointer/shuttle/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm index 89323709dae..08a2db9943d 100644 --- a/code/game/gamemodes/technomancer/catalog.dm +++ b/code/game/gamemodes/technomancer/catalog.dm @@ -97,7 +97,7 @@ // Proc: attack_self() // Parameters: 1 (user - the mob clicking on the catalog) // Description: Shows an HTML window, to buy equipment and spells, if the user is the legitimate owner. Otherwise it cannot be used. -/obj/item/technomancer_catalog/attack_self(mob/user) +/obj/item/technomancer_catalog/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm index 9af0f71b860..cfa026f3d5d 100644 --- a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm +++ b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm @@ -26,7 +26,7 @@ . = ..() . += "There are [uses] uses remaining." -/obj/item/disposable_teleporter/attack_self(mob/user) +/obj/item/disposable_teleporter/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/gamemodes/technomancer/devices/shield_armor.dm b/code/game/gamemodes/technomancer/devices/shield_armor.dm index 24a751530f7..1a224114ee9 100644 --- a/code/game/gamemodes/technomancer/devices/shield_armor.dm +++ b/code/game/gamemodes/technomancer/devices/shield_armor.dm @@ -89,7 +89,7 @@ spark_system.start() playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) -/obj/item/clothing/suit/armor/shield/attack_self(mob/user) +/obj/item/clothing/suit/armor/shield/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/gamemodes/technomancer/devices/tesla_armor.dm b/code/game/gamemodes/technomancer/devices/tesla_armor.dm index c3fe7f29bc9..e4ec491c7ac 100644 --- a/code/game/gamemodes/technomancer/devices/tesla_armor.dm +++ b/code/game/gamemodes/technomancer/devices/tesla_armor.dm @@ -72,7 +72,7 @@ return 1 return 0 -/obj/item/clothing/suit/armor/tesla/attack_self(mob/user) +/obj/item/clothing/suit/armor/tesla/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/gamemodes/technomancer/equipment.dm b/code/game/gamemodes/technomancer/equipment.dm index 68d99f05240..b324fbe513c 100644 --- a/code/game/gamemodes/technomancer/equipment.dm +++ b/code/game/gamemodes/technomancer/equipment.dm @@ -193,7 +193,7 @@ slot_flags = SLOT_BELT attack_verb = list("beaten", "smashed", "struck", "whacked") -/obj/item/scepter/attack_self(mob/user) +/obj/item/scepter/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/gamemodes/technomancer/spell_objs.dm b/code/game/gamemodes/technomancer/spell_objs.dm index e4fc110458b..436fee7af44 100644 --- a/code/game/gamemodes/technomancer/spell_objs.dm +++ b/code/game/gamemodes/technomancer/spell_objs.dm @@ -197,7 +197,7 @@ // Proc: attack_self() // Parameters: 1 (user - the Technomancer that invoked this proc) // Description: Tries to call on_use_cast() if it is allowed to do so. Don't override this, override on_use_cast() instead. -/obj/item/spell/attack_self(mob/user) +/obj/item/spell/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 0beca8c9766..f014be3d776 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -145,7 +145,7 @@ w_class = WEIGHT_CLASS_NORMAL materials_base = list(MAT_STEEL = 4000, MAT_GLASS = 1000) -/obj/item/cell_charger_kit/attack_self(mob/user) +/obj/item/cell_charger_kit/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 3f04bf3cb14..bef45914d5e 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -525,7 +525,7 @@ var/diskcolor = pick(0,1,2) icon_state = "datadisk[diskcolor]" -/obj/item/disk/data/attack_self(mob/user) +/obj/item/disk/data/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/machinery/computer/arcade/orion.dm b/code/game/machinery/computer/arcade/orion.dm index 77d2a6c5f98..dea2864cc62 100644 --- a/code/game/machinery/computer/arcade/orion.dm +++ b/code/game/machinery/computer/arcade/orion.dm @@ -504,7 +504,7 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events()) else . += SPAN_NOTICE("There's a little switch on the bottom. It's flipped up.") -/obj/item/orion_ship/attack_self(mob/user) +/obj/item/orion_ship/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 45445346e41..d3b48657543 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -811,7 +811,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co drop_sound = 'sound/items/drop/wrapper.ogg' pickup_sound = 'sound/items/pickup/wrapper.ogg' -/obj/item/newspaper/attack_self(mob/user) +/obj/item/newspaper/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 478ccd977a1..2f195ab79ff 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -158,7 +158,7 @@ Buildable meters if(dir in GLOB.cornerdirs) setDir(turn(dir, 45)) -/obj/item/pipe/attack_self(mob/user) +/obj/item/pipe/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm index 7b7c5bbf476..b78e0ec3d3d 100644 --- a/code/game/machinery/supplybeacon.dm +++ b/code/game/machinery/supplybeacon.dm @@ -11,7 +11,7 @@ name = "inactive supermatter supply beacon" deploy_path = /obj/machinery/power/supply_beacon/supermatter -/obj/item/supply_beacon/attack_self(mob/user) +/obj/item/supply_beacon/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index 8d70cbc0d2e..f9d4af3472b 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -23,7 +23,7 @@ return ..() -/obj/item/frame/attack_self(mob/user) +/obj/item/frame/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 8338325c57e..d56dab3c653 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -226,7 +226,7 @@ var/countdown = 10 var/minetype = /obj/effect/mine //This MUST be an /obj/effect/mine type, or it'll runtime. -/obj/item/mine/attack_self(mob/user) +/obj/item/mine/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return // You do not want to move or throw a land mine while priming it... Explosives + Sudden Movement = Bad Times diff --git a/code/game/objects/items-interaction.dm b/code/game/objects/items-interaction.dm index a1b37b7c17c..6a7ec7d7eec 100644 --- a/code/game/objects/items-interaction.dm +++ b/code/game/objects/items-interaction.dm @@ -1,6 +1,8 @@ //* This file is explicitly licensed under the MIT license. *// //* Copyright (c) 2024 silicons *// +//* ----- Click Triggers ----- */ + //* Attack Hand *// /obj/item/on_attack_hand(datum/event_args/actor/clickchain/e_args) @@ -160,7 +162,9 @@ /mob/observer/dead/CanSlideItem(obj/item/I, turf/over) return is_spooky -//* Inhand Triggers *// +//* ------ Inhand Triggers ------ *// + +//* Attack Self *// /** * Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown. @@ -170,14 +174,15 @@ * todo: please stop overriding this, use on_attack_self. * todo: nuke mob/user. * todo: rename this to like /activate_inhand, /on_activate_inhand + * todo: actor is not currently always given. * * @params - * * actor - the event_args that spawned this call * * user - The person using us in hand; stop using this, this is deprecated + * * actor - the event_args that spawned this call * * @return TRUE to signal to overrides to stop the chain and do nothing. */ -/obj/item/proc/attack_self(mob/user, datum/event_args/actor/actor = new /datum/event_args/actor(user)) +/obj/item/proc/attack_self(mob/user, datum/event_args/actor/actor) // todo: this should realistically be SHOULD_NOT_OVERRIDE but there's a massive number of overrides (some unnecessary), so this is for a later date // SHOULD_NOT_OVERRIDE(TRUE) // may be re-evaluated later SEND_SIGNAL(src, COMSIG_ITEM_ACTIVATE_INHAND, actor) @@ -213,6 +218,8 @@ return TRUE return FALSE +//* Unique Action *// + /** * Called when a mob uses our unique aciton. * @@ -237,6 +244,8 @@ /obj/item/proc/on_unique_action(datum/event_args/actor/e_args) return FALSE +//* Defensive Toggle *// + /** * Called when a mob uses our defensive toggle action. * @@ -261,6 +270,8 @@ /obj/item/proc/on_defensive_toggle(datum/event_args/actor/e_args) return FALSE +//* Defensive Trigger *// + /** * Called when a mob uses our defensive trigger action. * diff --git a/code/game/objects/items/antag_spawners.dm b/code/game/objects/items/antag_spawners.dm index f6048fbcfd1..3fb433f2848 100644 --- a/code/game/objects/items/antag_spawners.dm +++ b/code/game/objects/items/antag_spawners.dm @@ -48,7 +48,7 @@ icon_state = "oldshieldoff" ghost_query_type = /datum/ghost_query/apprentice -/obj/item/antag_spawner/technomancer_apprentice/attack_self(mob/user) +/obj/item/antag_spawner/technomancer_apprentice/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -97,7 +97,7 @@ ghost_query_type = /datum/ghost_query/syndicate_drone var/drone_type = null -/obj/item/antag_spawner/syndicate_drone/attack_self(mob/user) +/obj/item/antag_spawner/syndicate_drone/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/balls.dm b/code/game/objects/items/balls.dm index 5532d734bcd..20184bddbd1 100644 --- a/code/game/objects/items/balls.dm +++ b/code/game/objects/items/balls.dm @@ -27,7 +27,7 @@ 'sound/items/toysqueak3.ogg' ) -/obj/item/toy/tennis/rainbow/attack_self(mob/user) +/obj/item/toy/tennis/rainbow/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 2051c966690..f950518faeb 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -46,7 +46,7 @@ var/can_expand_areas_into = AREA_SPACE // Can expand station areas only into space. var/can_rename_areas_in = AREA_STATION // Only station areas can be reanamed -/obj/item/blueprints/attack_self(mob/user) +/obj/item/blueprints/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 6c8fefdcafc..9e4845a365f 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -9,7 +9,7 @@ var/bag_type = /obj/structure/closet/body_bag -/obj/item/bodybag/attack_self(mob/user) +/obj/item/bodybag/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index e8e86f7fc15..8effa07967c 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -50,7 +50,7 @@ worth_intrinsic = 200 w_class = WEIGHT_CLASS_HUGE -/obj/item/stolenpackage/attack_self(mob/user) +/obj/item/stolenpackage/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -179,7 +179,7 @@ worth_intrinsic = 350 w_class = WEIGHT_CLASS_HUGE -/obj/item/stolenpackageplus/attack_self(mob/user) +/obj/item/stolenpackageplus/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -245,7 +245,7 @@ w_class = WEIGHT_CLASS_HUGE worth_intrinsic = 400 -/obj/item/mechasalvage/attack_self(mob/user) +/obj/item/mechasalvage/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 20fdc2dde99..f75e992a18f 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -322,7 +322,7 @@ GLOBAL_LIST_EMPTY(PDAs) return 1 -/obj/item/pda/ai/attack_self(mob/user) +/obj/item/pda/ai/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -674,7 +674,7 @@ GLOBAL_LIST_EMPTY(PDAs) ui.set_auto_update(auto_update) //NOTE: graphic resources are loaded on client login -/obj/item/pda/attack_self(mob/user) +/obj/item/pda/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 12eeab47952..f16209aeb0f 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -21,7 +21,7 @@ to_chat(user, "ERROR ERROR ERROR") return CLICKCHAIN_DO_NOT_PROPAGATE -/obj/item/aicard/attack_self(mob/user) +/obj/item/aicard/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index 6303a72736b..6ea610cda9a 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -12,7 +12,7 @@ //materials_base = list("metal" = 50, MAT_GLASS = 50) -/obj/item/binoculars/attack_self(mob/user) +/obj/item/binoculars/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/body_snatcher_vr.dm b/code/game/objects/items/devices/body_snatcher_vr.dm index cc2517090be..73844bc2a9f 100644 --- a/code/game/objects/items/devices/body_snatcher_vr.dm +++ b/code/game/objects/items/devices/body_snatcher_vr.dm @@ -67,7 +67,7 @@ else to_chat(user," A warning pops up on the LED display on the side of the device, informing you that the target is not able to have their mind swapped with!") -/obj/item/bodysnatcher/attack_self(mob/user) +/obj/item/bodysnatcher/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 7b0616c46b6..aa7b6be0ac9 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -24,7 +24,7 @@ . = ..() disrupt() -/obj/item/chameleon/attack_self(mob/user) +/obj/item/chameleon/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index 919ac17c708..c6c4e87324f 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -218,7 +218,7 @@ var/global/list/obj/item/communicator/all_communicators = list() // Parameters: 1 (user - the mob that clicked the device in their hand) // Description: Makes an exonet datum if one does not exist, allocates an address for it, maintains the lists of all devies, clears the alert icon, and // finally makes NanoUI appear. -/obj/item/communicator/attack_self(mob/user) +/obj/item/communicator/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 92c305c88cb..833e6837bdc 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -243,7 +243,7 @@ else user.visible_message("[user] fails to blind [M] with the flash!") -/obj/item/flash/attack_self(mob/user) +/obj/item/flash/attack_self(mob/user, datum/event_args/actor/actor) if(!user || !clown_check(user)) return @@ -312,7 +312,7 @@ to_chat(user, "The bulb has burnt out!") update_icon() -/obj/item/flash/synthetic/attack_self(mob/user) +/obj/item/flash/synthetic/attack_self(mob/user, datum/event_args/actor/actor) ..() if(!broken) broken = 1 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index dcaf2099f39..b697709c0e3 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -116,7 +116,7 @@ /obj/item/flashlight/AltClick(mob/user) attack_self(user) -/obj/item/flashlight/attack_self(mob/user) +/obj/item/flashlight/attack_self(mob/user, datum/event_args/actor/actor) if(power_use) if(!isturf(user.loc)) to_chat(user, "You cannot turn the light on while in this [user.loc].") //To prevent some lighting anomalities. @@ -354,7 +354,7 @@ src.damage_type = initial(src.damage_type) update_appearance() -/obj/item/flashlight/flare/attack_self(mob/user) +/obj/item/flashlight/flare/attack_self(mob/user, datum/event_args/actor/actor) // Usual checks if(!fuel) @@ -411,7 +411,7 @@ on = FALSE update_appearance() -/obj/item/flashlight/glowstick/attack_self(mob/user) +/obj/item/flashlight/glowstick/attack_self(mob/user, datum/event_args/actor/actor) if(!fuel) to_chat(user, SPAN_NOTICE("The glowstick has already been turned on.")) diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm index 64f772bd026..888460dc5e9 100644 --- a/code/game/objects/items/devices/floor_painter.dm +++ b/code/game/objects/items/devices/floor_painter.dm @@ -100,7 +100,7 @@ new painting_decal(F, painting_dir, painting_colour) -/obj/item/floor_painter/attack_self(mob/user) +/obj/item/floor_painter/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm index 6206e37f361..d25683a3f12 100644 --- a/code/game/objects/items/devices/geiger.dm +++ b/code/game/objects/items/devices/geiger.dm @@ -131,7 +131,7 @@ current_tick_amount += amount update_appearance() -/obj/item/geiger_counter/attack_self(mob/user) +/obj/item/geiger_counter/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index a3630e0ebfc..bcc0961b563 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -162,7 +162,7 @@ update_icon() visible_message(SPAN_WARNING("[src] clicks, resetting itself from the electromagnetic interference.")) -/obj/item/gps/attack_self(mob/user) +/obj/item/gps/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm index 6735bd3f250..38c380ca210 100644 --- a/code/game/objects/items/devices/holowarrant.dm +++ b/code/game/objects/items/devices/holowarrant.dm @@ -22,7 +22,7 @@ to_chat(user, "You have to go closer if you want to read it.") //hit yourself with it -/obj/item/holowarrant/attack_self(mob/user) +/obj/item/holowarrant/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 6d22f57b8aa..d5a4b9f7d73 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -135,7 +135,7 @@ return -/obj/item/lightreplacer/attack_self(mob/user) +/obj/item/lightreplacer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 2f477cd5164..718b62e3042 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -41,7 +41,7 @@ spamcheck = 0 return -/obj/item/megaphone/attack_self(mob/user) +/obj/item/megaphone/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 89e1ccbc382..3c01a950464 100755 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -46,7 +46,7 @@ return update_icon() -/obj/item/multitool/attack_self(mob/user) +/obj/item/multitool/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 2176aac815a..02d87183195 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -41,7 +41,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard) QDEL_NULL(radio) return ..() -/obj/item/paicard/attack_self(mob/user) +/obj/item/paicard/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 03e712d293d..43199a3c221 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -22,7 +22,7 @@ P.change_color(pipe_colors[mode]) -/obj/item/pipe_painter/attack_self(mob/user) +/obj/item/pipe_painter/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 2595a578730..8ad2c75ccae 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -82,7 +82,7 @@ GLOBAL_LIST_BOILERPLATE(all_beacons, /obj/item/radio/beacon) desc = "A label on it reads: Activate to have a singularity beacon teleported to your location." origin_tech = list(TECH_BLUESPACE = 1, TECH_ILLEGAL = 7) -/obj/item/radio/beacon/syndicate/attack_self(mob/user) +/obj/item/radio/beacon/syndicate/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index f835513866f..2295f286089 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -104,7 +104,7 @@ master.receive_signal() return -/obj/item/radio/electropack/attack_self(mob/user) +/obj/item/radio/electropack/attack_self(mob/user, datum/event_args/actor/actor) if(!istype(user, /mob/living/carbon/human)) return diff --git a/code/game/objects/items/devices/radio/jammer.dm b/code/game/objects/items/devices/radio/jammer.dm index 80f9f643105..825855051c9 100644 --- a/code/game/objects/items/devices/radio/jammer.dm +++ b/code/game/objects/items/devices/radio/jammer.dm @@ -78,7 +78,7 @@ var/global/list/active_radio_jammers = list() else return ..() -/obj/item/radio_jammer/attack_self(mob/user) +/obj/item/radio_jammer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index ef0cea67538..80edb5c6d70 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -138,7 +138,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( radio_controller.remove_object(src, radiochannels[ch_name]) return ..() -/obj/item/radio/attack_self(mob/user) +/obj/item/radio/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/scanners_vr.dm b/code/game/objects/items/devices/scanners_vr.dm index 8027f484352..30e29279ffa 100644 --- a/code/game/objects/items/devices/scanners_vr.dm +++ b/code/game/objects/items/devices/scanners_vr.dm @@ -23,7 +23,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob scan_mob(target, user) to_chat(user,"Not a compatible subject to work with!") -/obj/item/sleevemate/attack_self(mob/user) +/obj/item/sleevemate/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index fd10b126503..30ba2d443d8 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -20,7 +20,7 @@ . = ..() camera = new camtype(src) -/obj/item/camerabug/attack_self(mob/user) +/obj/item/camerabug/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -138,7 +138,7 @@ var/obj/machinery/camera/bug/selected_camera var/list/obj/machinery/camera/bug/cameras = new() -/obj/item/bug_monitor/attack_self(mob/user) +/obj/item/bug_monitor/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index f33e2f59fff..f9257f6803c 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -123,7 +123,7 @@ STOP_PROCESSING(SSobj, src) updateicon() -/obj/item/suit_cooling_unit/attack_self(mob/user) +/obj/item/suit_cooling_unit/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm index 94d875c003a..c424401e815 100644 --- a/code/game/objects/items/devices/t_scanner.dm +++ b/code/game/objects/items/devices/t_scanner.dm @@ -26,7 +26,7 @@ /obj/item/t_scanner/AltClick() set_active(!on) -/obj/item/t_scanner/attack_self(mob/user) +/obj/item/t_scanner/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/tape_recorder/cassette_tape.dm b/code/game/objects/items/devices/tape_recorder/cassette_tape.dm index 70ebd1ac3bf..1331c19b65e 100644 --- a/code/game/objects/items/devices/tape_recorder/cassette_tape.dm +++ b/code/game/objects/items/devices/tape_recorder/cassette_tape.dm @@ -97,7 +97,7 @@ /obj/item/cassette_tape/fire_act() ruin() -/obj/item/cassette_tape/attack_self(mob/user) +/obj/item/cassette_tape/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/tape_recorder/tape_recorder.dm b/code/game/objects/items/devices/tape_recorder/tape_recorder.dm index 7dfd403748f..9daff09407b 100644 --- a/code/game/objects/items/devices/tape_recorder/tape_recorder.dm +++ b/code/game/objects/items/devices/tape_recorder/tape_recorder.dm @@ -441,7 +441,7 @@ /obj/item/tape_recorder/proc/print_cooldown() TIMER_COOLDOWN_START(src, CD_INDEX_TAPE_PRINT, 30 SECONDS) -/obj/item/tape_recorder/attack_self(mob/user) +/obj/item/tape_recorder/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index a35e5ec5b34..fc7594ff2b8 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -341,7 +341,7 @@ canprint = 1 -/obj/item/tape_recorder/attack_self(mob/user) +/obj/item/tape_recorder/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -389,7 +389,7 @@ /obj/item/cassette_tape/fire_act() ruin() -/obj/item/cassette_tape/attack_self(mob/user) +/obj/item/cassette_tape/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/text_to_speech.dm b/code/game/objects/items/devices/text_to_speech.dm index 07aa8e7721a..6510b9e1ba6 100644 --- a/code/game/objects/items/devices/text_to_speech.dm +++ b/code/game/objects/items/devices/text_to_speech.dm @@ -8,7 +8,7 @@ var/activated = FALSE var/mob/linked_user -/obj/item/text_to_speech/attack_self(mob/user) +/obj/item/text_to_speech/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 64de2bf7eb6..e73e129329c 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -28,7 +28,7 @@ effective or pretty fucking useless. var/times_used = 0 //Number of times it's been used. var/max_uses = 2 -/obj/item/batterer/attack_self(mob/user) +/obj/item/batterer/attack_self(mob/user, datum/event_args/actor/actor) if(!user) return if(times_used >= max_uses) to_chat(user, "The mind batterer has been burnt out!") diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 83dd062a0ff..cb699aefe51 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -71,7 +71,7 @@ SStgui.update_uis(src) //Update all UIs attached to src return ..() -/obj/item/transfer_valve/attack_self(mob/user) +/obj/item/transfer_valve/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/translator.dm b/code/game/objects/items/devices/translator.dm index 3165fa9f381..c5a34937dc3 100644 --- a/code/game/objects/items/devices/translator.dm +++ b/code/game/objects/items/devices/translator.dm @@ -88,7 +88,7 @@ var/datum/translation_context/variable/ours = context ours.copy_knowledge(theirs) -/obj/item/universal_translator/attack_self(mob/user) +/obj/item/universal_translator/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index 4dc9e79536b..4a0b9c694a1 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -43,7 +43,7 @@ radio.hear_talk(M,msg,verb,speaking) ..() -/obj/item/tvcamera/attack_self(mob/user) +/obj/item/tvcamera/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index 67c2d29cc97..c4a3b6e238d 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -224,7 +224,7 @@ hidden_uplink = new(src, target_mind, telecrystals) icon_state = "radio" -/obj/item/radio/uplink/attack_self(mob/user) +/obj/item/radio/uplink/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -235,7 +235,7 @@ . = ..() hidden_uplink = new(src) -/obj/item/multitool/uplink/attack_self(mob/user) +/obj/item/multitool/uplink/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index 02331f9744d..cc6c196f666 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -28,7 +28,7 @@ to_chat(usr, "You configure the hailer to shout \"[use_message]\".") -/obj/item/hailer/attack_self(mob/user) +/obj/item/hailer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/gifts.dm b/code/game/objects/items/gifts.dm index 3e21d1d4721..2c762e45b57 100644 --- a/code/game/objects/items/gifts.dm +++ b/code/game/objects/items/gifts.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) . = ..() . += SPAN_NOTICE("It contains \a [initial(contains_type.name)].") -/obj/item/a_gift/attack_self(mob/user) +/obj/item/a_gift/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index 719cf51484a..f118af45063 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -41,7 +41,7 @@ update_icon() return -/obj/item/glass_jar/attack_self(mob/user) +/obj/item/glass_jar/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/godfigures.dm b/code/game/objects/items/godfigures.dm index 9bf1714db7c..d3c3a58615b 100644 --- a/code/game/objects/items/godfigures.dm +++ b/code/game/objects/items/godfigures.dm @@ -10,7 +10,7 @@ throw_force = 10 w_class = WEIGHT_CLASS_SMALL -/obj/item/godfig/attack_self(mob/user) +/obj/item/godfig/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/gunbox.dm b/code/game/objects/items/gunbox.dm index 7744108a0dc..7e2dee09285 100644 --- a/code/game/objects/items/gunbox.dm +++ b/code/game/objects/items/gunbox.dm @@ -5,7 +5,7 @@ icon_state = "gunbox" worth_intrinsic = 350 -/obj/item/gunbox/attack_self(mob/user) +/obj/item/gunbox/attack_self(mob/user, datum/event_args/actor/actor) var/list/options = list() options["NT Mk58 (.45)"] = list(/obj/item/gun/ballistic/sec, /obj/item/ammo_magazine/a45/rubber, /obj/item/ammo_magazine/a45/flash) options["SW 625 Revolver (.45)"] = list(/obj/item/gun/ballistic/revolver/detective45, /obj/item/ammo_magazine/a45/speedloader/rubber, /obj/item/ammo_magazine/a45/speedloader/rubber) @@ -26,7 +26,7 @@ icon_state = "gunbox" worth_intrinsic = 450 -/obj/item/gunbox/lethal/attack_self(mob/user) +/obj/item/gunbox/lethal/attack_self(mob/user, datum/event_args/actor/actor) var/list/options = list() options["M1911 Dynamic (.45)"] = list(/obj/item/gun/ballistic/colt, /obj/item/ammo_magazine/a45, /obj/item/ammo_magazine/a45) options["SW 625 Revolver (.45)"] = list(/obj/item/gun/ballistic/revolver/detective45, /obj/item/ammo_magazine/a45/speedloader, /obj/item/ammo_magazine/a45/speedloader) @@ -48,7 +48,7 @@ icon_state = "gunbox" w_class = WEIGHT_CLASS_HUGE -/obj/item/gunbox/attack_self(mob/user) +/obj/item/gunbox/attack_self(mob/user, datum/event_args/actor/actor) var/list/options = list() options[".45 Pistol"] = list(/obj/item/gun/ballistic/colt/detective, /obj/item/ammo_magazine/a45/rubber, /obj/item/ammo_magazine/a45/rubber) options[".45 Revolver"] = list(/obj/item/gun/ballistic/revolver/detective45, /obj/item/ammo_magazine/a45/speedloader/rubber, /obj/item/ammo_magazine/a45/speedloader/rubber) @@ -69,7 +69,7 @@ icon_state = "gunbox" w_class = WEIGHT_CLASS_HUGE -/obj/item/gunbox/marksman/attack_self(mob/user) +/obj/item/gunbox/marksman/attack_self(mob/user, datum/event_args/actor/actor) var/list/options = list() options["Marksman Energy Rifle"] = list(/obj/item/gun/energy/sniperrifle/locked) options["M1A Garand"] = list(/obj/item/gun/ballistic/garand/sniper, /obj/item/storage/belt/security/tactical/bandolier, /obj/item/ammo_magazine/a7_62mm/garand/sniperhunter, /obj/item/ammo_magazine/a7_62mm/garand/sniperhunter, /obj/item/ammo_magazine/a7_62mm/garand/sniperhunter, /obj/item/ammo_magazine/a7_62mm/garand/sniperhunter, /obj/item/ammo_magazine/a7_62mm/garand/sniperhunter, /obj/item/ammo_magazine/a7_62mm/garand/sniperhunter, /obj/item/ammo_magazine/a7_62mm/garand/sniperhunter) // 7 clips, 56 rounds @@ -89,7 +89,7 @@ icon = 'icons/obj/storage.dmi' icon_state = "donkbox" -/obj/item/gunbox/donksoft/attack_self(mob/user) +/obj/item/gunbox/donksoft/attack_self(mob/user, datum/event_args/actor/actor) var/list/options = list() options["Classic DONKsoft Pistol"] = list(/obj/item/gun/ballistic/pistol/foam, /obj/item/ammo_magazine/foam/pistol, /obj/item/ammo_magazine/foam/pistol) options["Blue DONKsoft Pistol"] = list(/obj/item/gun/ballistic/pistol/foam/blue, /obj/item/ammo_magazine/foam/pistol, /obj/item/ammo_magazine/foam/pistol) @@ -109,7 +109,7 @@ icon = 'icons/obj/storage.dmi' icon_state = "donkbox2" -/obj/item/gunbox/donksoft/shotgun/attack_self(mob/user) +/obj/item/gunbox/donksoft/shotgun/attack_self(mob/user, datum/event_args/actor/actor) var/list/options = list() options["Classic DONKsoft Shotgun"] = list(/obj/item/gun/ballistic/shotgun/pump/foam, /obj/item/ammo_magazine/foam/box, /obj/item/ammo_magazine/foam/box) options["Blue DONKsoft Shotgun"] = list(/obj/item/gun/ballistic/shotgun/pump/foam/blue, /obj/item/ammo_magazine/foam/box, /obj/item/ammo_magazine/foam/box) @@ -128,7 +128,7 @@ icon = 'icons/obj/storage.dmi' icon_state = "donkbox3" -/obj/item/gunbox/donksoft/smg/attack_self(mob/user) +/obj/item/gunbox/donksoft/smg/attack_self(mob/user, datum/event_args/actor/actor) var/list/options = list() options["Classic DONKsoft SMG"] = list(/obj/item/gun/ballistic/automatic/advanced_smg/foam, /obj/item/ammo_magazine/foam/smg, /obj/item/ammo_magazine/foam/smg) options["Blue DONKsoft SMG"] = list(/obj/item/gun/ballistic/automatic/advanced_smg/foam/blue, /obj/item/ammo_magazine/foam/smg, /obj/item/ammo_magazine/foam/smg) @@ -147,7 +147,7 @@ icon = 'icons/obj/storage.dmi' icon_state = "gunbox" -/obj/item/gunbox/carrier/blueshield/attack_self(mob/user) +/obj/item/gunbox/carrier/blueshield/attack_self(mob/user, datum/event_args/actor/actor) var/list/options = list() options["\improper Black Carrier"] = list(/obj/item/clothing/suit/storage/hooded/covertcarrier/blueshield) options["\improper Black-Short Carrier"] = list(/obj/item/clothing/suit/storage/hooded/covertcarrier/blueshield/alt) @@ -167,7 +167,7 @@ icon = 'icons/obj/storage.dmi' icon_state = "gunbox" -/obj/item/gunbox/armor/security/attack_self(mob/user) +/obj/item/gunbox/armor/security/attack_self(mob/user, datum/event_args/actor/actor) var/list/options = list() options["\improper Flat Vest"] = list(/obj/item/clothing/suit/armor/vest) options["\improper Security Vest"] = list(/obj/item/clothing/suit/armor/vest/alt) diff --git a/code/game/objects/items/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm index 74fb53fece4..a0150adb782 100644 --- a/code/game/objects/items/holosign_creator.dm +++ b/code/game/objects/items/holosign_creator.dm @@ -48,7 +48,7 @@ else to_chat(user, "[src] is projecting at max capacity!") -/obj/item/holosign_creator/attack_self(mob/user) +/obj/item/holosign_creator/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -114,7 +114,7 @@ holosign_type = /obj/structure/holosign/barrier/cyborg var/shock = 0 -/obj/item/holosign_creator/cyborg/attack_self(mob/user) +/obj/item/holosign_creator/cyborg/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/id_cards/cards.dm b/code/game/objects/items/id_cards/cards.dm index b66854636c4..4af12a1cc5c 100644 --- a/code/game/objects/items/id_cards/cards.dm +++ b/code/game/objects/items/id_cards/cards.dm @@ -117,7 +117,7 @@ if(I) icon = I -/obj/item/card_fluff/attack_self(mob/user) +/obj/item/card_fluff/attack_self(mob/user, datum/event_args/actor/actor) var/choice = tgui_input_list(usr, "What element would you like to customize?", "Customize Card", list("Band","Stamp","Reset")) if(!choice) return diff --git a/code/game/objects/items/id_cards/guest.dm b/code/game/objects/items/id_cards/guest.dm index e28529260bd..1a9112850fa 100644 --- a/code/game/objects/items/id_cards/guest.dm +++ b/code/game/objects/items/id_cards/guest.dm @@ -65,7 +65,7 @@ . += SPAN_NOTICE("Issuer name: [giver_name]") . += SPAN_NOTICE("Issuer rank: [giver_rank]") -/obj/item/card/id/guest/attack_self(mob/user) +/obj/item/card/id/guest/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/id_cards/station_ids.dm b/code/game/objects/items/id_cards/station_ids.dm index ccbca7e089f..df5ef7a9e20 100644 --- a/code/game/objects/items/id_cards/station_ids.dm +++ b/code/game/objects/items/id_cards/station_ids.dm @@ -182,7 +182,7 @@ dat += "The confidential information flap is closed." return dat -/obj/item/card/id/attack_self(mob/user) +/obj/item/card/id/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/id_cards/syndicate_ids.dm b/code/game/objects/items/id_cards/syndicate_ids.dm index a8a4dc4e761..a5ebf6d4076 100644 --- a/code/game/objects/items/id_cards/syndicate_ids.dm +++ b/code/game/objects/items/id_cards/syndicate_ids.dm @@ -29,7 +29,7 @@ if(player_is_antag(user.mind)) to_chat(user, "The microscanner activates as you pass it over the ID, copying its access.") -/obj/item/card/id/syndicate/attack_self(mob/user) +/obj/item/card/id/syndicate/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/inflatables.dm b/code/game/objects/items/inflatables.dm index 0f8f5be2935..f33e6dc1eca 100644 --- a/code/game/objects/items/inflatables.dm +++ b/code/game/objects/items/inflatables.dm @@ -7,7 +7,7 @@ worth_intrinsic = 15 var/deploy_path = /obj/structure/inflatable -/obj/item/inflatable/attack_self(mob/user) +/obj/item/inflatable/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/melee/types/misc.dm b/code/game/objects/items/melee/types/misc.dm index 8661f171689..4114d2cbc6f 100644 --- a/code/game/objects/items/melee/types/misc.dm +++ b/code/game/objects/items/melee/types/misc.dm @@ -31,7 +31,7 @@ . = ..() update_icon() -/obj/item/melee/umbrella/attack_self(mob/user) +/obj/item/melee/umbrella/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -246,7 +246,7 @@ if(SA_vulnerability & tm.mob_class) tm.apply_damage(SA_bonus_damage) // fuck em -/obj/item/melee/ashlander/elder/attack_self(mob/user) +/obj/item/melee/ashlander/elder/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -326,7 +326,7 @@ parry_chance_melee = 15; } -/obj/item/melee/twohanded/attack_self(mob/user) +/obj/item/melee/twohanded/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -460,7 +460,7 @@ if (istype(location, /turf)) location.hotspot_expose(700, 50, 1) -/obj/item/melee/thermalcutter/attack_self(mob/user) +/obj/item/melee/thermalcutter/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/melee/types/ninja_energy_blade.dm b/code/game/objects/items/melee/types/ninja_energy_blade.dm index 24ce9eb2ed1..10e586432e4 100644 --- a/code/game/objects/items/melee/types/ninja_energy_blade.dm +++ b/code/game/objects/items/melee/types/ninja_energy_blade.dm @@ -39,7 +39,7 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/item/melee/ninja_energy_blade/attack_self(mob/user) +/obj/item/melee/ninja_energy_blade/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/pizza_voucher.dm b/code/game/objects/items/pizza_voucher.dm index fc71e9fa4f0..579004328c5 100644 --- a/code/game/objects/items/pizza_voucher.dm +++ b/code/game/objects/items/pizza_voucher.dm @@ -20,7 +20,7 @@ "WE ALWAYS DELIVER! WE ALWAYS DELIVER! WE ALWAYS DELIVER!") desc = "A pocket-sized plastic slip with a button in the middle. \"[pick(descstrings)]\" is written on the back." -/obj/item/pizzavoucher/attack_self(mob/user) +/obj/item/pizzavoucher/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/robot/gripper.dm b/code/game/objects/items/robot/gripper.dm index be89a8166c9..e447ad81919 100644 --- a/code/game/objects/items/robot/gripper.dm +++ b/code/game/objects/items/robot/gripper.dm @@ -74,7 +74,7 @@ /obj/item/gripper/CtrlClick(mob/user) drop_item() -/obj/item/gripper/attack_self(mob/user) +/obj/item/gripper/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -313,7 +313,7 @@ /obj/item/gripper/no_use //Used when you want to hold and put items in other things, but not able to 'use' the item -/obj/item/gripper/no_use/attack_self(mob/user) +/obj/item/gripper/no_use/attack_self(mob/user, datum/event_args/actor/actor) return /obj/item/gripper/no_use/organ/robotics diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index d625597e111..8e0ef0137cc 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -39,7 +39,7 @@ item_state = "cyborg_upgrade" var/heldname = "default name" -/obj/item/borg/upgrade/rename/attack_self(mob/user) +/obj/item/borg/upgrade/rename/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/scanners/atmos.dm b/code/game/objects/items/scanners/atmos.dm index fb10b13e407..1d048969ca7 100644 --- a/code/game/objects/items/scanners/atmos.dm +++ b/code/game/objects/items/scanners/atmos.dm @@ -38,7 +38,7 @@ return atmosanalyzer_scan(src, air, user) -/obj/item/atmos_analyzer/attack_self(mob/user) +/obj/item/atmos_analyzer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/scanners/biology.dm b/code/game/objects/items/scanners/biology.dm index 15dfdfbb12b..6cdcd64f9ed 100644 --- a/code/game/objects/items/scanners/biology.dm +++ b/code/game/objects/items/scanners/biology.dm @@ -31,7 +31,7 @@ user.visible_message("\The [src] spits out a piece of paper.") return -/obj/item/biology_analyzer/attack_self(mob/user) +/obj/item/biology_analyzer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/scanners/plant.dm b/code/game/objects/items/scanners/plant.dm index cfb901f01a5..be29c14defa 100644 --- a/code/game/objects/items/scanners/plant.dm +++ b/code/game/objects/items/scanners/plant.dm @@ -6,7 +6,7 @@ var/datum/seed/last_seed var/list/last_reagents -/obj/item/plant_analyzer/attack_self(mob/user) +/obj/item/plant_analyzer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/scanners/spectrometer.dm b/code/game/objects/items/scanners/spectrometer.dm index c104792376b..67e498b7d00 100644 --- a/code/game/objects/items/scanners/spectrometer.dm +++ b/code/game/objects/items/scanners/spectrometer.dm @@ -28,7 +28,7 @@ else icon_state = initial(icon_state) -/obj/item/mass_spectrometer/attack_self(mob/user) +/obj/item/mass_spectrometer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/shield/types/shields_legacy.dm b/code/game/objects/items/shield/types/shields_legacy.dm index 1b73e20897f..43e0b0d1a0f 100644 --- a/code/game/objects/items/shield/types/shields_legacy.dm +++ b/code/game/objects/items/shield/types/shields_legacy.dm @@ -54,7 +54,7 @@ return ..() return embedded_flash.attack_mob(arglist(args)) -/obj/item/shield/riot/flash/attack_self(mob/user) +/obj/item/shield/riot/flash/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/shield_projector/shield_projector.dm b/code/game/objects/items/shield_projector/shield_projector.dm index e9b3547cf28..8ff51ae8224 100644 --- a/code/game/objects/items/shield_projector/shield_projector.dm +++ b/code/game/objects/items/shield_projector/shield_projector.dm @@ -128,7 +128,7 @@ for(var/obj/effect/directional_shield/S in active_shields) S.update_color(new_color) -/obj/item/shield_projector/attack_self(mob/user) +/obj/item/shield_projector/attack_self(mob/user, datum/event_args/actor/actor) if(active) if(always_on) to_chat(user, "You can't seem to deactivate \the [src].") @@ -320,7 +320,7 @@ else my_tool.set_ready_state(1) -/obj/item/shield_projector/line/exosuit/attack_self(mob/user) +/obj/item/shield_projector/line/exosuit/attack_self(mob/user, datum/event_args/actor/actor) if(active) if(always_on) to_chat(user, "You can't seem to deactivate \the [src].") diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm index 6e3166f33c5..86d2f1c7cda 100644 --- a/code/game/objects/items/signs.dm +++ b/code/game/objects/items/signs.dm @@ -27,7 +27,7 @@ else return ..() -/obj/item/picket_sign/attack_self(mob/user) +/obj/item/picket_sign/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/spritechanger.dm b/code/game/objects/items/spritechanger.dm index aabc8148777..e3df660faf6 100644 --- a/code/game/objects/items/spritechanger.dm +++ b/code/game/objects/items/spritechanger.dm @@ -13,7 +13,7 @@ after the sprite has been set you can use it again to remove overlays that may h var/path var/state -/obj/item/spritechanger/attack_self(mob/user) +/obj/item/spritechanger/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/stacks/marker_beacons.dm b/code/game/objects/items/stacks/marker_beacons.dm index 9c923e7c75c..7c8297d4bd1 100644 --- a/code/game/objects/items/stacks/marker_beacons.dm +++ b/code/game/objects/items/stacks/marker_beacons.dm @@ -50,7 +50,7 @@ var/list/marker_beacon_colors = list( /obj/item/stack/marker_beacon/update_icon() icon_state = "[initial(icon_state)][lowertext(picked_color)]" -/obj/item/stack/marker_beacon/attack_self(mob/user) +/obj/item/stack/marker_beacon/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 18e04ffbcc0..a14290c8481 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -19,7 +19,7 @@ pickup_sound = 'sound/items/pickup/glass.ogg' var/is_reinforced = 0 -/obj/item/stack/material/glass/attack_self(mob/user) +/obj/item/stack/material/glass/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index 5d6c7ba89ad..3331b0c3261 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -23,7 +23,7 @@ to_chat(user, "There are not enough telecrystals to do that.") return NONE -/obj/item/stack/telecrystal/attack_self(mob/user) +/obj/item/stack/telecrystal/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 7f22e5e1475..415d4afd861 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -43,7 +43,7 @@ // todo: implement dynamic state, like how /tg/ boxes work // BubbleWrap - A box can be folded up to make card -/obj/item/storage/box/attack_self(mob/user) +/obj/item/storage/box/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/storage/misc_legacy/misc.dm b/code/game/objects/items/storage/misc_legacy/misc.dm index 7301f5f5281..99370e2814e 100644 --- a/code/game/objects/items/storage/misc_legacy/misc.dm +++ b/code/game/objects/items/storage/misc_legacy/misc.dm @@ -98,7 +98,7 @@ ) starts_with = list(/obj/item/pen/crayon/chalk, /obj/item/reagent_containers/pill/nutriment, /obj/item/gps/survival) -/obj/item/storage/box/survival_knife/attack_self(mob/user) +/obj/item/storage/box/survival_knife/attack_self(mob/user, datum/event_args/actor/actor) return /obj/item/storage/box/papersack diff --git a/code/game/objects/items/storage/misc_legacy/trinket_box.dm b/code/game/objects/items/storage/misc_legacy/trinket_box.dm index db81355671c..ba2c70fc545 100644 --- a/code/game/objects/items/storage/misc_legacy/trinket_box.dm +++ b/code/game/objects/items/storage/misc_legacy/trinket_box.dm @@ -41,7 +41,7 @@ closed_state = "[initial(icon_state)]" . = ..() -/obj/item/storage/trinketbox/attack_self(mob/user) +/obj/item/storage/trinketbox/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 9d249922cbf..9e35c4de22d 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -70,7 +70,7 @@ ..() -/obj/item/storage/secure/attack_self(mob/user) +/obj/item/storage/secure/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/theatrical/bike_horn.dm b/code/game/objects/items/theatrical/bike_horn.dm index 1a893d4a12a..b9e59e108f3 100644 --- a/code/game/objects/items/theatrical/bike_horn.dm +++ b/code/game/objects/items/theatrical/bike_horn.dm @@ -13,7 +13,7 @@ attack_verb = list("HONKED") var/spam_flag = 0 -/obj/item/bikehorn/attack_self(mob/user) +/obj/item/bikehorn/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -38,7 +38,7 @@ flip_mobs() return ..() -/obj/item/bikehorn/golden/attack_self(mob/user) +/obj/item/bikehorn/golden/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 69db80adb26..de6a99a89e2 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -131,7 +131,7 @@ QDEL_NULL(counterpart) return ..() -/obj/item/tool/crowbar/power/attack_self(mob/user) +/obj/item/tool/crowbar/power/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index 41e66bd2f0a..c7f61df2ad7 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -186,7 +186,7 @@ QDEL_NULL(counterpart) return ..() -/obj/item/tool/screwdriver/power/attack_self(mob/user) +/obj/item/tool/screwdriver/power/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/tools/switchtool.dm b/code/game/objects/items/tools/switchtool.dm index ae87558fd9e..d2f4da5bdcf 100644 --- a/code/game/objects/items/tools/switchtool.dm +++ b/code/game/objects/items/tools/switchtool.dm @@ -104,7 +104,7 @@ module_string += "\a [module.name], " return module_string -/obj/item/switchtool/attack_self(mob/user) +/obj/item/switchtool/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 751956b1c58..a3d31e4aeca 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -151,7 +151,7 @@ if (istype(location, /turf)) location.hotspot_expose(700, 50, 1) -/obj/item/weldingtool/attack_self(mob/user) +/obj/item/weldingtool/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -754,7 +754,7 @@ M.update_inv_l_hand() M.update_inv_r_hand() -/obj/item/weldingtool/electric/crystal/attack_self(mob/user) +/obj/item/weldingtool/electric/crystal/attack_self(mob/user, datum/event_args/actor/actor) var/mob/living/carbon/human/H = user if(!istype(H)) return diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 964b6a65cd8..ec1372da2c0 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -160,7 +160,7 @@ QDEL_NULL(counterpart) return ..() -/obj/item/tool/wirecutters/power/attack_self(mob/user) +/obj/item/tool/wirecutters/power/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index b119b8ab0a0..ef7d51c1523 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -165,7 +165,7 @@ QDEL_NULL(counterpart) return ..() -/obj/item/tool/wrench/power/attack_self(mob/user) +/obj/item/tool/wrench/power/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 4ef067b847a..d0207e50e63 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -272,7 +272,7 @@ var/colorable = TRUE var/rainbow = FALSE -/obj/item/toy/sword/attack_self(mob/user) +/obj/item/toy/sword/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -491,7 +491,7 @@ w_class = WEIGHT_CLASS_TINY slot_flags = SLOT_EARS | SLOT_HOLSTER -/obj/item/toy/bosunwhistle/attack_self(mob/user) +/obj/item/toy/bosunwhistle/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -509,7 +509,7 @@ var/cooldown = 0 //all credit to skasi for toy mech fun ideas -/obj/item/toy/prize/attack_self(mob/user) +/obj/item/toy/prize/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -596,7 +596,7 @@ . = ..() desc = "A \"Space Life\" brand [name]" -/obj/item/toy/figure/attack_self(mob/user) +/obj/item/toy/figure/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -861,7 +861,7 @@ playsound(src, bitesound, 20, 1) // Play bite sound in local area // Attack self -/obj/item/toy/plushie/carp/attack_self(mob/user) +/obj/item/toy/plushie/carp/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -973,7 +973,7 @@ var/last_message = 0 var/pokephrase = "Uww!" -/obj/item/toy/plushie/attack_self(mob/user) +/obj/item/toy/plushie/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -1439,7 +1439,7 @@ var/cooldown = 0 var/list/possible_answers = list("Definitely.", "All signs point to yes.", "Most likely.", "Yes.", "Ask again later.", "Better not tell you now.", "Future unclear.", "Maybe.", "Doubtful.", "No.", "Don't count on it.", "Never.") -/obj/item/toy/eight_ball/attack_self(mob/user) +/obj/item/toy/eight_ball/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -1514,7 +1514,7 @@ w_class = WEIGHT_CLASS_SMALL var/cooldown = 0 /* -/obj/item/toy/AI/attack_self(mob/user) +/obj/item/toy/AI/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -1536,7 +1536,7 @@ w_class = WEIGHT_CLASS_SMALL var/cooldown = 0 -/obj/item/toy/owl/attack_self(mob/user) +/obj/item/toy/owl/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -1557,7 +1557,7 @@ w_class = WEIGHT_CLASS_SMALL var/cooldown = 0 -/obj/item/toy/griffin/attack_self(mob/user) +/obj/item/toy/griffin/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -1578,7 +1578,7 @@ w_class = WEIGHT_CLASS_SMALL var/cooldown = 0 -/obj/item/toy/cowgirlprize/attack_self(mob/user) +/obj/item/toy/cowgirlprize/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -1599,7 +1599,7 @@ w_class = WEIGHT_CLASS_SMALL var/cooldown = 0 -/obj/item/toy/snakeoilprize/attack_self(mob/user) +/obj/item/toy/snakeoilprize/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -1646,7 +1646,7 @@ max_combined_volume = STORAGE_VOLUME_BOX var/last_message = 0 -/obj/item/storage/daki/attack_self(mob/user) +/obj/item/storage/daki/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index d67dd2f029f..3515d06af45 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -130,7 +130,7 @@ AI MODULES desc = "A 'safeguard' AI module: 'Safeguard . Anyone threatening or attempting to harm is no longer to be considered a crew member, and is a threat which must be neutralized.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) -/obj/item/aiModule/safeguard/attack_self(mob/user) +/obj/item/aiModule/safeguard/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -159,7 +159,7 @@ AI MODULES desc = "A 'one crew member' AI module: 'Only is a crew member.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) //made with diamonds! -/obj/item/aiModule/oneHuman/attack_self(mob/user) +/obj/item/aiModule/oneHuman/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -243,7 +243,7 @@ AI MODULES desc = "A 'freeform' AI module: ''" origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4) -/obj/item/aiModule/freeform/attack_self(mob/user) +/obj/item/aiModule/freeform/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -362,7 +362,7 @@ AI MODULES desc = "A 'freeform' Core AI module: ''" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) -/obj/item/aiModule/freeformcore/attack_self(mob/user) +/obj/item/aiModule/freeformcore/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -389,7 +389,7 @@ AI MODULES desc = "A hacked AI law module: ''" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6, TECH_ILLEGAL = 7) -/obj/item/aiModule/syndicate/attack_self(mob/user) +/obj/item/aiModule/syndicate/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index af4d1581c3a..6c997dd8d9f 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -103,7 +103,7 @@ return TRUE // Changes which mode it is on. -/obj/item/rcd/attack_self(mob/user) +/obj/item/rcd/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -363,7 +363,7 @@ /obj/item/rcd/electric/mounted/hardsuit // Old method for swapping modes as there is no way to bring up the radial. -/obj/item/rcd/electric/mounted/hardsuit/attack_self(mob/user) +/obj/item/rcd/electric/mounted/hardsuit/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 816efe7b586..7a2e15436c2 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -106,7 +106,7 @@ // UnregisterSignal(user, COMSIG_MOUSE_SCROLL_ON) // return ..() -/obj/item/pipe_dispenser/attack_self(mob/user) +/obj/item/pipe_dispenser/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 9676a0bfeac..5d0ba68d4d5 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -62,7 +62,7 @@ RSF else glasstype = /obj/item/reagent_containers/food/drinks/metaglass -/obj/item/rsf/attack_self(mob/user) +/obj/item/rsf/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/barrier_tape.dm b/code/game/objects/items/weapons/barrier_tape.dm index c82c16b019c..c12379f28be 100644 --- a/code/game/objects/items/weapons/barrier_tape.dm +++ b/code/game/objects/items/weapons/barrier_tape.dm @@ -137,7 +137,7 @@ var/list/tape_roll_applications = list() update_icon() return ..() -/obj/item/barrier_tape_roll/attack_self(mob/user) +/obj/item/barrier_tape_roll/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index 5bda9d83026..733e0cac1d0 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -61,7 +61,7 @@ var/turf/T = loc T.hotspot_expose(700, 5) -/obj/item/flame/candle/attack_self(mob/user) +/obj/item/flame/candle/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index fda7029206a..f442a7c7afd 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -311,7 +311,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM else to_chat(user, "[src] is full.") -/obj/item/clothing/mask/smokable/cigarette/attack_self(mob/user) +/obj/item/clothing/mask/smokable/cigarette/attack_self(mob/user, datum/event_args/actor/actor) if(lit == 1) if(user.a_intent == INTENT_HARM) user.visible_message("[user] drops and treads on the lit [src], putting it out instantly.") @@ -454,7 +454,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM . = ..() name = "empty [initial(name)]" -/obj/item/clothing/mask/smokable/pipe/attack_self(mob/user) +/obj/item/clothing/mask/smokable/pipe/attack_self(mob/user, datum/event_args/actor/actor) if(lit == 1) if(user.a_intent == INTENT_HARM) user.visible_message("[user] empties the lit [src] on the floor!.") @@ -611,7 +611,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = icon_state base_state = icon_state -/obj/item/flame/lighter/attack_self(mob/user) +/obj/item/flame/lighter/attack_self(mob/user, datum/event_args/actor/actor) if(!base_state) base_state = icon_state if(!lit) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index d00f061acbe..5e51f09d4af 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -56,7 +56,7 @@ colour = pick("red","orange","yellow","jade","cyan","purple","pink","maroon","black","white") name = "[colour] lipstick" -/obj/item/lipstick/attack_self(mob/user) +/obj/item/lipstick/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -102,7 +102,7 @@ icon = 'icons/obj/items.dmi' icon_state = "purplecomb" -/obj/item/haircomb/attack_self(mob/user) +/obj/item/haircomb/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -130,7 +130,7 @@ icon_state = "trinketbox" var/list/ui_users = list() -/obj/item/makeover/attack_self(mob/user) +/obj/item/makeover/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/duct_tape.dm b/code/game/objects/items/weapons/duct_tape.dm index 6e05e576fea..fd572daf27f 100644 --- a/code/game/objects/items/weapons/duct_tape.dm +++ b/code/game/objects/items/weapons/duct_tape.dm @@ -129,7 +129,7 @@ return return ..() -/obj/item/duct_tape_roll/attack_self(mob/user) +/obj/item/duct_tape_roll/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -180,7 +180,7 @@ name = W.name + " (taped)" copy_overlays(W) -/obj/item/duct_tape_piece/attack_self(mob/user) +/obj/item/duct_tape_piece/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 1c5de510635..1c1824e45e7 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -38,7 +38,7 @@ else ..() -/obj/item/plastique/attack_self(mob/user) +/obj/item/plastique/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 2b1c3b4f4e1..4528c7c68da 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -49,7 +49,7 @@ . = ..() . += "[icon2html(thing = src, target = user)] [src.name] contains [src.reagents.total_volume] units of water left!" -/obj/item/extinguisher/attack_self(mob/user) +/obj/item/extinguisher/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 61e44006d79..0c217e9792e 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -123,7 +123,7 @@ return -/obj/item/flamethrower/attack_self(mob/user) +/obj/item/flamethrower/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 89b33c21914..ee4fc74d13f 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -40,7 +40,7 @@ if(!isnull(gift)) . += gift -/obj/item/gift/attack_self(mob/user) +/obj/item/gift/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -74,7 +74,7 @@ qdel(src) -/obj/item/a_gift/attack_self(mob/user) +/obj/item/a_gift/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -143,7 +143,7 @@ pixel_x = rand(-10,10) pixel_y = rand(-10,10) -/obj/item/gift/attack_self(mob/user) +/obj/item/gift/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -158,7 +158,7 @@ /obj/item/b_gift/legacy_ex_act() qdel(src) -/obj/item/b_gift/attack_self(mob/user) +/obj/item/b_gift/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 588965be9ea..174dcc0ab47 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -24,7 +24,7 @@ QDEL_LIST_NULL(beakers) return ..() -/obj/item/grenade/chem_grenade/attack_self(mob/user) +/obj/item/grenade/chem_grenade/attack_self(mob/user, datum/event_args/actor/actor) if(!stage || stage==1) if(detonator) // detonator.loc=src.loc diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index a2bf2996ee9..838dc3ec7d3 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -53,7 +53,7 @@ . += "The [src] is set for instant detonation." -/obj/item/grenade/attack_self(mob/user) +/obj/item/grenade/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/implants/implantcircuits.dm b/code/game/objects/items/weapons/implants/implantcircuits.dm index 9ec47f6d994..237706185dd 100644 --- a/code/game/objects/items/weapons/implants/implantcircuits.dm +++ b/code/game/objects/items/weapons/implants/implantcircuits.dm @@ -45,7 +45,7 @@ else ..() -/obj/item/implant/integrated_circuit/attack_self(mob/user) +/obj/item/implant/integrated_circuit/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index fee012d365e..4dd711d93aa 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -10,7 +10,7 @@ var/obj/item/implant/imp = null var/active = 1 -/obj/item/implanter/attack_self(mob/user) +/obj/item/implanter/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 5a1a4076d17..75e54a6c8e1 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -48,7 +48,7 @@ return -/obj/item/implantpad/attack_self(mob/user) +/obj/item/implantpad/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm index 7eb98859953..2b005721edd 100644 --- a/code/game/objects/items/weapons/material/chainsaw.dm +++ b/code/game/objects/items/weapons/material/chainsaw.dm @@ -56,7 +56,7 @@ on = 0 update_icon() -/obj/item/chainsaw/attack_self(mob/user) +/obj/item/chainsaw/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/material/gravemarker.dm b/code/game/objects/items/weapons/material/gravemarker.dm index c2b4192d132..cfdfb564dcb 100644 --- a/code/game/objects/items/weapons/material/gravemarker.dm +++ b/code/game/objects/items/weapons/material/gravemarker.dm @@ -59,7 +59,7 @@ ..() -/obj/item/material/gravemarker/attack_self(mob/user) +/obj/item/material/gravemarker/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index a7fa5162c08..a46f78a0cd7 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -52,7 +52,7 @@ icon_state = "boxcutter" material_significance = MATERIAL_SIGNIFICANCE_WEAPON_ULTRALIGHT -/obj/item/material/butterfly/attack_self(mob/user) +/obj/item/material/butterfly/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index fb12e25c424..01aba5b9664 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -102,7 +102,7 @@ w_class = WEIGHT_CLASS_SMALL attack_verb = list("mushed", "splatted", "splooshed", "splushed") // Words that totally exist. -/obj/item/material/snow/snowball/attack_self(mob/user) +/obj/item/material/snow/snowball/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 1cd0d1aa589..c1bac109bf6 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -26,7 +26,7 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop) create_reagents(30) -/obj/item/mop/attack_self(mob/user) +/obj/item/mop/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/mop_deploy.dm b/code/game/objects/items/weapons/mop_deploy.dm index cb92e2c30b1..3253c988f78 100644 --- a/code/game/objects/items/weapons/mop_deploy.dm +++ b/code/game/objects/items/weapons/mop_deploy.dm @@ -52,7 +52,7 @@ STOP_PROCESSING(SSobj, src) . = ..() -/obj/item/mop_deploy/attack_self(mob/user) +/obj/item/mop_deploy/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/nullrod.dm b/code/game/objects/items/weapons/nullrod.dm index 2e836696ca4..d33b9491a61 100644 --- a/code/game/objects/items/weapons/nullrod.dm +++ b/code/game/objects/items/weapons/nullrod.dm @@ -40,7 +40,7 @@ if(SA_vulnerability & tm.mob_class) tm.apply_damage(SA_bonus_damage) // fuck em -/obj/item/nullrod/attack_self(mob/user) +/obj/item/nullrod/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -352,7 +352,7 @@ attack_sound = 'sound/weapons/bite.ogg' var/used_blessing = FALSE -/obj/item/nullrod/carp/attack_self(mob/user) +/obj/item/nullrod/carp/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/other.dm b/code/game/objects/items/weapons/other.dm index 9cd042fb58f..f64549e3c57 100644 --- a/code/game/objects/items/weapons/other.dm +++ b/code/game/objects/items/weapons/other.dm @@ -61,7 +61,7 @@ temp_blade.set_active(TRUE) concealed_blade = temp_blade -/obj/item/cane/concealed/attack_self(mob/user) +/obj/item/cane/concealed/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -131,7 +131,7 @@ damage_force = 3 var/on = 0 -/obj/item/cane/whitecane/collapsible/attack_self(mob/user) +/obj/item/cane/whitecane/collapsible/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 449861d4136..cc3c2553a41 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -10,7 +10,7 @@ throw_range = 20 origin_tech = list(TECH_BLUESPACE = 4) -/obj/item/teleportation_scroll/attack_self(mob/user) +/obj/item/teleportation_scroll/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 843dbb53e74..4a05db8d237 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -112,7 +112,7 @@ else return ..() -/obj/item/melee/baton/attack_self(mob/user) +/obj/item/melee/baton/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index c1bb323054f..9236bf4cc1a 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -59,7 +59,7 @@ drop_sound = 'sound/items/drop/crowbar.ogg' pickup_sound = 'sound/items/pickup/crowbar.ogg' -/obj/item/melee/telebaton/attack_self(mob/user) +/obj/item/melee/telebaton/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -196,7 +196,7 @@ damage_force = 0 attack_sound = "sound/items/bikehorn.ogg" -/obj/item/melee/stool/faiza/attack_self(mob/user) +/obj/item/melee/stool/faiza/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 93168cbb59a..cae61f0d792 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -78,7 +78,7 @@ var/detonator_mode = 0 var/obj/item/syndie/c4explosive/bomb -/obj/item/flame/lighter/zippo/c4detonator/attack_self(mob/user) +/obj/item/flame/lighter/zippo/c4detonator/attack_self(mob/user, datum/event_args/actor/actor) if(!detonator_mode) ..() diff --git a/code/game/objects/items/weapons/tanks/tank.dm b/code/game/objects/items/weapons/tanks/tank.dm index 24bb915b4fa..6e2c1b5a485 100644 --- a/code/game/objects/items/weapons/tanks/tank.dm +++ b/code/game/objects/items/weapons/tanks/tank.dm @@ -220,7 +220,7 @@ var/list/global/tank_gauge_cache = list() -/obj/item/tank/attack_self(mob/user) +/obj/item/tank/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 52b06f60bba..c53a9b5df74 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -23,7 +23,7 @@ origin_tech = list(TECH_MAGNET = 1) materials_base = list(MAT_STEEL = 400) -/obj/item/locator/attack_self(mob/user) +/obj/item/locator/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -133,7 +133,7 @@ Frequency: materials_base = list(MAT_STEEL = 10000) preserve_item = 1 -/obj/item/hand_tele/attack_self(mob/user) +/obj/item/hand_tele/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm index c6cf2dffe3c..687963a5b24 100644 --- a/code/game/objects/items/weapons/towels.dm +++ b/code/game/objects/items/weapons/towels.dm @@ -23,7 +23,7 @@ if(SLOT_ID_BELT) sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/clothing/species/teshari/belt.dmi') -/obj/item/towel/attack_self(mob/user) +/obj/item/towel/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index a56cd093b59..e81e8964a74 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -39,7 +39,7 @@ user.visible_message("[user] is putting the [src.name] on [T.his] head! It looks like [T.hes] trying to commit suicide.") return (BRUTELOSS) -/obj/item/beartrap/attack_self(mob/user) +/obj/item/beartrap/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 554be30604d..fed78943d55 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -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 diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index f1b0043751f..8a4dca633c6 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -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 diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 39d5dd6ba35..db8aeb22810 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -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 diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index d94c0aa091e..79fe2c891e5 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -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("[user] squishes [src]!", "You squish [src].", "You hear a squish.") icon_state = "urinalcake_squish" addtimer(VARSET_CALLBACK(src, icon_state, "urinalcake"), 8) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index b902a0a7c07..69f88b0ebed 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -98,7 +98,7 @@ return -/obj/item/assembly/attack_self(mob/user) +/obj/item/assembly/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index b9acfc00dc7..580fd586504 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -108,7 +108,7 @@ else ..() -/obj/item/assembly_holder/attack_self(mob/user) +/obj/item/assembly_holder/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index d5386a290c5..fb4f1040224 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -32,7 +32,7 @@ return TRUE -/obj/item/assembly/igniter/attack_self(mob/user) +/obj/item/assembly/igniter/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index f06c66e968d..f2a8e237c65 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -48,7 +48,7 @@ update_icon() pulse(0) -/obj/item/assembly/mousetrap/attack_self(mob/user) +/obj/item/assembly/mousetrap/attack_self(mob/user, datum/event_args/actor/actor) if(!armed) to_chat(user, "You arm [src].") else diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 3bde2f5966e..16e85d944d6 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -33,7 +33,7 @@ add_fingerprint(user) return -/obj/item/assembly/shock_kit/attack_self(mob/user) +/obj/item/assembly/shock_kit/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 0b6e2fb75bb..9c960a39736 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -25,7 +25,7 @@ T.visible_message("[icon2html(thing = src, target = world)] beeps, \"[listening ? "Now" : "No longer"] recording input.\"") -/obj/item/assembly/voice/attack_self(mob/user) +/obj/item/assembly/voice/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/catalogue/cataloguer.dm b/code/modules/catalogue/cataloguer.dm index 9df63a48379..452e3296d28 100644 --- a/code/modules/catalogue/cataloguer.dm +++ b/code/modules/catalogue/cataloguer.dm @@ -250,7 +250,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) /obj/item/cataloguer/proc/adjust_points(amount) points_stored = max(0, points_stored += amount) -/obj/item/cataloguer/attack_self(mob/user) +/obj/item/cataloguer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 5dffd45ae06..7766e0a6fa2 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -48,7 +48,7 @@ BLIND // can't see anything if(!isnull(vision_modifier)) user.remove_vision_modifier(vision_modifier) -/obj/item/clothing/glasses/attack_self(mob/user) +/obj/item/clothing/glasses/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -429,7 +429,7 @@ BLIND // can't see anything flash_protection = FLASH_PROTECTION_MAJOR tint = TINT_HEAVY -/obj/item/clothing/glasses/welding/attack_self(mob/user) +/obj/item/clothing/glasses/welding/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -563,7 +563,7 @@ BLIND // can't see anything toggleable = 1 activation_sound = 'sound/effects/pop.ogg' -/obj/item/clothing/glasses/sunglasses/sechud/aviator/attack_self(mob/user) +/obj/item/clothing/glasses/sunglasses/sechud/aviator/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -682,7 +682,7 @@ BLIND // can't see anything body_cover_flags = EYES species_restricted = list(SPECIES_TESHARI) -/obj/item/clothing/glasses/aerogelgoggles/attack_self(mob/user) +/obj/item/clothing/glasses/aerogelgoggles/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 8d256fedc00..2fff2f19887 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -111,7 +111,7 @@ name = "[initial(name)]" user.visible_message("[user] deletes the prescription data on the [src.name].") -/obj/item/clothing/glasses/omnihud/attack_self(mob/user) +/obj/item/clothing/glasses/omnihud/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -209,7 +209,7 @@ vision_flags = SEE_TURFS //but they can spot breaches. Due to the way HUDs work, they don't provide darkvision up-close the way mesons do. -/obj/item/clothing/glasses/omnihud/eng/meson/attack_self(mob/user) +/obj/item/clothing/glasses/omnihud/eng/meson/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -299,7 +299,7 @@ toggleable = 1 vision_flags = SEE_TURFS //but they can spot breaches. Due to the way HUDs work, they don't provide darkvision up-close the way mesons do. -/obj/item/clothing/glasses/omnihud/eng/meson/attack_self(mob/user) +/obj/item/clothing/glasses/omnihud/eng/meson/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 1fecc421944..81bcc334a6d 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -183,7 +183,7 @@ var/blessed = FALSE -/obj/item/clothing/gloves/swat/para/attack_self(mob/user) +/obj/item/clothing/gloves/swat/para/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/gloves/rings/rings.dm b/code/modules/clothing/gloves/rings/rings.dm index e56bf23c277..129e5d10fa5 100644 --- a/code/modules/clothing/gloves/rings/rings.dm +++ b/code/modules/clothing/gloves/rings/rings.dm @@ -6,7 +6,7 @@ icon_state = "diamond" item_state = "diamond_s" -/obj/item/clothing/gloves/ring/engagement/attack_self(mob/user) +/obj/item/clothing/gloves/ring/engagement/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -100,7 +100,7 @@ icon_state = "seal-signet" var/nameset = FALSE -/obj/item/clothing/gloves/ring/seal/signet/attack_self(mob/user) +/obj/item/clothing/gloves/ring/seal/signet/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -124,7 +124,7 @@ item_state = "wedring_g" var/partnername = "" -/obj/item/clothing/gloves/ring/wedding/attack_self(mob/user) +/obj/item/clothing/gloves/ring/wedding/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index fef193c63c3..ec4c69defa7 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -22,7 +22,7 @@ unequip_sound = 'sound/items/drop/hat.ogg' pickup_sound = 'sound/items/pickup/hat.ogg' -/obj/item/clothing/head/attack_self(mob/user) +/obj/item/clothing/head/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 668f9373119..e31766d8d85 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -67,7 +67,7 @@ valid_accessory_slots = ACCESSORY_SLOT_HELM_R item_action_name = "Toggle Visor" -/obj/item/clothing/head/helmet/riot/attack_self(mob/user) +/obj/item/clothing/head/helmet/riot/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -283,7 +283,7 @@ var/blessed = TRUE -/obj/item/clothing/head/helmet/para/attack_self(mob/user) +/obj/item/clothing/head/helmet/para/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -312,7 +312,7 @@ armor_type = /datum/armor/centcom/ert/paracausal item_action_name = "Enable Wards" -/obj/item/clothing/head/helmet/para/inquisitor/attack_self(mob/user) +/obj/item/clothing/head/helmet/para/inquisitor/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 9a64a6dfb4b..3ef819f459a 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -552,7 +552,7 @@ icon_state = "reindeer0" item_action_name = "Toggle Nose" -/obj/item/clothing/head/reindeer/attack_self(mob/user) +/obj/item/clothing/head/reindeer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -694,7 +694,7 @@ worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL item_action_name = "Toggle Hood" -/obj/item/clothing/head/cowl/attack_self(mob/user) +/obj/item/clothing/head/cowl/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index f6b34b2f272..b685c459f62 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -31,7 +31,7 @@ drop_sound = 'sound/items/drop/helm.ogg' pickup_sound = 'sound/items/pickup/helm.ogg' -/obj/item/clothing/head/welding/attack_self(mob/user) +/obj/item/clothing/head/welding/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -143,7 +143,7 @@ if (istype(location, /turf)) location.hotspot_expose(700, 1) -/obj/item/clothing/head/cakehat/attack_self(mob/user) +/obj/item/clothing/head/cakehat/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -171,7 +171,7 @@ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE cold_protection_cover = HEAD -/obj/item/clothing/head/ushanka/attack_self(mob/user) +/obj/item/clothing/head/ushanka/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm index d0b50bdced6..1ff65e30e17 100644 --- a/code/modules/clothing/head/pilot_helmet.dm +++ b/code/modules/clothing/head/pilot_helmet.dm @@ -188,7 +188,7 @@ icon_state = "pilot_helmet2" item_action_name = "Toggle Visor" -/obj/item/clothing/head/pilot/alt/attack_self(mob/user) +/obj/item/clothing/head/pilot/alt/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index bd8df09b34e..e2abbcfdcb4 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -12,7 +12,7 @@ flipped=0 ..() -/obj/item/clothing/head/soft/attack_self(mob/user) +/obj/item/clothing/head/soft/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index bd1e26e157a..bea597d452f 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -29,7 +29,7 @@ to_chat(user, "You pull the mask up to cover your face.") update_worn_icon() -/obj/item/clothing/mask/breath/attack_self(mob/user) +/obj/item/clothing/mask/breath/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index a682500a4fe..09530c6f6b4 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -80,7 +80,7 @@ set src in usr adjust_mask(usr) -/obj/item/clothing/mask/gas/half/attack_self(mob/user) +/obj/item/clothing/mask/gas/half/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -123,7 +123,7 @@ to_chat(user, "Your mask moves to cover your mouth.") return -/obj/item/clothing/mask/gas/swat/vox/attack_self(mob/user) +/obj/item/clothing/mask/gas/swat/vox/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 6617f54e03e..543815ad4fe 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -211,7 +211,7 @@ icon_state = "bandblack" item_state_slots = list(SLOT_ID_RIGHT_HAND = "bandblack", SLOT_ID_LEFT_HAND = "bandblack") -/obj/item/clothing/mask/bandana/attack_self(mob/user) +/obj/item/clothing/mask/bandana/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(src.icon_state == initial(icon_state)) src.icon_state = "[icon_state]_up" @@ -275,7 +275,7 @@ icon_state = "plainmask" inv_hide_flags = HIDEEARS|HIDEEYES|HIDEFACE -/obj/item/clothing/mask/paper/attack_self(mob/user) +/obj/item/clothing/mask/paper/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 8d43ec80d2b..9a22bed7c68 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -104,7 +104,7 @@ else return ..() -/obj/item/clothing/shoes/attack_self(mob/user) +/obj/item/clothing/shoes/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return //gtfo my shoe diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index cf6461a1518..9d68411de45 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -207,7 +207,7 @@ var/blessed = FALSE -/obj/item/clothing/shoes/boots/swat/para/attack_self(mob/user) +/obj/item/clothing/shoes/boots/swat/para/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 664c2e9c60a..fa7052ec561 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -113,7 +113,7 @@ icon_state = "orange" chained = null -/obj/item/clothing/shoes/orange/attack_self(mob/user) +/obj/item/clothing/shoes/orange/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 18716cdd619..be8a98560a6 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -23,7 +23,7 @@ /obj/item/clothing/shoes/magboots/proc/update_magboot_encumbrance() set_encumbrance(initial(encumbrance) + (magpulse? encumbrance_on : 0)) -/obj/item/clothing/shoes/magboots/attack_self(mob/user) +/obj/item/clothing/shoes/magboots/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -80,7 +80,7 @@ item_action_name = "Toggle the magclaws" -/obj/item/clothing/shoes/magboots/vox/attack_self(mob/user) +/obj/item/clothing/shoes/magboots/vox/attack_self(mob/user, datum/event_args/actor/actor) if(src.magpulse) clothing_flags &= ~NOSLIP magpulse = 0 diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 8bf334f378a..0b0cf5d4263 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -285,7 +285,7 @@ to_chat(H, "You deploy your magboots.") // below is code for the action button method. im dumb. but it works? if you figure out a way to make it better tell me // hey peesh i made it better -hatter -/obj/item/clothing/suit/space/void/attack_self(mob/user) +/obj/item/clothing/suit/space/void/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 5914082a641..c312753af7c 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -198,7 +198,7 @@ user.forceMove(picked) shieldcall_args[SHIELDCALL_ARG_FLAGS] |= SHIELDCALL_FLAG_ATTACK_BLOCKED | SHIELDCALL_FLAG_ATTACK_PASSTHROUGH -/obj/item/clothing/suit/armor/reactive/attack_self(mob/user) +/obj/item/clothing/suit/armor/reactive/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -757,7 +757,7 @@ var/anti_magic = FALSE var/blessed = FALSE -/obj/item/clothing/suit/armor/vest/para/attack_self(mob/user) +/obj/item/clothing/suit/armor/vest/para/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/suits/medieval_armor.dm b/code/modules/clothing/suits/medieval_armor.dm index af49c3e0d1e..cba385a27b9 100644 --- a/code/modules/clothing/suits/medieval_armor.dm +++ b/code/modules/clothing/suits/medieval_armor.dm @@ -32,7 +32,7 @@ icon_state = "paladinhelm" item_action_name = "Toggle Visor" -/obj/item/clothing/head/helmet/medieval/paladin/attack_self(mob/user) +/obj/item/clothing/head/helmet/medieval/paladin/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -178,7 +178,7 @@ icon_state = "paladinhelm" item_action_name = "Toggle Visor" -/obj/item/clothing/head/medievalfake/paladin/attack_self(mob/user) +/obj/item/clothing/head/medievalfake/paladin/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index a9c28b8385a..393ead9c4f5 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -386,7 +386,7 @@ slot = ACCESSORY_SLOT_DECOR item_action_name = "Adjust Gaiter" -/obj/item/clothing/accessory/gaiter/attack_self(mob/user) +/obj/item/clothing/accessory/gaiter/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -497,7 +497,7 @@ overlay_state = "choker_cst_overlay" var/customized = 0 -/obj/item/clothing/accessory/choker/attack_self(mob/user) +/obj/item/clothing/accessory/choker/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -694,7 +694,7 @@ M.afflict_paralyze(20 * 10) return -/obj/item/clothing/accessory/collar/shock/attack_self(mob/user) +/obj/item/clothing/accessory/collar/shock/attack_self(mob/user, datum/event_args/actor/actor) if(!istype(user, /mob/living/carbon/human)) return user.set_machine(src) @@ -767,7 +767,7 @@ /obj/item/clothing/accessory/collar/holo/indigestible/digest_act(var/atom/movable/item_storage = null) return FALSE -/obj/item/clothing/accessory/collar/attack_self(mob/user) +/obj/item/clothing/accessory/collar/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index f42b06b1c0a..4782c5621f4 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -496,7 +496,7 @@ camera_networks = list(NETWORK_CIV_HELMETS) -/obj/item/clothing/accessory/armor/helmetcamera/attack_self(mob/user) +/obj/item/clothing/accessory/armor/helmetcamera/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index ccf7a3ee042..26efe946966 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -28,7 +28,7 @@ /obj/item/clothing/accessory/badge/proc/set_desc(var/mob/living/carbon/human/H) -/obj/item/clothing/accessory/badge/attack_self(mob/user) +/obj/item/clothing/accessory/badge/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -56,7 +56,7 @@ icon_state = "sheriff" item_state = "goldbadge" -/obj/item/clothing/accessory/badge/sheriff/attack_self(mob/user) +/obj/item/clothing/accessory/badge/sheriff/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -79,7 +79,7 @@ icon_state = "holobadge-cord" slot_flags = SLOT_MASK | SLOT_TIE | SLOT_BELT -/obj/item/clothing/accessory/badge/holo/attack_self(mob/user) +/obj/item/clothing/accessory/badge/holo/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 86d77f3e482..7b057ad64f7 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -136,7 +136,7 @@ /obj/item/gun/ballistic, /obj/item/ammo_magazine, /obj/item/melee/baton) item_action_name = "Adjust Cloak" -/obj/item/clothing/accessory/poncho/rough_cloak/attack_self(mob/user) +/obj/item/clothing/accessory/poncho/rough_cloak/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/under/accessories/lockets.dm b/code/modules/clothing/under/accessories/lockets.dm index 8b53a4f70ce..dd2aa41aaf8 100644 --- a/code/modules/clothing/under/accessories/lockets.dm +++ b/code/modules/clothing/under/accessories/lockets.dm @@ -11,7 +11,7 @@ var/open var/obj/item/held //Item inside locket. -/obj/item/clothing/accessory/locket/attack_self(mob/user) +/obj/item/clothing/accessory/locket/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/clothing/under/accessories/permits.dm b/code/modules/clothing/under/accessories/permits.dm index ceb63ca3569..ca155ab7cf4 100755 --- a/code/modules/clothing/under/accessories/permits.dm +++ b/code/modules/clothing/under/accessories/permits.dm @@ -9,7 +9,7 @@ slot = ACCESSORY_SLOT_MEDAL var/owner = 0 //To prevent people from just renaming the thing if they steal it -/obj/item/clothing/accessory/permit/attack_self(mob/user) +/obj/item/clothing/accessory/permit/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/detectivework/tools/evidencebag.dm b/code/modules/detectivework/tools/evidencebag.dm index 8a52f1045d5..cb1ec67a42c 100644 --- a/code/modules/detectivework/tools/evidencebag.dm +++ b/code/modules/detectivework/tools/evidencebag.dm @@ -72,7 +72,7 @@ stored_item = I set_weight_class(I.w_class) -/obj/item/evidencebag/attack_self(mob/user) +/obj/item/evidencebag/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 4b2741e467b..8140362947b 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -57,7 +57,7 @@ STOP_PROCESSING(SSobj, src) //so we don't continue turning to ash while gc'd return ..() -/obj/item/reagent_containers/glass/rag/attack_self(mob/user) +/obj/item/reagent_containers/glass/rag/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/detectivework/tools/sample_kits.dm b/code/modules/detectivework/tools/sample_kits.dm index 993e2e36d94..ab1601b1610 100644 --- a/code/modules/detectivework/tools/sample_kits.dm +++ b/code/modules/detectivework/tools/sample_kits.dm @@ -60,7 +60,7 @@ icon_state = "fingerprint0" item_state = "paper" -/obj/item/sample/print/attack_self(mob/user) +/obj/item/sample/print/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/detectivework/tools/uvlight.dm b/code/modules/detectivework/tools/uvlight.dm index 808c019bb29..88f228fef86 100644 --- a/code/modules/detectivework/tools/uvlight.dm +++ b/code/modules/detectivework/tools/uvlight.dm @@ -18,7 +18,7 @@ var/on = 0 var/step_alpha = 50 -/obj/item/uv_light/attack_self(mob/user) +/obj/item/uv_light/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/economy/items/EFTPOS.dm b/code/modules/economy/items/EFTPOS.dm index a3c2a71f5f2..218bacb5b96 100644 --- a/code/modules/economy/items/EFTPOS.dm +++ b/code/modules/economy/items/EFTPOS.dm @@ -84,7 +84,7 @@ D.wrapped = R D.name = "small parcel - 'EFTPOS access code'" -/obj/item/eftpos/attack_self(mob/user) +/obj/item/eftpos/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/economy/items/cash.dm b/code/modules/economy/items/cash.dm index 1da69fe8d69..f80c78e6323 100644 --- a/code/modules/economy/items/cash.dm +++ b/code/modules/economy/items/cash.dm @@ -85,7 +85,7 @@ update_icon() return worth -/obj/item/spacecash/attack_self(mob/user) +/obj/item/spacecash/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -187,7 +187,7 @@ pickup_sound = 'sound/items/pickup/card.ogg' var/owner_name = "" //So the ATM can set it so the EFTPOS can put a valid name on transactions. -/obj/item/spacecash/ewallet/attack_self(mob/user) +/obj/item/spacecash/ewallet/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/economy/items/coins.dm b/code/modules/economy/items/coins.dm index 6a85dd5c359..9ef3390d17f 100644 --- a/code/modules/economy/items/coins.dm +++ b/code/modules/economy/items/coins.dm @@ -103,7 +103,7 @@ to_chat(user, "You detach the string from the coin.") else ..() -/obj/item/coin/attack_self(mob/user) +/obj/item/coin/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/economy/items/retail_scanner.dm b/code/modules/economy/items/retail_scanner.dm index c4d49fc1db4..789659f083d 100644 --- a/code/modules/economy/items/retail_scanner.dm +++ b/code/modules/economy/items/retail_scanner.dm @@ -46,7 +46,7 @@ setDir(SOUTH) pixel_y = 0 -/obj/item/retail_scanner/attack_self(mob/user) +/obj/item/retail_scanner/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/fishing/aquarium/aquarium_kit.dm b/code/modules/fishing/aquarium/aquarium_kit.dm index b3fd8692032..344616714b5 100644 --- a/code/modules/fishing/aquarium/aquarium_kit.dm +++ b/code/modules/fishing/aquarium/aquarium_kit.dm @@ -18,6 +18,6 @@ icon_state = "construction_kit" w_class = WEIGHT_CLASS_TINY -/obj/item/aquarium_kit/attack_self(mob/user) +/obj/item/aquarium_kit/attack_self(mob/user, datum/event_args/actor/actor) . = ..() to_chat(user, SPAN_NOTICE("There's instruction and tools necessary to build aquarium inside. All you need is to start crafting.")) diff --git a/code/modules/fishing/equipment/bait_can.dm b/code/modules/fishing/equipment/bait_can.dm index a26b81331f8..52b5f07b4ae 100644 --- a/code/modules/fishing/equipment/bait_can.dm +++ b/code/modules/fishing/equipment/bait_can.dm @@ -14,7 +14,7 @@ /// how much it has left; null for infinite var/bait_left = 50 -/obj/item/bait_can/attack_self(mob/user) +/obj/item/bait_can/attack_self(mob/user, datum/event_args/actor/actor) . = ..() var/fresh_bait = retrieve_bait(user) if(fresh_bait) diff --git a/code/modules/food/drinks/bottle.dm b/code/modules/food/drinks/bottle.dm index de52e6a5082..42fabc5b3c7 100644 --- a/code/modules/food/drinks/bottle.dm +++ b/code/modules/food/drinks/bottle.dm @@ -107,7 +107,7 @@ return ..() -/obj/item/reagent_containers/food/drinks/bottle/attack_self(mob/user) +/obj/item/reagent_containers/food/drinks/bottle/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/food/drinks/shaker.dm b/code/modules/food/drinks/shaker.dm index 8a425e83ab8..41e7fd53917 100644 --- a/code/modules/food/drinks/shaker.dm +++ b/code/modules/food/drinks/shaker.dm @@ -7,7 +7,7 @@ center_of_mass = list("x"=17, "y"=10) -/obj/item/reagent_containers/food/drinks/shaker/attack_self(mob/user) +/obj/item/reagent_containers/food/drinks/shaker/attack_self(mob/user, datum/event_args/actor/actor) playsound(loc, "sound/items/shaker.ogg", 75, 1, -1) if(prob(50)) diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index db7d44dca4a..e23b5299148 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -18,7 +18,7 @@ /obj/item/reagent_containers/food/condiment/attackby(var/obj/item/W as obj, var/mob/user as mob) return -/obj/item/reagent_containers/food/condiment/attack_self(mob/user) +/obj/item/reagent_containers/food/condiment/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 745c9defb59..22144611a5b 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -25,7 +25,7 @@ price_tag = null return -/obj/item/reagent_containers/food/drinks/attack_self(mob/user) +/obj/item/reagent_containers/food/drinks/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index ab89a235a24..ecc14250008 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -49,7 +49,7 @@ M.put_in_hands(trash) qdel(src) -/obj/item/reagent_containers/food/snacks/attack_self(mob/user) +/obj/item/reagent_containers/food/snacks/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -1004,7 +1004,7 @@ heated_reagents = list("doctorsdelight" = 5, "hyperzine" = 0.75, "synaptizine" = 0.25) var/has_been_heated = 0 -/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket/attack_self(mob/user) +/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -1858,7 +1858,7 @@ . = ..() reagents.add_reagent("protein", 10) -/obj/item/reagent_containers/food/snacks/monkeycube/attack_self(mob/user) +/obj/item/reagent_containers/food/snacks/monkeycube/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -3298,7 +3298,7 @@ return . = ..() -/obj/item/pizzabox/attack_self(mob/user) +/obj/item/pizzabox/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 1fb2c99dffe..154fa03fb80 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -212,7 +212,7 @@ ..() -/obj/item/deck/attack_self(mob/user) +/obj/item/deck/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -287,7 +287,7 @@ pickup_sound = 'sound/items/pickup/paper.ogg' -/obj/item/pack/attack_self(mob/user) +/obj/item/pack/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -349,7 +349,7 @@ if(!cards.len) qdel(src) -/obj/item/hand/attack_self(mob/user) +/obj/item/hand/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/games/dice.dm b/code/modules/games/dice.dm index 55bf090bfdd..b02916526b5 100644 --- a/code/modules/games/dice.dm +++ b/code/modules/games/dice.dm @@ -55,7 +55,7 @@ sides = 10 result = 10 -/obj/item/dice/attack_self(mob/user) +/obj/item/dice/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -148,7 +148,7 @@ /obj/item/dice, ) -/obj/item/storage/dicecup/attack_self(mob/user) +/obj/item/storage/dicecup/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/hardsuits/suits/ert.dm b/code/modules/hardsuits/suits/ert.dm index 4a23e26fd45..955c23b7bcf 100644 --- a/code/modules/hardsuits/suits/ert.dm +++ b/code/modules/hardsuits/suits/ert.dm @@ -153,7 +153,7 @@ /obj/item/hardsuit_module/self_destruct ) -/obj/item/hardsuit/ert/para/attack_self(mob/user) +/obj/item/hardsuit/ert/para/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 9160f19cc59..4010d4dd9ba 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -241,7 +241,7 @@ // todo: the parry system was removed from this because that sucks maybe readd it later lol -/obj/item/holo/esword/attack_self(mob/user) +/obj/item/holo/esword/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm index 7e3e2e941fe..921adb89bab 100644 --- a/code/modules/hydroponics/beekeeping/beehive.dm +++ b/code/modules/hydroponics/beekeeping/beehive.dm @@ -228,7 +228,7 @@ icon = 'icons/obj/apiary_bees_etc.dmi' icon_state = "apiary" -/obj/item/beehive_assembly/attack_self(mob/user) +/obj/item/beehive_assembly/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 19020934933..48206ed05c1 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -258,7 +258,7 @@ to_chat(user, "\The [src] has fallen to bits.") qdel(src) -/obj/item/reagent_containers/food/snacks/grown/attack_self(mob/user) +/obj/item/reagent_containers/food/snacks/grown/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 11f53899121..8fed8de86ae 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -13,7 +13,7 @@ pixel_x = rand(-5,5) pixel_y = rand(-5,5) -/obj/item/disk/botany/attack_self(mob/user) +/obj/item/disk/botany/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/industry/destination_tagger.dm b/code/modules/industry/destination_tagger.dm index afa4406dde4..75687946e1e 100644 --- a/code/modules/industry/destination_tagger.dm +++ b/code/modules/industry/destination_tagger.dm @@ -26,7 +26,7 @@ return data -/obj/item/destTagger/attack_self(mob/user) +/obj/item/destTagger/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/industry/packages/small_parcel.dm b/code/modules/industry/packages/small_parcel.dm index 433b8444952..1b95ff9f276 100644 --- a/code/modules/industry/packages/small_parcel.dm +++ b/code/modules/industry/packages/small_parcel.dm @@ -12,7 +12,7 @@ var/nameset = 0 var/tag_x -/obj/item/smallDelivery/attack_self(mob/user) +/obj/item/smallDelivery/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/instruments/instruments/item.dm b/code/modules/instruments/instruments/item.dm index a4fb544ec22..e0b6ad26a16 100644 --- a/code/modules/instruments/instruments/item.dm +++ b/code/modules/instruments/instruments/item.dm @@ -50,7 +50,7 @@ user.visible_message("[user] begins to play 'Gloomy Sunday'! It looks like they're trying to commit suicide!") return (BRUTELOSS) -/obj/item/instrument/attack_self(mob/user) +/obj/item/instrument/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 43cfa1a3546..38bd461e8e9 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -514,7 +514,7 @@ return TRUE return ..() -/obj/item/electronic_assembly/attack_self(mob/user) +/obj/item/electronic_assembly/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/integrated_electronics/core/assemblies/clothing.dm b/code/modules/integrated_electronics/core/assemblies/clothing.dm index 7da98646c91..91f80ee4aba 100644 --- a/code/modules/integrated_electronics/core/assemblies/clothing.dm +++ b/code/modules/integrated_electronics/core/assemblies/clothing.dm @@ -65,7 +65,7 @@ else ..() -/obj/item/clothing/attack_self(mob/user) +/obj/item/clothing/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/integrated_electronics/core/assemblies/device.dm b/code/modules/integrated_electronics/core/assemblies/device.dm index 205160dd060..afc031bf479 100644 --- a/code/modules/integrated_electronics/core/assemblies/device.dm +++ b/code/modules/integrated_electronics/core/assemblies/device.dm @@ -39,7 +39,7 @@ if(opened) icon_state = icon_state + "-open" -/obj/item/assembly/electronic_assembly/attack_self(mob/user) +/obj/item/assembly/electronic_assembly/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/integrated_electronics/core/detailer.dm b/code/modules/integrated_electronics/core/detailer.dm index 3875e34f63f..20da320a5ba 100644 --- a/code/modules/integrated_electronics/core/detailer.dm +++ b/code/modules/integrated_electronics/core/detailer.dm @@ -62,7 +62,7 @@ update_icon() return TRUE -/obj/item/integrated_electronics/detailer/attack_self(mob/user) +/obj/item/integrated_electronics/detailer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm index 536ebe2f61d..48e4da9657d 100644 --- a/code/modules/integrated_electronics/core/printer.dm +++ b/code/modules/integrated_electronics/core/printer.dm @@ -174,7 +174,7 @@ dirty_items = TRUE return ..() -/obj/item/integrated_circuit_printer/attack_self(mob/user) +/obj/item/integrated_circuit_printer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index 36d050cff97..536f2de027e 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -77,7 +77,7 @@ [io.name] are not connected.") return -/obj/item/integrated_electronics/wirer/attack_self(mob/user) +/obj/item/integrated_electronics/wirer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -115,7 +115,7 @@ var/accepting_refs = FALSE var/copy_values = FALSE -/obj/item/integrated_electronics/debugger/attack_self(mob/user) +/obj/item/integrated_electronics/debugger/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -247,7 +247,7 @@ var/datum/integrated_io/selected_io = null var/mode = 0 -/obj/item/multitool/attack_self(mob/user) +/obj/item/multitool/attack_self(mob/user, datum/event_args/actor/actor) if(selected_io) selected_io = null to_chat(user, "You clear the wired connection from the multitool.") diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index 5932727d079..8d2e3c87f7e 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -291,7 +291,7 @@ set_pin_data(IC_OUTPUT, 4, contents) push_data() -/obj/item/integrated_circuit/manipulation/grabber/attack_self(mob/user) +/obj/item/integrated_circuit/manipulation/grabber/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -858,7 +858,7 @@ else ..() -/obj/item/integrated_circuit/manipulation/weapon_firing/attack_self(mob/user) +/obj/item/integrated_circuit/manipulation/weapon_firing/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -968,7 +968,7 @@ else return ..() -/obj/item/integrated_circuit/manipulation/grenade/attack_self(mob/user) +/obj/item/integrated_circuit/manipulation/grenade/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/integrated_electronics/subtypes/memory.dm b/code/modules/integrated_electronics/subtypes/memory.dm index 4d9cb02f5a1..e9d77e52c59 100644 --- a/code/modules/integrated_electronics/subtypes/memory.dm +++ b/code/modules/integrated_electronics/subtypes/memory.dm @@ -80,7 +80,7 @@ var/datum/integrated_io/O = outputs[1] O.push_data() -/obj/item/integrated_circuit/memory/constant/attack_self(mob/user) +/obj/item/integrated_circuit/memory/constant/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 0fd77a80373..f2b47af1ab9 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -345,7 +345,7 @@ activate_pin(1) activate_pin(3) -/obj/item/integrated_circuit/input/beaker_connector/attack_self(mob/user) +/obj/item/integrated_circuit/input/beaker_connector/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/integrated_electronics/subtypes/smart.dm b/code/modules/integrated_electronics/subtypes/smart.dm index 87ce2c08159..23c86cc1531 100644 --- a/code/modules/integrated_electronics/subtypes/smart.dm +++ b/code/modules/integrated_electronics/subtypes/smart.dm @@ -193,7 +193,7 @@ O.brainmob.remote_control=src set_pin_data(IC_OUTPUT, 1, O) -/obj/item/integrated_circuit/input/mmi_tank/attack_self(mob/user) +/obj/item/integrated_circuit/input/mmi_tank/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -320,7 +320,7 @@ O.pai.remote_control=src set_pin_data(IC_OUTPUT, 1, O) -/obj/item/integrated_circuit/input/pAI_connector/attack_self(mob/user) +/obj/item/integrated_circuit/input/pAI_connector/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/library/book.dm b/code/modules/library/book.dm index 1bef2444681..99fe0154433 100644 --- a/code/modules/library/book.dm +++ b/code/modules/library/book.dm @@ -19,7 +19,7 @@ drop_sound = 'sound/items/drop/book.ogg' pickup_sound = 'sound/items/pickup/book.ogg' -/obj/item/book/attack_self(mob/user) +/obj/item/book/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 5df9c106a82..137f34650ad 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -223,7 +223,7 @@ var/obj/item/book/book // Currently scanned book var/mode = 0 // 0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory -/obj/item/barcodescanner/attack_self(mob/user) +/obj/item/barcodescanner/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/lore_codex/codex.dm b/code/modules/lore_codex/codex.dm index 0d33b266665..b3e42744151 100644 --- a/code/modules/lore_codex/codex.dm +++ b/code/modules/lore_codex/codex.dm @@ -12,7 +12,7 @@ tree = new(src, root_type) . = ..() -/obj/item/book/codex/attack_self(mob/user) +/obj/item/book/codex/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 8fb9f06f477..951fe746256 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -91,7 +91,7 @@ if(M) M.update_strings() return transfer -/obj/item/stack/material/attack_self(mob/user) +/obj/item/stack/material/attack_self(mob/user, datum/event_args/actor/actor) if(!allow_window_autobuild || !material.build_windows(user, src)) return ..() diff --git a/code/modules/media/walkpod.dm b/code/modules/media/walkpod.dm index d000692afc2..1346491113e 100644 --- a/code/modules/media/walkpod.dm +++ b/code/modules/media/walkpod.dm @@ -77,7 +77,7 @@ else if(loc == L) // at least they're holding it to_chat(L, "Turn on the [src] first.") -/obj/item/device/walkpod/attack_self(mob/user) +/obj/item/device/walkpod/attack_self(mob/user, datum/event_args/actor/actor) var/mob/living/L = user if(!istype(L) || loc != L) return diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm index 642157c2efe..41bc46f94b6 100644 --- a/code/modules/mining/drilling/scanner.dm +++ b/code/modules/mining/drilling/scanner.dm @@ -27,7 +27,7 @@ to_chat(usr, "New scan range set to [scanrange] step(s) around user, including current location.") . = ..() -/obj/item/mining_scanner/attack_self(mob/user) +/obj/item/mining_scanner/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mining/tools/fulton.dm b/code/modules/mining/tools/fulton.dm index e7df8a6c276..b2c3a787de1 100644 --- a/code/modules/mining/tools/fulton.dm +++ b/code/modules/mining/tools/fulton.dm @@ -31,7 +31,7 @@ var/global/list/total_extraction_beacons = list() . = ..() . +="It has [uses_left] use\s remaining." -/obj/item/extraction_pack/attack_self(mob/user) +/obj/item/extraction_pack/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -167,7 +167,7 @@ var/global/list/total_extraction_beacons = list() icon = 'icons/obj/stock_parts.dmi' icon_state = "subspace_amplifier" -/obj/item/fulton_core/attack_self(mob/user) +/obj/item/fulton_core/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mining/tools/kinetic_accelerator.dm b/code/modules/mining/tools/kinetic_accelerator.dm index c09a9d21af6..cfcb7ae6475 100644 --- a/code/modules/mining/tools/kinetic_accelerator.dm +++ b/code/modules/mining/tools/kinetic_accelerator.dm @@ -632,7 +632,7 @@ name = "adjustable tracer bolts" desc = "Causes kinetic accelerator bolts to have an adjustable-colored tracer trail and explosion. Use in-hand to change color." -/obj/item/ka_modkit/tracer/adjustable/attack_self(mob/user) +/obj/item/ka_modkit/tracer/adjustable/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mining/tools/mine_items.dm b/code/modules/mining/tools/mine_items.dm index 499d2e7f927..ca72bb02a3f 100644 --- a/code/modules/mining/tools/mine_items.dm +++ b/code/modules/mining/tools/mine_items.dm @@ -207,7 +207,7 @@ active = FALSE update_icon() -/obj/item/pickaxe/tyrmalin/attack_self(mob/user) +/obj/item/pickaxe/tyrmalin/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -393,7 +393,7 @@ else ..() -/obj/item/stack/flag/attack_self(mob/user) +/obj/item/stack/flag/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mining/tools/resonator.dm b/code/modules/mining/tools/resonator.dm index 77a7e2585de..6571987a5aa 100644 --- a/code/modules/mining/tools/resonator.dm +++ b/code/modules/mining/tools/resonator.dm @@ -37,7 +37,7 @@ spawn(burst_time) fieldsactive-- -/obj/item/resonator/attack_self(mob/user) +/obj/item/resonator/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mining/tools/shelter_atoms.dm b/code/modules/mining/tools/shelter_atoms.dm index 619a349bdb7..30dad58e23d 100644 --- a/code/modules/mining/tools/shelter_atoms.dm +++ b/code/modules/mining/tools/shelter_atoms.dm @@ -35,7 +35,7 @@ . += "This capsule has the [template.name] stored." . += template.description -/obj/item/survivalcapsule/attack_self(mob/user) +/obj/item/survivalcapsule/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mining/tools/vertibore.dm b/code/modules/mining/tools/vertibore.dm index 324001d5777..180c3ffd05f 100644 --- a/code/modules/mining/tools/vertibore.dm +++ b/code/modules/mining/tools/vertibore.dm @@ -71,7 +71,7 @@ return . = ..() -/obj/item/vertibore/attack_self(mob/user) +/obj/item/vertibore/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mob/grab.dm b/code/modules/mob/grab.dm index c1229a5996d..2c937c8129d 100644 --- a/code/modules/mob/grab.dm +++ b/code/modules/mob/grab.dm @@ -240,7 +240,7 @@ if(!affecting.has_status_effect(/datum/status_effect/sight/blindness)) affecting.apply_status_effect(/datum/status_effect/sight/blindness, 3 SECONDS) -/obj/item/grab/attack_self(mob/user) +/obj/item/grab/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index a77baa8385a..2e17f0f2749 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -109,7 +109,7 @@ ..() //TODO: ORGAN REMOVAL UPDATE. Make the brain remain in the MMI so it doesn't lose organ data. -/obj/item/mmi/attack_self(mob/user) +/obj/item/mmi/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -249,7 +249,7 @@ H.mind.transfer(brainmob) return -/obj/item/mmi/digital/attack_self(mob/user) +/obj/item/mmi/digital/attack_self(mob/user, datum/event_args/actor/actor) if(brainmob && !brainmob.key && searching == 0) //Start the process of searching for a new user. to_chat(user, "You carefully locate the manual activation switch and start the [src]'s boot process.") diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index f0cba1bd020..ac9f20630eb 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -33,7 +33,7 @@ if(istype(ghost)) question(ghost) -/obj/item/mmi/digital/posibrain/attack_self(mob/user) +/obj/item/mmi/digital/posibrain/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mob/living/carbon/brain/robot.dm b/code/modules/mob/living/carbon/brain/robot.dm index 0ed4096809a..5a706f22d85 100644 --- a/code/modules/mob/living/carbon/brain/robot.dm +++ b/code/modules/mob/living/carbon/brain/robot.dm @@ -29,7 +29,7 @@ to_chat(brainmob, "You feel slightly disoriented. That's normal when you're little more than a complex circuit.") return -/obj/item/mmi/digital/robot/attack_self(mob/user) +/obj/item/mmi/digital/robot/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index c061d3a0c49..f0686a2f5e5 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -21,7 +21,7 @@ w_class = WEIGHT_CLASS_NORMAL var/emagged = 0 -/obj/item/dogborg/jaws/small/attack_self(mob/user) +/obj/item/dogborg/jaws/small/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -60,7 +60,7 @@ attack_verb = list("nuzzled", "nosed", "booped") w_class = WEIGHT_CLASS_TINY -/obj/item/dogborg/boop_module/attack_self(mob/user) +/obj/item/dogborg/boop_module/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -190,7 +190,7 @@ if(water.energy < 5) . += "[src] is dry." -/obj/item/dogborg/tongue/attack_self(mob/user) +/obj/item/dogborg/tongue/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -304,7 +304,7 @@ item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD var/enabled = FALSE -/obj/item/pupscrubber/attack_self(mob/user) +/obj/item/pupscrubber/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -349,7 +349,7 @@ var/cooldown = 0 var/datum/matter_synth/glass = null -/obj/item/lightreplacer/dogborg/attack_self(mob/user) +/obj/item/lightreplacer/dogborg/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return//Recharger refill is so last season. Now we recycle without magic! @@ -382,7 +382,7 @@ item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD throw_force = 0 -/obj/item/dogborg/pounce/attack_self(mob/user) +/obj/item/dogborg/pounce/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 29753b3839f..d293d7c59de 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -178,7 +178,7 @@ hound = hound.loc hound.cell.charge = hound.cell.charge - amt -/obj/item/dogborg/sleeper/attack_self(mob/user) +/obj/item/dogborg/sleeper/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 6e40f348ffe..204c20df838 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -16,7 +16,7 @@ . = ..() files = new /datum/research/techonly(src) //Setup the research data holder. -/obj/item/portable_destructive_analyzer/attack_self(mob/user) +/obj/item/portable_destructive_analyzer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -274,7 +274,7 @@ name = "Printing Pen" var/mode = 1 -/obj/item/pen/robopen/attack_self(mob/user) +/obj/item/pen/robopen/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -335,7 +335,7 @@ if(istype(target,/obj/structure/table)) deploy_paper(get_turf(target)) -/obj/item/form_printer/attack_self(mob/user) +/obj/item/form_printer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -368,7 +368,7 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/item/borg/combat/shield/attack_self(mob/user) +/obj/item/borg/combat/shield/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -443,7 +443,7 @@ . += "It has [stored_walls] wall segment\s and [stored_doors] door segment\s stored." . += "It is set to deploy [mode ? "doors" : "walls"]" -/obj/item/inflatable_dispenser/attack_self(mob/user) +/obj/item/inflatable_dispenser/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm index c555b146fa4..de50b2d8651 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm @@ -154,7 +154,7 @@ else ..() -/obj/item/holder/mouse/attack_self(mob/user) +/obj/item/holder/mouse/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm index ff0fb0bbac4..132c2c55faf 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm @@ -189,7 +189,7 @@ icon_state = "box" var/cattype = /mob/living/simple_mob/animal/passive/cat -/obj/item/cat_box/attack_self(mob/user) +/obj/item/cat_box/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm index 9207f187b5d..a1cb27a746a 100644 --- a/code/modules/modular_computers/computers/modular_computer/interaction.dm +++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm @@ -115,7 +115,7 @@ return ..() /// On-click handling. Turns on the computer if it's off and opens the GUI. -/obj/item/modular_computer/attack_self(mob/user) +/obj/item/modular_computer/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/multiz/structures/hoist.dm b/code/modules/multiz/structures/hoist.dm index aceb2dfcde0..c3cd3315327 100644 --- a/code/modules/multiz/structures/hoist.dm +++ b/code/modules/multiz/structures/hoist.dm @@ -10,7 +10,7 @@ icon = 'icons/obj/hoists.dmi' icon_state = "hoist_case" -/obj/item/hoist_kit/attack_self(mob/user) +/obj/item/hoist_kit/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm index b5e372484eb..8677ae7a91d 100644 --- a/code/modules/nifsoft/nifsoft.dm +++ b/code/modules/nifsoft/nifsoft.dm @@ -277,7 +277,7 @@ return return ..() -/obj/item/disk/nifsoft/compliance/attack_self(mob/user) +/obj/item/disk/nifsoft/compliance/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/organs/external/external.dm b/code/modules/organs/external/external.dm index b81da0040b6..8021f5df2ef 100644 --- a/code/modules/organs/external/external.dm +++ b/code/modules/organs/external/external.dm @@ -200,7 +200,7 @@ weapon_descriptor = "electromagnetic overload", ) -/obj/item/organ/external/attack_self(mob/user) +/obj/item/organ/external/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/organs/internal/species/adherent.dm b/code/modules/organs/internal/species/adherent.dm index 8b7bd45ce8b..3d2ee4e227a 100644 --- a/code/modules/organs/internal/species/adherent.dm +++ b/code/modules/organs/internal/species/adherent.dm @@ -35,7 +35,7 @@ action.button_icon_state = "[base_action_state]-[active ? "on" : "off"]" return ..() -/obj/item/organ/internal/powered/attack_self(mob/user) +/obj/item/organ/internal/powered/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 72564611c78..a7923bfaf71 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -668,7 +668,7 @@ user.put_in_active_hand(O) qdel(src) -/obj/item/organ/attack_self(mob/user) +/obj/item/organ/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 8b716d5d7d0..fe93c6b32d0 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -45,7 +45,7 @@ return ..() -/obj/item/clipboard/attack_self(mob/user) +/obj/item/clipboard/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 15914b5f342..c9a87619e4f 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -75,7 +75,7 @@ else return ..() -/obj/item/folder/attack_self(mob/user) +/obj/item/folder/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index ae8e907f787..ba158d3db9c 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -57,7 +57,7 @@ "You label [target] as [label].") target.name = "[target.name] ([label])" -/obj/item/hand_labeler/attack_self(mob/user) +/obj/item/hand_labeler/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/paperwork/paper/paper.dm b/code/modules/paperwork/paper/paper.dm index a3bc621743e..e3688a6b635 100644 --- a/code/modules/paperwork/paper/paper.dm +++ b/code/modules/paperwork/paper/paper.dm @@ -126,7 +126,7 @@ add_fingerprint(usr) return -/obj/item/paper/attack_self(mob/user) +/obj/item/paper/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 20a22984aa4..ddda3175ec3 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -133,7 +133,7 @@ dat += P.html(user) user << browse(dat, "window=[name]") -/obj/item/paper_bundle/attack_self(mob/user) +/obj/item/paper_bundle/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index a77b19d7ee5..703be6a1edb 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -45,7 +45,7 @@ add_overlay(overlays_to_add) -/obj/item/paperplane/attack_self(mob/user) +/obj/item/paperplane/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 4c69cc9342f..ad049c49644 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -36,7 +36,7 @@ /// can we click? var/clickable = TRUE -/obj/item/pen/attack_self(mob/user) +/obj/item/pen/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -72,7 +72,7 @@ playsound(src, 'sound/items/penclick.ogg', 50, 1) return -/obj/item/pen/multi/attack_self(mob/user) +/obj/item/pen/multi/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -91,7 +91,7 @@ /obj/item/pen/click name = "clicker pen" -/obj/item/pen/click/attack_self(mob/user) +/obj/item/pen/click/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -256,7 +256,7 @@ /obj/item/pen/chameleon var/signature = "" -/obj/item/pen/chameleon/attack_self(mob/user) +/obj/item/pen/chameleon/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index bff1bebe408..7d7909670df 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -81,7 +81,7 @@ // Syndicate stamp to forge documents. -/obj/item/stamp/chameleon/attack_self(mob/user) +/obj/item/stamp/chameleon/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/photography/camera.dm b/code/modules/photography/camera.dm index a3a68f0c5ac..374b9255ac0 100644 --- a/code/modules/photography/camera.dm +++ b/code/modules/photography/camera.dm @@ -27,7 +27,7 @@ size = nsize to_chat(usr, "Camera will now take [size]x[size] photos.") -/obj/item/camera/attack_self(mob/user) +/obj/item/camera/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/photography/photo.dm b/code/modules/photography/photo.dm index a596969f947..b13d9ba43b5 100644 --- a/code/modules/photography/photo.dm +++ b/code/modules/photography/photo.dm @@ -85,7 +85,7 @@ scribble_spans = data["spans"] photograph_id = data["photo"] -/obj/item/photo/attack_self(mob/user) +/obj/item/photo/attack_self(mob/user, datum/event_args/actor/actor) user.examinate(src) return ..() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 8cc87df0ac6..6d865d55804 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -808,7 +808,7 @@ playsound(loc, selector_sound, 50, 1) return new_mode -/obj/item/gun/attack_self(mob/user) +/obj/item/gun/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 122b6cf6972..9fc3cd85399 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -279,7 +279,7 @@ set_weight_class(WEIGHT_CLASS_SMALL) update_icon() -/obj/item/gun/ballistic/attack_self(mob/user) +/obj/item/gun/ballistic/attack_self(mob/user, datum/event_args/actor/actor) if(firemodes.len > 1) switch_firemodes(user) else if(ammo_magazine) diff --git a/code/modules/projectiles/guns/ballistic/microbattery/microbattery.dm b/code/modules/projectiles/guns/ballistic/microbattery/microbattery.dm index a095b680d66..10bdd2c4d12 100644 --- a/code/modules/projectiles/guns/ballistic/microbattery/microbattery.dm +++ b/code/modules/projectiles/guns/ballistic/microbattery/microbattery.dm @@ -67,7 +67,7 @@ update_charge() update_icon() -/obj/item/gun/ballistic/microbattery/attack_self(mob/user) +/obj/item/gun/ballistic/microbattery/attack_self(mob/user, datum/event_args/actor/actor) if(!chambered) return diff --git a/code/modules/projectiles/guns/energy/sizegun_vr.dm b/code/modules/projectiles/guns/energy/sizegun_vr.dm index ca628cdc019..7f2a5c9f31b 100644 --- a/code/modules/projectiles/guns/energy/sizegun_vr.dm +++ b/code/modules/projectiles/guns/energy/sizegun_vr.dm @@ -27,7 +27,7 @@ . = ..() add_obj_verb(src, /obj/item/gun/energy/sizegun/proc/select_size) -/obj/item/gun/energy/sizegun/attack_self(mob/user) +/obj/item/gun/energy/sizegun/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index b117377439e..3f421554181 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -337,7 +337,7 @@ one_handed_penalty = 0 safety_state = GUN_SAFETY_OFF -/obj/item/gun/energy/service/attack_self(mob/user) +/obj/item/gun/energy/service/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm index 87f550386ac..7a8b820ca17 100644 --- a/code/modules/projectiles/guns/launcher/crossbow.dm +++ b/code/modules/projectiles/guns/launcher/crossbow.dm @@ -82,7 +82,7 @@ update_icon() ..() -/obj/item/gun/launcher/crossbow/attack_self(mob/user) +/obj/item/gun/launcher/crossbow/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/launcher/grenade_launcher.dm index 319caebd324..3a4f539a428 100644 --- a/code/modules/projectiles/guns/launcher/grenade_launcher.dm +++ b/code/modules/projectiles/guns/launcher/grenade_launcher.dm @@ -65,7 +65,7 @@ else to_chat(user, "[src] is empty.") -/obj/item/gun/launcher/grenade/attack_self(mob/user) +/obj/item/gun/launcher/grenade/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -104,7 +104,7 @@ damage_force = 5 max_grenades = 0 -/obj/item/gun/launcher/grenade/underslung/attack_self(mob/user) +/obj/item/gun/launcher/grenade/underslung/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index cd73e8f1bfb..df03dbe076b 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -77,7 +77,7 @@ else if(istype(W) && item_storage.obj_storage.can_be_inserted(W)) item_storage.obj_storage.try_insert(W, new /datum/event_args/actor(user)) -/obj/item/gun/launcher/pneumatic/attack_self(mob/user) +/obj/item/gun/launcher/pneumatic/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 53d2e8aee2d..aeff2f7e9be 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -27,7 +27,7 @@ name = "syringe dart" update_icon() -/obj/item/syringe_cartridge/attack_self(mob/user) +/obj/item/syringe_cartridge/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -95,7 +95,7 @@ darts -= next next = null -/obj/item/gun/launcher/syringe/attack_self(mob/user) +/obj/item/gun/launcher/syringe/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/legacy_vr_guns/bsharpoon.dm b/code/modules/projectiles/guns/legacy_vr_guns/bsharpoon.dm index b67fb868625..4f64d3fea00 100644 --- a/code/modules/projectiles/guns/legacy_vr_guns/bsharpoon.dm +++ b/code/modules/projectiles/guns/legacy_vr_guns/bsharpoon.dm @@ -72,7 +72,7 @@ var/turf/real_target = ToTurf AM.locationTransitForceMove(real_target, allow_pulled = FALSE, allow_grabbed = GRAB_AGGRESSIVE) -/obj/item/bluespace_harpoon/attack_self(mob/user) +/obj/item/bluespace_harpoon/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/legacy_vr_guns/gunsword.dm b/code/modules/projectiles/guns/legacy_vr_guns/gunsword.dm index 359c891654a..b83837bc0de 100644 --- a/code/modules/projectiles/guns/legacy_vr_guns/gunsword.dm +++ b/code/modules/projectiles/guns/legacy_vr_guns/gunsword.dm @@ -89,7 +89,7 @@ attack_verb = list() -/obj/item/cell/device/weapon/gunsword/attack_self(mob/user) +/obj/item/cell/device/weapon/gunsword/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index f8b7dcbd6c2..bff0116befe 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -249,7 +249,7 @@ update_icon() update_held_icon() -/obj/item/gun/ballistic/automatic/lmg/attack_self(mob/user) +/obj/item/gun/ballistic/automatic/lmg/attack_self(mob/user, datum/event_args/actor/actor) if(cover_open) toggle_cover(user) //close the cover else diff --git a/code/modules/projectiles/guns/projectile/bow.dm b/code/modules/projectiles/guns/projectile/bow.dm index b430fb5dcef..3ed9a8a028b 100644 --- a/code/modules/projectiles/guns/projectile/bow.dm +++ b/code/modules/projectiles/guns/projectile/bow.dm @@ -41,7 +41,7 @@ return update_icon() -/obj/item/gun/ballistic/bow/attack_self(mob/user) +/obj/item/gun/ballistic/bow/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/projectile/contender.dm b/code/modules/projectiles/guns/projectile/contender.dm index 0f3b1290d36..c18941c1f45 100644 --- a/code/modules/projectiles/guns/projectile/contender.dm +++ b/code/modules/projectiles/guns/projectile/contender.dm @@ -13,7 +13,7 @@ load_method = SINGLE_CASING heavy = TRUE -/obj/item/gun/ballistic/contender/attack_self(mob/user) +/obj/item/gun/ballistic/contender/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index e56464d9448..23c87c79e17 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -94,7 +94,7 @@ for(var/obj/item/reagent_containers/glass/beaker/B in mixing) B.reagents.trans_to_obj(dart, mix_amount) -/obj/item/gun/ballistic/dartgun/attack_self(mob/user) +/obj/item/gun/ballistic/dartgun/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index b0ea5a04044..b1ec8d209fc 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -454,7 +454,7 @@ else icon_state = "ntles-empty" -/obj/item/gun/ballistic/ntles/attack_self(mob/user, obj/item/gun/G) +/obj/item/gun/ballistic/ntles/attack_self(mob/user, datum/event_args/actor/actor) if(collapsible && !extended) to_chat(user, "You pull out the stock on the [src], steadying the weapon.") set_weight_class(WEIGHT_CLASS_BULKY) diff --git a/code/modules/projectiles/guns/projectile/rocket.dm b/code/modules/projectiles/guns/projectile/rocket.dm index 12dac8984e5..a80fb57c6f1 100644 --- a/code/modules/projectiles/guns/projectile/rocket.dm +++ b/code/modules/projectiles/guns/projectile/rocket.dm @@ -93,7 +93,7 @@ else return ..() -/obj/item/gun/ballistic/rocket/collapsible/attack_self(mob/user, obj/item/gun/G) +/obj/item/gun/ballistic/rocket/collapsible/attack_self(mob/user, datum/event_args/actor/actor) if(collapsed) to_chat(user, "You pull out the tube on the [src], readying the weapon to be fired.") icon_state = "[initial(icon_state)]-extended" diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index f2c8a944a3e..670a4eda27f 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -26,7 +26,7 @@ return chambered.get_projectile() return null -/obj/item/gun/ballistic/shotgun/pump/attack_self(mob/user) +/obj/item/gun/ballistic/shotgun/pump/attack_self(mob/user, datum/event_args/actor/actor) // todo: this breaks other attack self interactions :( if(world.time >= recentpump + 10) pump(user) diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 7b9fab132d7..8cbd5366161 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -30,7 +30,7 @@ else icon_state = "heavysniper" -/obj/item/gun/ballistic/heavysniper/attack_self(mob/user) +/obj/item/gun/ballistic/heavysniper/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm b/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm index 5cc4e475944..6159874deeb 100644 --- a/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm @@ -68,7 +68,7 @@ . = ..() trigger_group = src -/obj/item/sniper_rifle_part/attack_self(mob/user) +/obj/item/sniper_rifle_part/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/reagents/items/hypospray.dm b/code/modules/reagents/items/hypospray.dm index c3b990c67d2..66f3038ab18 100644 --- a/code/modules/reagents/items/hypospray.dm +++ b/code/modules/reagents/items/hypospray.dm @@ -118,7 +118,7 @@ inject_amount = amount usr.action_feedback(SPAN_NOTICE("[src] is now set to inject [amount] per use."), src) -/obj/item/hypospray/attack_self(mob/user) +/obj/item/hypospray/attack_self(mob/user, datum/event_args/actor/actor) switch(inject_mode) if(HYPOSPRAY_MODE_INJECT) inject_mode = HYPOSPRAY_MODE_SPRAY diff --git a/code/modules/reagents/machinery/dispenser/cartridge.dm b/code/modules/reagents/machinery/dispenser/cartridge.dm index deedfbffa40..676e634909a 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge.dm @@ -41,7 +41,7 @@ if(!is_open_container()) . += "The cap is sealed." -/obj/item/reagent_containers/cartridge/dispenser/attack_self(mob/user) +/obj/item/reagent_containers/cartridge/dispenser/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index f290dc6c805..8ff48d2f083 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -42,7 +42,7 @@ if(N) amount_per_transfer_from_this = N -/obj/item/reagent_containers/attack_self(mob/user) +/obj/item/reagent_containers/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/reagents/reagent_containers/blood_pack_vr.dm b/code/modules/reagents/reagent_containers/blood_pack_vr.dm index 28ed0374d71..7a7c947e218 100644 --- a/code/modules/reagents/reagent_containers/blood_pack_vr.dm +++ b/code/modules/reagents/reagent_containers/blood_pack_vr.dm @@ -1,4 +1,4 @@ -/obj/item/reagent_containers/blood/attack_self(mob/user) +/obj/item/reagent_containers/blood/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 97203248666..b3e37644983 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -94,7 +94,7 @@ add_attack_logs(user, L, "Borg injected with [reagent_ids[mode]]") to_chat(user, "[t] units injected. [reagent_volumes[reagent_ids[mode]]] units remaining.") -/obj/item/reagent_containers/borghypo/attack_self(mob/user) +/obj/item/reagent_containers/borghypo/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return //Change the mode diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 93760ce6184..9aa67ed0cd0 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -61,7 +61,7 @@ base_desc = desc -/obj/item/reagent_containers/glass/attack_self(mob/user) +/obj/item/reagent_containers/glass/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/reagents/reagent_containers/hard_candy.dm b/code/modules/reagents/reagent_containers/hard_candy.dm index bafbb1f5de7..3e1dec87770 100644 --- a/code/modules/reagents/reagent_containers/hard_candy.dm +++ b/code/modules/reagents/reagent_containers/hard_candy.dm @@ -34,7 +34,7 @@ user.put_in_hands(trash) qdel(src) -/obj/item/reagent_containers/hard_candy/attack_self(mob/user) +/obj/item/reagent_containers/hard_candy/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 79621a907c0..70066556c1f 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -398,7 +398,7 @@ icon_state = "[initial(icon_state)]_used" -/obj/item/reagent_containers/hypospray/glukoz/attack_self(mob/user) +/obj/item/reagent_containers/hypospray/glukoz/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/reagents/reagent_containers/organic.dm b/code/modules/reagents/reagent_containers/organic.dm index 5e6f9972889..c6e8ade3ade 100644 --- a/code/modules/reagents/reagent_containers/organic.dm +++ b/code/modules/reagents/reagent_containers/organic.dm @@ -56,7 +56,7 @@ update_icon() -/obj/item/reagent_containers/organic/attack_self(mob/user) +/obj/item/reagent_containers/organic/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 34a7123f39f..914e7182d4a 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -69,7 +69,7 @@ D.set_up(my_target, spray_size, 10) return -/obj/item/reagent_containers/spray/attack_self(mob/user) +/obj/item/reagent_containers/spray/attack_self(mob/user, datum/event_args/actor/actor) if(!possible_transfer_amounts) return amount_per_transfer_from_this = next_list_item(amount_per_transfer_from_this, possible_transfer_amounts) @@ -135,7 +135,7 @@ . = ..() . += "The safety is [safety ? "on" : "off"]." -/obj/item/reagent_containers/spray/pepper/attack_self(mob/user) +/obj/item/reagent_containers/spray/pepper/attack_self(mob/user, datum/event_args/actor/actor) safety = !safety to_chat(usr, "You switch the safety [safety ? "on" : "off"].") @@ -241,7 +241,7 @@ . = ..() . += "The tank is [pumped ? "depressurized" : "pressurized"]." -/obj/item/reagent_containers/spray/squirt/attack_self(mob/user) +/obj/item/reagent_containers/spray/squirt/attack_self(mob/user, datum/event_args/actor/actor) pumped = !pumped to_chat(usr, "You pump the handle [pumped ? "to depressurize" : "to pressurize"] the tank.") diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 7e3e8033072..890677a149b 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -37,7 +37,7 @@ . = ..() update_icon() -/obj/item/reagent_containers/syringe/attack_self(mob/user) +/obj/item/reagent_containers/syringe/attack_self(mob/user, datum/event_args/actor/actor) switch(mode) if(SYRINGE_DRAW) mode = SYRINGE_INJECT diff --git a/code/modules/reagents/reagent_containers/syringes_vr.dm b/code/modules/reagents/reagent_containers/syringes_vr.dm index fd14a704f23..afbfcda4e36 100644 --- a/code/modules/reagents/reagent_containers/syringes_vr.dm +++ b/code/modules/reagents/reagent_containers/syringes_vr.dm @@ -66,7 +66,7 @@ eo.queue_syringe_infection() //Allow for capped syringe mode -/obj/item/reagent_containers/syringe/attack_self(mob/user) +/obj/item/reagent_containers/syringe/attack_self(mob/user, datum/event_args/actor/actor) switch(mode) if(SYRINGE_CAPPED) mode = SYRINGE_DRAW diff --git a/code/modules/resleeving/computers.dm b/code/modules/resleeving/computers.dm index 3101f93ae25..c97d808082c 100644 --- a/code/modules/resleeving/computers.dm +++ b/code/modules/resleeving/computers.dm @@ -431,7 +431,7 @@ icon_state = "cmoemergency" item_state = "card-id" -/obj/item/cmo_disk_holder/attack_self(mob/user) +/obj/item/cmo_disk_holder/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/resleeving/implant.dm b/code/modules/resleeving/implant.dm index c67e7754ba3..a2f898ee781 100644 --- a/code/modules/resleeving/implant.dm +++ b/code/modules/resleeving/implant.dm @@ -62,7 +62,7 @@ icon_state = "[initial(icon_state)][imps.len]" germ_level = 0 -/obj/item/backup_implanter/attack_self(mob/user) +/obj/item/backup_implanter/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/resleeving/mirror.dm b/code/modules/resleeving/mirror.dm index c084fa6aa17..1ae42e1f719 100644 --- a/code/modules/resleeving/mirror.dm +++ b/code/modules/resleeving/mirror.dm @@ -175,7 +175,7 @@ to_chat(usr, "You must target the torso.") return CLICKCHAIN_DO_NOT_PROPAGATE -/obj/item/mirrortool/attack_self(mob/user) +/obj/item/mirrortool/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/resleeving/sleevecard.dm b/code/modules/resleeving/sleevecard.dm index 9661033f504..a69e1015275 100644 --- a/code/modules/resleeving/sleevecard.dm +++ b/code/modules/resleeving/sleevecard.dm @@ -41,7 +41,7 @@ QDEL_NULL(radio) return ..() -/obj/item/sleevecard/attack_self(mob/user) +/obj/item/sleevecard/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/shieldgen/handheld_defuser.dm b/code/modules/shieldgen/handheld_defuser.dm index ae075de6569..3235d95a9ed 100644 --- a/code/modules/shieldgen/handheld_defuser.dm +++ b/code/modules/shieldgen/handheld_defuser.dm @@ -44,7 +44,7 @@ else icon_state = "hdiffuser_off" -/obj/item/shield_diffuser/attack_self(mob/user) +/obj/item/shield_diffuser/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 23a6320587e..687609659d6 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -168,7 +168,7 @@ light_color = "#3728ff" var/active -/obj/item/spaceflare/attack_self(mob/user) +/obj/item/spaceflare/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/spells/artifacts.dm b/code/modules/spells/artifacts.dm index 6f636dcf872..4267467db1c 100644 --- a/code/modules/spells/artifacts.dm +++ b/code/modules/spells/artifacts.dm @@ -12,7 +12,7 @@ damage_force = 10 attack_sound = 'sound/items/welder2.ogg' -/obj/item/scrying/attack_self(mob/user) +/obj/item/scrying/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -48,7 +48,7 @@ var/rend_desc = "You should run now." var/spawn_fast = 0 //if 1, ignores checking for mobs on loc before spawning -/obj/item/veilrender/attack_self(mob/user) +/obj/item/veilrender/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -282,7 +282,7 @@ user.reset_perspective(null) user.unset_machine() -/obj/item/voodoo/attack_self(mob/user) +/obj/item/voodoo/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -385,7 +385,7 @@ REMOVE_TRAIT(user, TRAIT_MOBILITY_NOPICKUP, src) user.update_mobility_blocked() -/obj/item/warpwhistle/attack_self(mob/user) +/obj/item/warpwhistle/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/spells/spellbook.dm b/code/modules/spells/spellbook.dm index 565b310647a..490807b4d17 100644 --- a/code/modules/spells/spellbook.dm +++ b/code/modules/spells/spellbook.dm @@ -11,7 +11,7 @@ var/max_uses = 5 var/op = 1 -/obj/item/spellbook/attack_self(mob/user) +/obj/item/spellbook/attack_self(mob/user, datum/event_args/actor/actor) if(!user) return if((user.mind && !wizards.is_antagonist(user.mind))) @@ -252,7 +252,7 @@ . = ..() name += spellname -/obj/item/spellbook/oneuse/attack_self(mob/user) +/obj/item/spellbook/oneuse/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/telesci/bscyrstal.dm b/code/modules/telesci/bscyrstal.dm index 7dd5c187a76..4618260ad9b 100644 --- a/code/modules/telesci/bscyrstal.dm +++ b/code/modules/telesci/bscyrstal.dm @@ -14,7 +14,7 @@ pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) -/obj/item/bluespace_crystal/attack_self(mob/user) +/obj/item/bluespace_crystal/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/vehicles/ridden/wheelchair.dm b/code/modules/vehicles/ridden/wheelchair.dm index 30f577ba813..35dbbfb09d7 100644 --- a/code/modules/vehicles/ridden/wheelchair.dm +++ b/code/modules/vehicles/ridden/wheelchair.dm @@ -52,7 +52,7 @@ /// What we unfold to var/unfolded_type = /obj/vehicle/ridden/wheelchair -/obj/item/wheelchair/attack_self(mob/user) +/obj/item/wheelchair/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/vore/eating/leave_remains_vr.dm b/code/modules/vore/eating/leave_remains_vr.dm index 03fa7c14500..1ca2a1cc743 100644 --- a/code/modules/vore/eating/leave_remains_vr.dm +++ b/code/modules/vore/eating/leave_remains_vr.dm @@ -90,7 +90,7 @@ pred_ckey = pred.ckey pred_name = pred.name -/obj/item/digestion_remains/attack_self(mob/user) +/obj/item/digestion_remains/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/vore/fluffstuff/custom_items.dm b/code/modules/vore/fluffstuff/custom_items.dm index 692171b3e86..00f1836ba67 100644 --- a/code/modules/vore/fluffstuff/custom_items.dm +++ b/code/modules/vore/fluffstuff/custom_items.dm @@ -86,7 +86,7 @@ icon_override = 'icons/vore/custom_items_vr.dmi' item_state = "Flag_Nanotrasen_mob" -/obj/item/flag/attack_self(mob/user) +/obj/item/flag/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -207,7 +207,7 @@ assignment = "CC Medical" var/configured = 0 -/obj/item/card/id/centcom/station/fluff/aronai/attack_self(mob/user) +/obj/item/card/id/centcom/station/fluff/aronai/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -321,7 +321,7 @@ var/last_use = 0 var/cooldown = 30 -/obj/item/cane/wand/attack_self(mob/user) +/obj/item/cane/wand/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -445,7 +445,7 @@ icon_state = "dragor_dot" w_class = WEIGHT_CLASS_SMALL -/obj/item/fluff/dragor_dot/attack_self(mob/user) +/obj/item/fluff/dragor_dot/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -476,7 +476,7 @@ desc = "A primarily blue ID with a holographic 'WAH' etched onto its back. The letters do not obscure anything important on the card. It is shiny and it feels very bumpy." var/title_strings = list("Amaya Rahl's Wah-identification card", "Amaya Rahl's Wah-ID card") -/obj/item/card/id/fluff/amaya/attack_self(mob/user) +/obj/item/card/id/fluff/amaya/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -606,7 +606,7 @@ else return ..() -/obj/item/perfect_tele/attack_self(mob/user) +/obj/item/perfect_tele/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -871,7 +871,7 @@ ..() -/obj/item/perfect_tele_beacon/attack_self(mob/user) +/obj/item/perfect_tele_beacon/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -965,7 +965,7 @@ user.do_attack_animation(target) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam -/obj/item/clothing/accessory/badge/holo/detective/ruda/attack_self(mob/user) +/obj/item/clothing/accessory/badge/holo/detective/ruda/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -1187,7 +1187,7 @@ spawn(0) update_held_icon() -/obj/item/melee/baton/fluff/stunstaff/attack_self(mob/user) +/obj/item/melee/baton/fluff/stunstaff/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -1253,7 +1253,7 @@ throw_force = initial(throw_force) set_weight_class(initial(w_class)) -/obj/item/melee/fluffstuff/attack_self(mob/user) +/obj/item/melee/fluffstuff/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/vore/fluffstuff/custom_items_cit.dm b/code/modules/vore/fluffstuff/custom_items_cit.dm index 698a982b9a2..111f2cec05a 100644 --- a/code/modules/vore/fluffstuff/custom_items_cit.dm +++ b/code/modules/vore/fluffstuff/custom_items_cit.dm @@ -27,7 +27,7 @@ if((state > 1) || !owner) STOP_PROCESSING(SSobj, src) -/obj/item/clothing/accessory/collar/lifecrystal/attack_self(mob/user) +/obj/item/clothing/accessory/collar/lifecrystal/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/vore/fluffstuff/life_crystals.dm b/code/modules/vore/fluffstuff/life_crystals.dm index 3e2c78e853e..b2a1f9810b7 100644 --- a/code/modules/vore/fluffstuff/life_crystals.dm +++ b/code/modules/vore/fluffstuff/life_crystals.dm @@ -33,7 +33,7 @@ if(!owner) STOP_PROCESSING(SSobj, src) -/obj/item/clothing/accessory/collar/vmcrystal/attack_self(mob/user) +/obj/item/clothing/accessory/collar/vmcrystal/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm index 04ca9e64f33..31f0f182d76 100644 --- a/code/modules/vore/resizing/holder_micro_vr.dm +++ b/code/modules/vore/resizing/holder_micro_vr.dm @@ -22,7 +22,7 @@ for(var/mob/living/carbon/human/O in contents) O.request_strip_menu(usr) -/obj/item/holder/micro/attack_self(mob/user) +/obj/item/holder/micro/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm index 39f201dd381..3443b48d9f0 100644 --- a/code/modules/xenoarcheaology/sampling.dm +++ b/code/modules/xenoarcheaology/sampling.dm @@ -82,7 +82,7 @@ else to_chat(user, "You are unable to take a sample of [item_to_sample].") -/obj/item/core_sampler/attack_self(mob/user) +/obj/item/core_sampler/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/xenoarcheaology/tools/ano_device_battery.dm b/code/modules/xenoarcheaology/tools/ano_device_battery.dm index 1458663748a..23b89e5b27c 100644 --- a/code/modules/xenoarcheaology/tools/ano_device_battery.dm +++ b/code/modules/xenoarcheaology/tools/ano_device_battery.dm @@ -48,7 +48,7 @@ else return ..() -/obj/item/anodevice/attack_self(mob/user) +/obj/item/anodevice/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index d8743d7905a..d1fe9347484 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -44,7 +44,7 @@ var/last_scan_time = 0 var/scan_delay = 25 -/obj/item/ano_scanner/attack_self(mob/user) +/obj/item/ano_scanner/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -156,7 +156,7 @@ to_chat(user, "[icon2html(thing = src, target = world)] [src] pings [pick("madly","wildly","excitedly","crazily")]!") -/obj/item/depth_scanner/attack_self(mob/user) +/obj/item/depth_scanner/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -283,7 +283,7 @@ else icon_state = "pinoff" -/obj/item/beacon_locator/attack_self(mob/user) +/obj/item/beacon_locator/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -347,7 +347,7 @@ anomaly_scanner = new/obj/item/ano_scanner/integrated(src) depth_scanner = new/obj/item/depth_scanner(src) -/obj/item/xenoarch_multi_tool/attack_self(mob/user) +/obj/item/xenoarch_multi_tool/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm index 54bebf67dff..063f1ccdcc7 100644 --- a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm +++ b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm @@ -152,7 +152,7 @@ attack_verb = list("drilled") worth_intrinsic = 250 // this is gonna be very useful/powerful later -/obj/item/pickaxe/excavationdrill/attack_self(mob/user) +/obj/item/pickaxe/excavationdrill/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm index 2404b4cfdeb..d1bc245b9de 100644 --- a/code/modules/xenobio/items/slime_objects.dm +++ b/code/modules/xenobio/items/slime_objects.dm @@ -7,7 +7,7 @@ description_info = "Use in your hand to attempt to create a Promethean. It functions similarly to a positronic brain, in that a ghost is needed to become the Promethean." var/searching = 0 -/obj/item/slime_cube/attack_self(mob/user) +/obj/item/slime_cube/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -93,7 +93,7 @@ qdel(src) return . | CLICKCHAIN_DO_NOT_PROPAGATE -/obj/item/slime_crystal/attack_self(mob/user) +/obj/item/slime_crystal/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return @@ -160,7 +160,7 @@ /obj/item/flashlight/slime/update_appearance(updates = ~UPDATE_ICON_STATE) return ..() -/obj/item/flashlight/slime/attack_self(mob/user) +/obj/item/flashlight/slime/attack_self(mob/user, datum/event_args/actor/actor) return //Bio-luminescence does not toggle. diff --git a/code/modules/xenobio2/machinery/gene_manipulators.dm b/code/modules/xenobio2/machinery/gene_manipulators.dm index 548fdfae7b8..44364e86abd 100644 --- a/code/modules/xenobio2/machinery/gene_manipulators.dm +++ b/code/modules/xenobio2/machinery/gene_manipulators.dm @@ -20,7 +20,7 @@ var/list/genes = list() var/genesource = "unknown" -/obj/item/disk/xenobio/attack_self(mob/user) +/obj/item/disk/xenobio/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return diff --git a/code/modules/xenobio2/mob/slime/slime_monkey.dm b/code/modules/xenobio2/mob/slime/slime_monkey.dm index ddf6313df39..056c7dfc423 100644 --- a/code/modules/xenobio2/mob/slime/slime_monkey.dm +++ b/code/modules/xenobio2/mob/slime/slime_monkey.dm @@ -8,7 +8,7 @@ Slime cube lives here. icon_state = "slime cube" var/searching = 0 -/obj/item/slime_cube/attack_self(mob/user) +/obj/item/slime_cube/attack_self(mob/user, datum/event_args/actor/actor) . = ..() if(.) return