Skip to content
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 our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverts circuitry components nerf and adds ID locking #4054

Closed
wants to merge 3 commits into from
Closed

Reverts circuitry components nerf and adds ID locking #4054

wants to merge 3 commits into from

Conversation

cheesePizza2
Copy link
Contributor

@cheesePizza2 cheesePizza2 commented Apr 8, 2021

First PR I've made, so tell me if I've made mistakes, or if you think i should add more components to the list of blocked components. Should revert #3975.

About The Pull Request

Re-adds in the reagents tab as well as the grenade primer. A circuit imprinter starts locked, and by swiping an ID with bridge access you can unlock it/lock it again. Some components require this ID locking to be unlocked to be printed.

Why It's Good For The Game

Allows more complex circuiting as well as integrating it more in the game, which is always a good thing when it comes to circuits. Balancing issues avoided by making all the "dangerous" components (for example, the grenade primer), to require an ID.

Changelog

馃啈
add: re-adds the reagent tab as well as the grenade primer and gun circuit
balance: dangerous components require ID
/:cl:

Probably the only commit I make. Adds ID locking.
@github-actions
Copy link

github-actions bot commented Apr 8, 2021

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cheesePizza2
Copy link
Contributor Author

Ah, nevermind. If someone knows how fixing conflicts works, tell me, 'cause there's not many resources on coding that I can find.

@cheesePizza2 cheesePizza2 marked this pull request as draft April 8, 2021 18:45
@Sinestia
Copy link
Contributor

Sinestia commented Apr 8, 2021

update ur local master

type git merge master from ur branch

and then use whatever tool to fix the collisions

you can also do it on github if you want to get bullied

@bloons3
Copy link
Contributor

bloons3 commented Apr 8, 2021

Does chemistry require the CMO to swipe their ID on the chemistry dispenser in order for them to make meth grenades?

@cheesePizza2
Copy link
Contributor Author

Does chemistry require the CMO to swipe their ID on the chemistry dispenser in order for them to make meth grenades?

i thought it was a stupid nerf to begin with but i assumed if i just reverted it it would be denied

update ur local master

type git merge master from ur branch

and then use whatever tool to fix the collisions

you can also do it on github if you want to get bullied

github way isn't working

as for the command thing, i really don't understand what you mean. i'm absolutely clueless about github and i've never used it before this project

@PowerfulBacon
Copy link
Member

So you have to get a head to scan the machine before you can unlock broken circuit components? Bad idea.

@cheesePizza2
Copy link
Contributor Author

So you have to get a head to scan the machine before you can unlock broken circuit components? Bad idea.

hey if i just reverted the change it would get denied instantly lol

@PowerfulBacon
Copy link
Member

So you have to get a head to scan the machine before you can unlock broken circuit components? Bad idea.

hey if i just reverted the change it would get denied instantly lol

and this wont?

@Sinestia
Copy link
Contributor

Does chemistry require the CMO to swipe their ID on the chemistry dispenser in order for them to make meth grenades?

i thought it was a stupid nerf to begin with but i assumed if i just reverted it it would be denied

update ur local master
type git merge master from ur branch
and then use whatever tool to fix the collisions
you can also do it on github if you want to get bullied

github way isn't working

as for the command thing, i really don't understand what you mean. i'm absolutely clueless about github and i've never used it before this project

What client?

You can do it with any, but the same principle is there
you gotta

  1. update your master branch
  2. checkout your feature branch and
  3. Merge master into your feature branch

@cheesePizza2
Copy link
Contributor Author

I think i'm figuring it out. I had to set my master as upstream. now i just gotta figure out how to edit my PR

i use GitKraken btw

@Sinestia
Copy link
Contributor

Sinestia commented Apr 13, 2021

You just push to your github fork's branch once you've fixed it locally. it'll automatically update this PR

(also. Add beestation as a remote if you havent)

Forgot to do this
@cheesePizza2
Copy link
Contributor Author

Figured it out

@cheesePizza2 cheesePizza2 marked this pull request as ready for review April 13, 2021 19:05
@TheFakeElon
Copy link
Contributor

TheFakeElon commented Apr 23, 2021

Reagent circuit power is greatly exaggerated for almost all of the components. Even moreso with circuit cloning disabled

@TheFakeElon
Copy link
Contributor

(Esports ready PR moment)
image

@cheesePizza2
Copy link
Contributor Author

err... how long is this pr gonna take to get merged/closed

@cheesePizza2
Copy link
Contributor Author

the faster this pr gets merged/closed the faster i can fix the issues/get cracking with more pr's

@ike709
Copy link
Member

ike709 commented May 13, 2021

the faster this pr gets merged/closed the faster i can fix the issues/get cracking with more pr's

Learn how to branch

@ike709
Copy link
Member

ike709 commented May 13, 2021

Anyways circuits, without a groundup rewrite, are on the way out.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants