cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the envenomable casing element and arrows. (#76219)

Browse Source 
## About The Pull Request
Both the element and the object were trying to add an element as a
component, which to my amusement, just silently fails without throwing
any runtime, crash or stack trace (stuff for another PR, I suppose).

## Why It's Good For The Game
This will fix #75448.

## Changelog

🆑
fix: arrows can now be actually coated with reagents.
/🆑
This commit is contained in:
Ghom
2023-06-24 11:52:59 +02:00
committed by GitHub
parent f7e6f6bdb5
commit 1436b3f63a
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/envenomable_casing.dm
+12 -10
View File
@@ -16,7 +16,7 @@
return ELEMENT_INCOMPATIBLE
src.amount_allowed = amount_allowed
RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_afterattack))
RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine_before_dip))
/datum/element/envenomable_casing/Detach(datum/target)
. = ..()
@@ -39,19 +39,21 @@
return
var/amount_applied = min(venom_applied.volume, amount_allowed)
casing.loaded_projectile.AddComponent(/datum/element/venomous, venom_applied.type, amount_applied)
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_AFTERATTACK)
RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine_after_dip), override = TRUE)
///signal called on parent being examined
/datum/element/envenomable_casing/proc/on_examine(obj/item/ammo_casing/casing, mob/user, list/examine_list)
///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...")
if(!casing.loaded_projectile)
return
if(casing.loaded_projectile.GetComponent(/datum/element/venomous))
examine_list += span_warning("It's coated in some kind of chemical...")
else
examine_list += span_notice("You can dip it in a chemical to deliver a poisonous kick.")
code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
+1 -1
View File
@@ -14,7 +14,7 @@
/obj/item/ammo_casing/caseless/arrow/Initialize(mapload)
. = ..()
AddComponent(/datum/element/envenomable_casing)
AddElement(/datum/element/envenomable_casing)
///base arrow projectile
/obj/projectile/bullet/reusable/arrow