Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Syringe guns now embed syringes - #14192

Merged
JamieD1 merged 8 commits into
yogstation13:masterfrom
nmajask:dart-gun-rework
Jun 11, 2022
Merged

Syringe guns now embed syringes#14192
JamieD1 merged 8 commits into
yogstation13:masterfrom
nmajask:dart-gun-rework

Conversation

@nmajask

@nmajask nmajask commented May 20, 2022

Copy link
Copy Markdown
Contributor

Document the changes in your pull request

Requires #14183

Reworks syringe guns to embed the syringe and slowly transfer reagents at a rate of 0.2 * the normal transfer amount and also drop the syringe if it misses. Syringes now also should embed normally and have the same effect. I will need to fix other carbons not being effected.

Wiki Documentation

If the syringe gun is mentioned, maybe include this.

Changelog

🆑
tweak: Syringes can now embed, causing them to slowly transfer reagents.
tweak: Syringe guns now embed syringes, and drop the syringe when missed.
/:cl:

nmajask added 2 commits May 19, 2022 20:14
commit 8ec2fca
Author: nmajask <nmajask@gmail.com>
Date:   Thu May 19 15:26:09 2022 -0400

    Converts embedding into a proc

    also adds a embed tic proc that is called whenever the embedde has a life tick
Syringe gun now embeds syringes and slowly transfers the reagents
@Yogbot-13 Yogbot-13 added the Tweak This PR contains changes to the game. label May 20, 2022
@bruhlookatthisdood

Copy link
Copy Markdown
Contributor

pretty sure syringes take glass to make, so maybe it should have a chance to shatter if it hits a wall or something?

@cuackles

Copy link
Copy Markdown
Contributor

Do they drop after they empty of juice or they still will be embedded ?

@Anvilman6

Copy link
Copy Markdown
Contributor

pretty sure syringes take glass to make, so maybe it should have a chance to shatter if it hits a wall or something?

Seconding this.
It'd be a nice touch if they'd break on miss, possibly splash contents on the floor? Maybe have it turn into a glass shard, or create a broken syringe, a useless item like a broken light tube, that can be fed back into an autolathe for a refund.

@nmajask

nmajask commented May 20, 2022

Copy link
Copy Markdown
Contributor Author

pretty sure syringes take glass to make, so maybe it should have a chance to shatter if it hits a wall or something?

If I do that, I'll do it in a separate PR as this will mess with balance enough for one PR.

@nmajask

nmajask commented May 20, 2022

Copy link
Copy Markdown
Contributor Author

Do they drop after they empty of juice or they still will be embedded ?

They don't, but syringe embeds do almost nothing.

@ghost

ghost commented May 20, 2022

Copy link
Copy Markdown

Does it work on xenos???

Comment on lines 163 to -146
/obj/item/ammo_casing/shotgun/dart/noreact/Initialize()
. = ..()
ENABLE_BITFIELD(reagents.flags, NO_REACT)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you could just remove the initialize here if you're gonna remove the bitflag

@MusselMain

Copy link
Copy Markdown

Cool idea, I wonder how this would effect the blowdarts

@Notamaniac

Copy link
Copy Markdown
Contributor

So this should prevent instant death mixes, like black powder with napalm, or water+ potassium, right?

@nmajask

nmajask commented May 20, 2022

Copy link
Copy Markdown
Contributor Author

Does it work on xenos???

No, it doesn't as carbons can't get embedded with stuff, maybe I'll add that with my other PR.

@nmajask

nmajask commented May 20, 2022

Copy link
Copy Markdown
Contributor Author

So this should prevent instant death mixes, like black powder with napalm, or water+ potassium, right?

Yes, though it will inject it every life tick, so there may be a lot of tiny explosions.

@tattax

tattax commented May 20, 2022

Copy link
Copy Markdown
Contributor

you might want to make it so 15u of mutation toxin doesn't perma stun someone because it is ingested every second

nmajask added 3 commits May 21, 2022 16:14
commit c6d04d4
Author: nmajask <nmajask@gmail.com>
Date:   Sat May 21 16:12:51 2022 -0400

    b

commit da83fdc
Author: nmajask <nmajask@gmail.com>
Date:   Sat May 21 15:47:52 2022 -0400

    a

commit 8ec2fca
Author: nmajask <nmajask@gmail.com>
Date:   Thu May 19 15:26:09 2022 -0400

    Converts embedding into a proc

    also adds a embed tic proc that is called whenever the embedde has a life tick
@ToasterBiome ToasterBiome added the TESTMERGED This PR is currently live in a test merge. label May 23, 2022
@Sniblet

Sniblet commented May 23, 2022

Copy link
Copy Markdown
Contributor

with the funny thing livers do where they instantly purge anything less than 3u of a toxin this makes all unfriendly syringe guns completely useless because unless you're using a bluespace syringe it only transfers 1u at a time
cool idea but were you thinking

@Marmio64

Copy link
Copy Markdown
Contributor

Would make more sense if it injected half it's amount instantly and gradually releases the rest, since the momentum of the shot would instantly inject some of the contents

Yogbot-13 added a commit that referenced this pull request Jun 5, 2022
Yogbot-13 added a commit that referenced this pull request Jun 6, 2022
Yogbot-13 added a commit that referenced this pull request Jun 7, 2022
Yogbot-13 added a commit that referenced this pull request Jun 7, 2022
Yogbot-13 added a commit that referenced this pull request Jun 9, 2022
Yogbot-13 added a commit that referenced this pull request Jun 9, 2022
@JamieD1
JamieD1 merged commit efb926a into yogstation13:master Jun 11, 2022
Yogbot-13 added a commit that referenced this pull request Jun 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Awaiting - Action - Balance Review Code Director Review TESTMERGED This PR is currently live in a test merge. Tweak This PR contains changes to the game.

Projects

None yet

Development

Successfully merging this pull request may close these issues.