[MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)

* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-17 14:18:21 +00:00
committed by GitHub
co-authored by LemonInTheDark Gandalf2k15
parent 6f01502b33
commit 43febe3145
254 changed files with 837 additions and 837 deletions
@@ -131,16 +131,16 @@
master.disrupt()
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/effect/dummy/chameleon/attack_hand()
/obj/effect/dummy/chameleon/attack_hand(mob/user, list/modifiers)
master.disrupt()
/obj/effect/dummy/chameleon/attack_animal()
/obj/effect/dummy/chameleon/attack_animal(mob/user, list/modifiers)
master.disrupt()
/obj/effect/dummy/chameleon/attack_slime()
master.disrupt()
/obj/effect/dummy/chameleon/attack_alien()
/obj/effect/dummy/chameleon/attack_alien(mob/user, list/modifiers)
master.disrupt()
/obj/effect/dummy/chameleon/ex_act(S, T)
@@ -12,7 +12,7 @@
/obj/item/stack/circuit_stack/attack_self(mob/user)// Prevents the crafting menu, and tells you how to use it.
to_chat(user, "<span class='warning'>You can't use [src] by itself, you'll have to try and remove one of these circuits by hand... carefully.</span>")
/obj/item/stack/circuit_stack/attack_hand(mob/user)
/obj/item/stack/circuit_stack/attack_hand(mob/user, list/modifiers)
var/mob/living/carbon/human/H = user
if(user.get_inactive_held_item() != src)
return ..()
@@ -117,7 +117,7 @@
beaker = new_beaker
return TRUE
/obj/item/storage/portable_chem_mixer/attack_hand(mob/user)
/obj/item/storage/portable_chem_mixer/attack_hand(mob/user, list/modifiers)
if (loc != user)
return ..()
else
+2 -2
View File
@@ -90,13 +90,13 @@
else
return ..()
/obj/item/powersink/attack_paw()
/obj/item/powersink/attack_paw(mob/user, list/modifiers)
return
/obj/item/powersink/attack_ai()
return
/obj/item/powersink/attack_hand(mob/user)
/obj/item/powersink/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
@@ -29,7 +29,7 @@
return (FIRELOSS)
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/electropack/attack_hand(mob/user)
/obj/item/electropack/attack_hand(mob/user, list/modifiers)
if(iscarbon(user))
var/mob/living/carbon/C = user
if(src == C.back)
@@ -68,7 +68,7 @@
/obj/item/radio/intercom/attack_ai(mob/user)
interact(user)
/obj/item/radio/intercom/attack_hand(mob/user)
/obj/item/radio/intercom/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
@@ -45,7 +45,7 @@
to_chat(loc, "<span class='userdanger'>*ding*</span>")
addtimer(CALLBACK(src, .proc/snap), 2)
/obj/item/reverse_bear_trap/attack_hand(mob/user)
/obj/item/reverse_bear_trap/attack_hand(mob/user, list/modifiers)
if(iscarbon(user))
var/mob/living/carbon/C = user
if(C.get_item_by_slot(ITEM_SLOT_HEAD) == src)
@@ -105,7 +105,7 @@
..()
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/taperecorder/attack_hand(mob/user)
/obj/item/taperecorder/attack_hand(mob/user, list/modifiers)
if(loc != user || !mytape || !user.is_holding(src))
return ..()
eject(user)
@@ -76,7 +76,7 @@
attached_device.Crossed(AM)
//Triggers mousetraps
/obj/item/transfer_valve/attack_hand()
/obj/item/transfer_valve/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return