mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
You can now interact with held mobs beside wearing them (feat: "minor" melee attack chain cleanup) (#90080)
People can now pet held mothroaches and pugs if they want to, or use items on them, hopefully without causing many issues. After all, it only took about a couple dozen lines of code to make... ...Oh, did the 527 files changed or the 850~ lines added/removed perhaps catch your eye? Made you wonder if I accidentally pushed the wrong branch? or skewed something up big time? Well, nuh uh. I just happen to be fed up with the melee attack chain still using stringized params instead of an array/list. It was frankly revolting to see how I'd have had to otherwise call `list2params` for what I'm trying to accomplish here, and make this PR another tessera to the immense stupidity of our attack chain procs calling `params2list` over and over and over instead of just using that one call instance from `ClickOn` as an argument. It's 2025, honey, wake up! I also tried to replace some of those single letter vars/args but there are just way too many of them. Improving old code. And I want to be able to pet mobroaches while holding them too. 🆑 qol: You can now interact with held mobs in more ways beside wearing them. /🆑
This commit is contained in:
@@ -109,7 +109,7 @@
|
||||
///How much progression should be shown in the uplink, set on purchase of the item.
|
||||
var/current_progression = 0
|
||||
|
||||
/obj/item/computer_disk/virus/frame/attackby(obj/item/attacking_item, mob/user, params)
|
||||
/obj/item/computer_disk/virus/frame/attackby(obj/item/attacking_item, mob/user, list/modifiers)
|
||||
. = ..()
|
||||
if(!istype(attacking_item, /obj/item/stack/telecrystal))
|
||||
return
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
|
||||
return ..()
|
||||
|
||||
/obj/item/modular_computer/pda/pre_attack(atom/target, mob/living/user, params)
|
||||
/obj/item/modular_computer/pda/pre_attack(atom/target, mob/living/user, list/modifiers)
|
||||
if(!inserted_disk || !ismachinery(target))
|
||||
return ..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user