mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-17 21:24:01 +00:00
b6c84135c3
## About The Pull Request This refactors embedding elements to make them use singleton datums (similarly to armor) instead being bespoke and creating a new element every time armor values are supposed to be adjusted. Default values have been removed from defines due to now being declared in base class itself. Additionally fixes vending machines and tackling gloves setting generated shards (which they instantly embed into their victim) embed properties to null after running the embedding code, despite said shards having non-null embedding values by default, making them not be able to embed into anyone else, also potentially breaking the pain/jostling code if they somehow get updated. ## Why It's Good For The Game Current embedding system is an unnecessarily complicated mess as bespoke elements are hard to work with, and creating a new element every time you change values is hacky at best. This change should make it easier to read and work with. ## Changelog 🆑 fix: Fixed glass shards generated from falling vending machines or tackling windows not being able to embed into anyone. refactor: Refactored embedding code to use datums instead of bespoke elements and ugly associated lists. /🆑
51 lines
1.7 KiB
Plaintext
51 lines
1.7 KiB
Plaintext
/obj/projectile/bullet/dart
|
|
name = "dart"
|
|
icon_state = "cbbolt"
|
|
damage = 6
|
|
embed_type = null
|
|
shrapnel_type = null
|
|
var/inject_flags = null
|
|
|
|
/obj/projectile/bullet/dart/Initialize(mapload)
|
|
. = ..()
|
|
create_reagents(50, NO_REACT)
|
|
|
|
/obj/projectile/bullet/dart/on_hit(atom/target, blocked = 0, pierce_hit)
|
|
if(iscarbon(target))
|
|
var/mob/living/carbon/M = target
|
|
if(blocked != 100) // not completely blocked
|
|
if(M.can_inject(target_zone = def_zone, injection_flags = inject_flags)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
|
|
..()
|
|
reagents.trans_to(M, reagents.total_volume, methods = INJECT)
|
|
return BULLET_ACT_HIT
|
|
else
|
|
blocked = 100
|
|
target.visible_message(span_danger("\The [src] is deflected!"), \
|
|
span_userdanger("You are protected against \the [src]!"))
|
|
|
|
..(target, blocked)
|
|
reagents.flags &= ~(NO_REACT)
|
|
reagents.handle_reactions()
|
|
return BULLET_ACT_HIT
|
|
|
|
/obj/projectile/bullet/dart/metalfoam/Initialize(mapload)
|
|
. = ..()
|
|
reagents.add_reagent(/datum/reagent/aluminium, 15)
|
|
reagents.add_reagent(/datum/reagent/foaming_agent, 5)
|
|
reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 5)
|
|
|
|
/obj/projectile/bullet/dart/syringe
|
|
name = "syringe"
|
|
icon_state = "syringeproj"
|
|
|
|
/obj/projectile/bullet/dart/syringe/Initialize(mapload)
|
|
. = ..()
|
|
|
|
// This prevents the Ody from being used as a combat mech spamming RDX/Teslium syringes all over the place.
|
|
// Other syringe guns are loaded manually with pre-filled syringes which will react chems themselves.
|
|
// The traitor chem dartgun uses /obj/projectile/bullet/dart/piercing, so this does not impact it.
|
|
reagents.flags &= ~NO_REACT
|
|
|
|
/obj/projectile/bullet/dart/piercing
|
|
inject_flags = INJECT_CHECK_PENETRATE_THICK
|