mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-02-05 05:49:28 +00:00
339616ae78
## About The Pull Request 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. ## Why It's Good For The Game Improving old code. And I want to be able to pet mobroaches while holding them too. ## Changelog 🆑 qol: You can now interact with held mobs in more ways beside wearing them. /🆑
59 lines
2.6 KiB
Plaintext
59 lines
2.6 KiB
Plaintext
/**
|
|
* ### envenomable caseless element!
|
|
*
|
|
* Non bespoke element (1 in existence) that lets caseless bullets be dippable.
|
|
* When you fire the bullet, it will gain venomous. The casing itself isn't venomous to prevent bullshit
|
|
*/
|
|
/datum/element/envenomable_casing
|
|
element_flags = ELEMENT_BESPOKE
|
|
argument_hash_start_idx = 2
|
|
/// how much reagent can you dip the caseless in?
|
|
var/amount_allowed
|
|
|
|
/datum/element/envenomable_casing/Attach(datum/target, amount_allowed = 5)
|
|
. = ..()
|
|
if(!isammocasing(target))
|
|
return ELEMENT_INCOMPATIBLE
|
|
src.amount_allowed = amount_allowed
|
|
RegisterSignal(target, COMSIG_ITEM_INTERACTING_WITH_ATOM, PROC_REF(handle_interaction))
|
|
RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine_before_dip))
|
|
|
|
/datum/element/envenomable_casing/Detach(datum/target)
|
|
. = ..()
|
|
UnregisterSignal(target, list(COMSIG_ITEM_INTERACTING_WITH_ATOM, COMSIG_ATOM_EXAMINE))
|
|
|
|
///signal called on the parent attacking an item
|
|
/datum/element/envenomable_casing/proc/handle_interaction(obj/item/ammo_casing/casing, mob/user, atom/target, list/modifiers)
|
|
SIGNAL_HANDLER
|
|
if(!is_reagent_container(target))
|
|
return NONE
|
|
var/obj/item/reagent_containers/venom_container = target
|
|
if(!casing.loaded_projectile)
|
|
user.balloon_alert(user, "casing is already spent!")
|
|
return ITEM_INTERACT_BLOCKING
|
|
if(!(venom_container.reagent_flags & OPENCONTAINER))
|
|
user.balloon_alert(user, "open the container!")
|
|
return ITEM_INTERACT_BLOCKING
|
|
var/datum/reagent/venom_applied = venom_container.reagents.get_master_reagent()
|
|
if(!venom_applied)
|
|
return ITEM_INTERACT_BLOCKING
|
|
var/amount_applied = min(venom_applied.volume, amount_allowed)
|
|
|
|
casing.loaded_projectile.AddElement(/datum/element/venomous, venom_applied.type, amount_applied)
|
|
to_chat(user, span_notice("You coat [casing] in [venom_applied]."))
|
|
venom_container.reagents.remove_reagent(venom_applied.type, amount_applied)
|
|
///stops further poison application
|
|
UnregisterSignal(casing, COMSIG_ITEM_INTERACTING_WITH_ATOM)
|
|
RegisterSignal(casing, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine_after_dip), override = TRUE)
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
///signal called on parent being examined while not coated
|
|
/datum/element/envenomable_casing/proc/on_examine_before_dip(obj/item/ammo_casing/casing, mob/user, list/examine_list)
|
|
SIGNAL_HANDLER
|
|
examine_list += span_notice("You can dip it in a chemical to deliver a poisonous kick.")
|
|
|
|
///ditto, but after it's been coated
|
|
/datum/element/envenomable_casing/proc/on_examine_after_dip(obj/item/ammo_casing/casing, mob/user, list/examine_list)
|
|
SIGNAL_HANDLER
|
|
examine_list += span_warning("It's coated in some kind of chemical...")
|