Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammunition/special/syringe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
var/obj/item/reagent_containers/syringe/S = SG.syringes[1]

S.reagents.trans_to(BB, S.reagents.total_volume, transfered_by = user)
D.add_dart(S)
D.add_dart(S, S.proj_piercing)
SG.syringes.Remove(S)
..()

Expand Down
22 changes: 9 additions & 13 deletions code/modules/projectiles/projectile/bullets/dart_syringe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@
/obj/item/projectile/bullet/reusable/dart/on_hit(atom/target, blocked = FALSE)
if(iscarbon(target))
var/mob/living/carbon/C = target
if(blocked != 100) // not completely blocked
if(C.embed_object(container, def_zone, FALSE))
dropped = TRUE
..()
return BULLET_ACT_HIT
else
blocked = 100
target.visible_message(span_danger("\The [container] was deflected!"), \
span_userdanger("You were protected against \the [container]!"))
if(C.can_inject(null, FALSE, def_zone, piercing) && C.embed_object(container, def_zone, FALSE))
dropped = TRUE
..()
return BULLET_ACT_HIT
else
target.visible_message(span_danger("\The [container] was deflected!"), \
span_userdanger("You were protected against \the [container]!"))

..(target, blocked)
return BULLET_ACT_HIT
Expand All @@ -29,13 +27,11 @@
container.forceMove(get_turf(src))
dropped = TRUE

/obj/item/projectile/bullet/reusable/dart/proc/add_dart(obj/item/reagent_containers/new_dart)
/obj/item/projectile/bullet/reusable/dart/proc/add_dart(obj/item/reagent_containers/new_dart, syrpierce)
piercing = syrpierce
container = new_dart
new_dart.forceMove(src)
name = new_dart.name
if(istype(new_dart, /obj/item/reagent_containers/syringe))
var/obj/item/reagent_containers/syringe/syringe
piercing = syringe.proj_piercing

/obj/item/projectile/bullet/reusable/dart/syringe
name = "syringe"
Expand Down