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

Added Advance tools to engineering cyborg #12120

Closed
JayBaez wants to merge 25 commits into from
Closed

Added Advance tools to engineering cyborg #12120

JayBaez wants to merge 25 commits into from

Conversation

@JayBaez
Copy link
Contributor

@JayBaez JayBaez commented Aug 23, 2021 •
edited
Loading

What is in this PR:
Added the cyborg ATMOS holofan into the techweb for researching. You can research and print the upgrade board for the engineering cyborg. Added a new techweb research node for advance tools. The advance tools are the experimental tools (jaws of life, hand drill, tricorder, NOT experimental welding tool) and the Bluespace RPED.

Purpose of this PR:
The engineering cyborg already has tools for humans, as the Geiger counter or analyzer, the ATMOS is too OP to have at the start so it can be researched.
The BSRPED and advance tools give the borg a useful upgrade as the round advances.

🆑
rscadd: Added advance tools/ BSRPED/ ATMOS holofan to engineering cyborg
/:cl:

@Yogbot-13 Yogbot-13 added the Feature This adds new content to the game label Aug 23, 2021
@JamieD1
Copy link
Contributor

JamieD1 commented Aug 23, 2021

Jamie helped

@JayBaez
Copy link
Contributor Author

JayBaez commented Aug 23, 2021

ignore the various and redundant commits. I committed mistakes and was too lazy to make a new branch to remove it.

@Jarod1200
Copy link

Jarod1200 commented Aug 23, 2021

borg powercreep moment

@UselessTheremin
Copy link
Contributor

UselessTheremin commented Aug 23, 2021

you really sat down, looked at the engiborg, and thought to yourself... "this needs a buff"

lmao

@JayBaez
Copy link
Contributor Author

JayBaez commented Aug 23, 2021

you really sat down, looked at the engiborg, and thought to yourself... "this needs a buff"

lmao

It's just a quality of life

@Jarod1200
Copy link

Jarod1200 commented Aug 23, 2021

Holofan and BRPED are too op for borgs period. There are literally 0 drawbacks to the engi borg with this PR.

@JayBaez
Copy link
Contributor Author

JayBaez commented Aug 23, 2021 •
edited
Loading

Holofan and BRPED are too op for borgs period. There are literally 0 drawbacks to the engi borg with this PR.

What would be OP would be giving the engineering cyborg the experimental welder. The holofan goes with the whole "keep human alive" tools like the Geiger counter and analyzer. The BSRPED is later game research where most things would have already been upgraded.

@Jarod1200
Copy link

Jarod1200 commented Aug 23, 2021

The atmos holofan is a weapon of station ending destruction. "Whoops I just released my fusion cloud into medbay after welding the firelocks open as malf ai"

@adamsong
Copy link
Contributor

adamsong commented Aug 23, 2021

Whoops I just released my fusion cloud into medbay after welding the firelocks open as malf ai

Which of those steps used a holofan?

@ShatteredParadox
Copy link

ShatteredParadox commented Aug 26, 2021

Whoops I just released my fusion cloud into medbay after welding the firelocks open as malf ai

Which of those steps used a holofan?

Holding back the toxic/intensely hot gas, and at a push of a button, releasing the hot deadly gas through all of the open firelocks. Basically being able to remotely trigger the attack.

@JamieD1 JamieD1 added the Controversial People are divided on this PR label Aug 30, 2021
JamieD1
JamieD1 approved these changes Aug 30, 2021
View reviewed changes
Copy link
Contributor

@JamieD1 JamieD1 left a comment

Choose a reason for hiding this comment

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

No experimental t ray

@JayBaez
Copy link
Contributor Author

JayBaez commented Aug 30, 2021

You play a hard game Jamie. I’m all good with your recommendation

@JayBaez
Copy link
Contributor Author

JayBaez commented Sep 2, 2021

Remove the BSRPED from its own node and unlock it on the normal BSRPED to prevent wasting of resources if "noone will ever use it"

Also disable the option for disabling the barriers remotely.

Shout if you need help with any of these.

prob will cause my time to work on this has dropped since school started back up again.

@overlord12345 overlord12345 mentioned this pull request Sep 2, 2021
Open
@Sniblet Sniblet mentioned this pull request Sep 6, 2021
Closed
@adamsong adamsong added the TESTMERGED This PR is currently live in a test merge. label Sep 12, 2021
@TheBombMakerJL TheBombMakerJL mentioned this pull request Sep 15, 2021
Closed
JamieD1 and others added 7 commits September 17, 2021 14:00
@JamieD1
Update turdis.yml (yogstation13#12323)
78f7d07
@Yogbot-13
Automatic changelog generation yogstation13#12323 [ci skip]
2d67e67
@JamieD1
Delete AutoChangelog-pr-12323.yml
c2a63b6
@JamieD1 @adamsong
[BETA] - Lobby Screen (yogstation13#12321)
556dcdc 
* Replaced the lobby menu (with actual art) (#60953)

* Didn't mean to commit this

* This doesn't need changed anymore

* Dark mode

* Added countdown timer to lobby screen

* I hate conflicts

Co-authored-by: AMonkeyThatCodes <20987591+AMonkeyThatCodes@users.noreply.github.com>
Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
@JamieD1 @nmajask
[BETA] Shuttle Building (yogstation13#12322)
71292c1 
* Add files via upload

* changed sigtech, tourist, and clerk icons

added more detail to sigtech icon
new tourist and clerk icons

* Some more icon changes

I uploaded the wrong file

* applied grimm-hollowknight requested changes

Adds new signal technician and paramedic hud icons and reverts clerk's back, all requested by grimm-hollowknight

* ah, so thats why you reverted that change

im dumb

* why cant i merge upstream

why github

Co-authored-by: nmajask <nmajask@gmail.com>
@JamieD1 @Absolucy
Mission shitpossible (yogstation13#12324)
4faf9a8 
* Infiltrators!

* Fix the cigarette vending machine in the infiltrator base

* Uncomment role preference

* Fix a bunch of bugs.

* Changes to AI hijack

* GODDAMIT I FORGOT TO SAVE IN STRONGDMM

* Fix the dumb gravgen runtime.

* Just throw the infiltrator base on centcom directly

* Add infiltrators to one-click antag (and fix vampires not being in it)

* blame jamie

* add infiltrators event

* Admin only for now.

Admin only for now.

* Maybe fix the round ending a BIT too early?

* Fix uplink not appearing properly in the roundend report

* Improve examine text for infiltrator power sink

* Whoops, remove the J

* More stuff.

* Jamie's map changes

* Make the AI hijacker more idiot-proof.

* Update map again.

* fix infiltrators not being able to use edaggers

* Update centcomm map again

* aaaaa

* fix powersink examine

* e

* wait nvm that's right

* big typo whoopsie

* Some big ol' improvements!

Co-authored-by: Lucy <lucy@absolucy.moe>
@JamieD1 @nmajask
Custom shuttles (yogstation13#12326)
969e1a2 
* Ports "Ship construction through the power of science!"

- Ports BeeStation/BeeStation-Hornet#1398

* Ports some changes

- Ports https://github.com/BeeStation/BeeStation-Hornet/pull/1904/files# and BeeStation/BeeStation-Hornet#1529

* Should fix some stuff

- Removed some unused files
- Fixed a change to a random file

* Should fix more stuff

- Added some more important files
- Added the icons I forgot to add

* Oh, I didn't update the dme

- Should fix this, maybe?

* Probably should add the turf icons

- Added the turf icons

* Fixes the name filter

One down, two to go
- Fixes the name filter by using isnotpetty instead of OOC_FILTER_CHECK, now if you make a shuttle with a bad name, it will message the admins.

* Fixes the tech web

- Fixes the tech web
- Adds the new icons for the RSD

* Should fix some stuff with the shuttles

Should fix most of the runtimes and issues that ive had thanks to Jamie's help. Should bring this from ""functional"" to "functional".

* I am too tired for this

why github desktop, WHY!!

* Adds spaceship navigation beacons

They kinda work.

* should fix the beacons

why do i do this the way i do

* Ports some fixes by Dennok

Ports "Custom shuttle offsets and view range depends on ship size. yogstation13#2685" by Dennok and "Custom transit dir for custom shuttle yogstation13#2689" by Dennok

Co-authored-by: nmajask <nmajask@gmail.com>
JamieD1
JamieD1 reviewed Sep 17, 2021
View reviewed changes
@JamieD1 JamieD1 requested a review from a team as a code owner September 17, 2021 14:22
@JamieD1 JamieD1 requested a review from a team September 17, 2021 14:22
@JamieD1 JamieD1 requested a review from a team as a code owner September 17, 2021 14:22
@github-actions github-actions bot added Github changes to the .github folder Mapping Will result in a change to a map. labels Sep 17, 2021
@adamsong adamsong removed the TESTMERGED This PR is currently live in a test merge. label Sep 20, 2021
patpol4
patpol4 suggested changes Sep 23, 2021
View reviewed changes
Copy link
Contributor

@patpol4 patpol4 left a comment

Choose a reason for hiding this comment

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

What is the point of the map change here? Looks like you're just doing changes from #12270 ?

@patpol4
Copy link
Contributor

patpol4 commented Sep 23, 2021

Also I would like to state i think this pr is bad and i don't like it

@SomeguyManperson
Copy link
Contributor

SomeguyManperson commented Oct 15, 2021

image
wtf happened here

@patpol4 patpol4 added the Stale I'm closing this in like a week if you don't push a new commit label Oct 28, 2021
@patpol4
Copy link
Contributor

patpol4 commented Oct 29, 2021

@JayBaez is anything happening to this

@Bibby0110
Copy link
Contributor

Bibby0110 commented Oct 29, 2021

Fix merge conflicts + whatever jamie did.
Good luck with your school :)

@Bibby0110 Bibby0110 closed this Oct 29, 2021
@Runian Runian mentioned this pull request Jul 30, 2023
Merged
@JayBaez
Copy link
Contributor Author

JayBaez commented Aug 1, 2023

@JayBaez is anything happening to this

yea

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@JamieD1 JamieD1 JamieD1 requested changes

@patpol4 patpol4 patpol4 requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Controversial People are divided on this PR Feature This adds new content to the game Github changes to the .github folder Mapping Will result in a change to a map. Stale I'm closing this in like a week if you don't push a new commit

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@JayBaez @JamieD1 @Jarod1200 @UselessTheremin @adamsong @ShatteredParadox @patpol4 @SomeguyManperson @Bibby0110 @Yogbot-13