NotificationsYou must be signed in to change notification settings
Fork303
Star72

Bidons and Chemistry QOL#9131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Draft

hex37 wants to merge17 commits intoPolarisSS13:master

base:master

Choose a base branch

fromhex37:bidons

Draft

Bidons and Chemistry QOL#9131

hex37 wants to merge17 commits intoPolarisSS13:masterfromhex37:bidons

Conversation

Copy link

Contributor

hex37 commentedJun 30, 2023•
edited
Loading

Ports BIDON containers, portable and refillable chemical tanks, from Eris
Adds the various BIDON Containers to R&D's protolathe
- The Basic Bidon has a large storage supply
- The Advanced Bidon functions as a giant Cryostasis beaker
- The Trigger Bidon, a potential antag tool, is an advanced bidon that can be set to deactivate its cryostasis component after 2 minutes elapse.
Beakers will now attempt to totally empty themselves if used with Disarm intent

hex37and others added6 commits

June 29, 2023 20:09

Bidons and Chemistry QOL

4620037

Remove pour if beaker is full- not necessary

6b8c127

adds printing recipes

448702f

Fix trigger bidon

5491624

vanity commit

f48d584

Update bidon.dm

fdfa625

Atermonera added Feature

The PR adds new functionality in some way.

Sprites[PR] This modifies dmi assets or dmi asset use. labels

Jul 19, 2023

Atermonera suggested changes

Jul 23, 2023

View reviewed changes

Copy link

Contributor

Atermonera left a comment

Choose a reason for hiding this comment

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

Sorry this took so long for me to get to. The sprites are... not great, but passable.

code/modules/reagents/holder/holder.dm OutdatedShow resolvedHide resolved

code/modules/reagents/reagent_containers/_reagent_containers.dm OutdatedShow resolvedHide resolved

code/modules/reagents/reagent_containers/bidon.dmShow resolvedHide resolved

code/modules/reagents/reagent_containers/bidon.dm OutdatedShow resolvedHide resolved

code/modules/reagents/reagent_containers/glass.dm OutdatedShow resolvedHide resolved

Spookerton marked this pull request as draft

August 14, 2023 15:32

Cerebulon reviewed

Aug 21, 2023

View reviewed changes

code/modules/reagents/reagent_containers/bidon.dm Outdated

		//this is big movable beaker
		/obj/structure/reagent_dispensers/bidon
		name="B.I.D.O.N. canister"
		desc="Blue-Ink Dispenser Omnitech-Nanochem. A canister with acid-resistant linings intended for handling big volumes of chemicals."

Copy link

Contributor

CerebulonAug 21, 2023

Choose a reason for hiding this comment

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

Ater pinged me about this being a bit questionable word salad like a month ago and the suggested replacement was:
Banded Industrial Drum for Organic Nonvolatiles
If Omnitech-Nanochem is a company you want namedropped it should probably be just in the desc and not the acronym.

Copy link

Contributor

CerebulonAug 26, 2023

Choose a reason for hiding this comment

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

Why was this marked as resolved, no changes were made?

Copy link

ContributorAuthor

hex37Sep 17, 2023

Choose a reason for hiding this comment

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

Apologies, forgot to push a name change fix.

hex37and others added10 commits

August 21, 2023 17:31

Update code/modules/reagents/reagent_containers/_reagent_containers.dm

67406bb

Co-authored-by: Atermonera <atermonera@gmail.com>

Update code/modules/reagents/reagent_containers/bidon.dm

fac3ebe

Co-authored-by: Atermonera <atermonera@gmail.com>

Update code/modules/reagents/reagent_containers/bidon.dm

07fde9f

Co-authored-by: Atermonera <atermonera@gmail.com>

Update code/modules/reagents/reagent_containers/bidon.dm

aef2a63

Co-authored-by: Atermonera <atermonera@gmail.com>

Update code/modules/reagents/reagent_containers/glass.dm

2e8a7e7

Co-authored-by: Atermonera <atermonera@gmail.com>

Update code/modules/reagents/reagent_containers/bidon.dm

6cc570f

Co-authored-by: Atermonera <atermonera@gmail.com>

fixes

e80319a

Merge branch 'bidons' ofhttps://github.com/hex37/Polarisinto bidons

15697ef

strange return

51cfee6

sleepless push

b1c99f9

hex37 requested a review fromAtermonera

August 26, 2023 00:15

update name

aa8e6b6

Atermonera approved these changes

Nov 27, 2023

View reviewed changes

Copy link

Contributor

Atermonera commentedNov 27, 2023

@hex37 merge conflicts

Spookerton mentioned this pull request

Jan 31, 2024

add a cut down version of eris bidons#9326

Closed

Labels

Feature

The PR adds new functionality in some way.

Sprites

[PR] This modifies dmi assets or dmi asset use.

Movatterモバイル変換

Bidons and Chemistry QOL#9131

Are you sure you want to change the base?

Bidons and Chemistry QOL#9131

Uh oh!

Conversation

hex37 commentedJun 30, 2023• editedLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Uh oh!

Atermonera left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CerebulonAug 21, 2023

Choose a reason for hiding this comment

Uh oh!

CerebulonAug 26, 2023

Choose a reason for hiding this comment

Uh oh!

hex37Sep 17, 2023

Choose a reason for hiding this comment

Uh oh!

Atermonera commentedNov 27, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

hex37 commentedJun 30, 2023•
edited
Loading