cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored the attack proc (#19908)

Browse Source 
Refactored the attack proc signature.
Added signals and components for the attack proc.
Added signals and components for the attackby proc.
Adjusted some leftover attackby procs signatures.
Added grep test to ensure people don't keep adding attack/attackby procs
with the wrong signature.
This commit is contained in:
Fluffy
2024-10-06 21:30:00 +00:00
committed by GitHub
parent b79b7c5177
commit 9636363e60
121 changed files with 878 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+33 -33
View File
@@ -27,8 +27,8 @@ All custom items with worn sprites must follow the contained sprite system: http
return
/obj/item/implanter/fluff/attack(mob/M as mob, mob/user as mob, var/target_zone)
if (!M.ckey || M.ckey != allowed_ckey)
/obj/item/implanter/fluff/attack(mob/living/target_mob, mob/living/user, target_zone)
if (!target_mob.ckey || target_mob.ckey != allowed_ckey)
return
..()
@@ -415,11 +415,11 @@ All custom items with worn sprites must follow the contained sprite system: http
has_spear = FALSE
update_icon()
/obj/item/fluff/tokash_spear/attackby(var/obj/item/W, var/mob/user)
if(!has_spear && istype(W, /obj/item/fluff/tokash_spearhead))
to_chat(user, SPAN_NOTICE("You place \the [W] on the [src]."))
user.drop_from_inventory(W,src)
qdel(W)
/obj/item/fluff/tokash_spear/attackby(obj/item/attacking_item, mob/user, params)
if(!has_spear && istype(attacking_item, /obj/item/fluff/tokash_spearhead))
to_chat(user, SPAN_NOTICE("You place \the [attacking_item] on the [src]."))
user.drop_from_inventory(attacking_item,src)
qdel(attacking_item)
has_spear = TRUE
update_icon()
else
@@ -821,13 +821,13 @@ All custom items with worn sprites must follow the contained sprite system: http
var/obj/item/device/megaphone/fluff/akinyi_mic/mic
var/collapsed = TRUE
/obj/item/fluff/akinyi_stand/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/device/megaphone/fluff/akinyi_mic))
/obj/item/fluff/akinyi_stand/attackby(obj/item/attacking_item, mob/user, params)
if(istype(attacking_item, /obj/item/device/megaphone/fluff/akinyi_mic))
if(!mic && !collapsed)
user.unEquip(O)
O.forceMove(src)
mic = O
to_chat(user, SPAN_NOTICE("You place \the [O] on \the [src]."))
user.unEquip(attacking_item)
attacking_item.forceMove(src)
mic = attacking_item
to_chat(user, SPAN_NOTICE("You place \the [attacking_item] on \the [src]."))
update_icon()
/obj/item/fluff/akinyi_stand/MouseDrop(mob/user as mob)
@@ -994,15 +994,15 @@ All custom items with worn sprites must follow the contained sprite system: http
return
return ..()
/obj/item/fluff/holoconsole/attackby(obj/item/I, mob/user)
switch(I.type)
/obj/item/fluff/holoconsole/attackby(obj/item/attacking_item, mob/user, params)
switch(attacking_item.type)
if(/obj/item/fluff/holoconsole_controller)
if(left_controller)
to_chat(user, SPAN_WARNING("\The [src] already has its left controller connected!"))
return
user.visible_message("<b>[user]</b> slots \the [I] back into to \the [src].", SPAN_NOTICE("You slot \the [I] back into \the [src]."))
user.drop_from_inventory(I, src)
left_controller = I
user.visible_message("<b>[user]</b> slots \the [attacking_item] back into to \the [src].", SPAN_NOTICE("You slot \the [attacking_item] back into \the [src]."))
user.drop_from_inventory(attacking_item, src)
left_controller = attacking_item
left_controller.parent_console = null
verbs += /obj/item/fluff/holoconsole/proc/remove_left
update_icon()
@@ -1011,9 +1011,9 @@ All custom items with worn sprites must follow the contained sprite system: http
if(right_controller)
to_chat(user, SPAN_WARNING("\The [src] already has its right controller connected!"))
return
user.visible_message("<b>[user]</b> slots \the [I] back into to \the [src].", SPAN_NOTICE("You slot \the [I] back into \the [src]."))
user.drop_from_inventory(I, src)
right_controller = I
user.visible_message("<b>[user]</b> slots \the [attacking_item] back into to \the [src].", SPAN_NOTICE("You slot \the [attacking_item] back into \the [src]."))
user.drop_from_inventory(attacking_item, src)
right_controller = attacking_item
right_controller.parent_console = null
verbs += /obj/item/fluff/holoconsole/proc/remove_right
update_icon()
@@ -1123,13 +1123,13 @@ All custom items with worn sprites must follow the contained sprite system: http
return
return ..()
/obj/item/fluff/holocase/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/fluff/holoconsole))
/obj/item/fluff/holocase/attackby(obj/item/attacking_item, mob/user, params)
if(istype(attacking_item, /obj/item/fluff/holoconsole))
if(contained_console)
to_chat(user, SPAN_WARNING("\The [src] already contains a holoconsole!"))
return
user.drop_from_inventory(I, src)
contained_console = I
user.drop_from_inventory(attacking_item, src)
contained_console = attacking_item
user.visible_message("<b>[usr]</b> puts \the [contained_console] into \the [src], zipping it back up.", SPAN_NOTICE("You put \the [contained_console] into \the [src], zipping it back up."))
update_icon()
return
@@ -1547,25 +1547,25 @@ All custom items with worn sprites must follow the contained sprite system: http
icon_state = initial(icon_state)
STOP_PROCESSING(SSprocessing, src)
/obj/item/fluff/nasira_burner/attackby(obj/item/W as obj, mob/user as mob)
/obj/item/fluff/nasira_burner/attackby(obj/item/attacking_item, mob/user, params)
..()
if(W.isFlameSource())
if(attacking_item.isFlameSource())
var/text = matchmsg
if(istype(W, /obj/item/flame/match))
if(istype(attacking_item, /obj/item/flame/match))
text = matchmsg
else if(istype(W, /obj/item/flame/lighter/zippo))
else if(istype(attacking_item, /obj/item/flame/lighter/zippo))
text = zippomsg
else if(istype(W, /obj/item/flame/lighter))
else if(istype(attacking_item, /obj/item/flame/lighter))
text = lightermsg
else if(W.iswelder())
else if(attacking_item.iswelder())
text = weldermsg
else if(istype(W, /obj/item/device/assembly/igniter))
else if(istype(attacking_item, /obj/item/device/assembly/igniter))
text = ignitermsg
else
text = genericmsg
text = replacetext(text, "USER", "\the [user]")
text = replacetext(text, "NAME", "\the [name]")
text = replacetext(text, "FLAME", "\the [W.name]")
text = replacetext(text, "FLAME", "\the [attacking_item.name]")
light(text)
/obj/item/fluff/nasira_burner/process()