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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Adds Research, unlockable technologies, Protolathes... #264

Merged
merged 13 commits into from
Sep 3, 2019
Merged

Adds Research, unlockable technologies, Protolathes... #264

merged 13 commits into from
Sep 3, 2019

Conversation

gradientvera
Copy link
Contributor

@gradientvera gradientvera commented Jun 21, 2019 •
edited
Loading

Closes #40

  • Protolathe
    • Database
    • Custom user interface
    • Syncs with R&D Server
  • Research Server
    • Allow clients to connect
    • Getting points per each point source registered and active
  • Technology Database
    • Keep track of unlocked technologies
    • Sync technologies between server/client with states
    • Sync between two databases
  • RD Console
    • User interface
    • Unlocking technologies
    • Research point visualization
  • Research Client
    • Connects to server
    • Research Point Source
  • User interfaces
    • Protolathe interface
    • RD Console interface
    • Research Client interface
  • Research System
  • Technology prototypes
  • Creating simple technology examples
  • Icons for everything

@gradientvera gradientvera force-pushed the 2019-05-27-research branch from 75995f6 to 3e80f1d Compare June 23, 2019 11:46
@gradientvera gradientvera force-pushed the 2019-05-27-research branch 3 times, most recently from 8d93bad to fac80ac Compare August 25, 2019 15:13
@gradientvera gradientvera marked this pull request as ready for review August 27, 2019 17:28
@gradientvera gradientvera changed the title [WIP] Adds Research, unlockable technologies, Protolathes... Adds Research, unlockable technologies, Protolathes... Aug 27, 2019
@gradientvera
Copy link
Contributor Author

This is ready for review now.

@gradientvera
Work on Research so far
cbe5dfe 
More work on UI...
Fix ResearchClient and Protolathe UI stuff.
Fix infinite select -> request state -> select -> ... loop
Add UI to ResearchClient, etc.
Technology Database states, and a bit of work on the research console ui
A bit of work on Research Console UI
Protolathe sync
Stuff that actually does things
Protolathe databases yay
Alright got my motivation back
Yeah, no. It's almost 3 AM already
Fix serialization bug again
More work on stuff
Stuff
Adds files for most new components/systems.
@gradientvera
Protolathes actually work now
db88282
@gradientvera
Research. Just Research.
317edb6
@gradientvera
Adds icons from Eris.
810881c
@PJB3005 PJB3005 added the T: New Feature Type: New feature or content, or extending existing content label Aug 29, 2019
@ShadowCommander
Copy link
Member

If you're still changing stuff, could you fix control resizing in the Lathe Menu? I don't think the Search bar, Filter, and Queue buttons should change size.

@gradientvera
Copy link
Contributor Author

If you're still changing stuff, could you fix control resizing in the Lathe Menu? I don't think the Search bar, Filter, and Queue buttons should change size.

I made the buttons keep their size, but I personally don't mind the search bar that much, hmm

@PJB3005 PJB3005 merged commit ba8b495 into space-wizards:master Sep 3, 2019
@gradientvera gradientvera deleted the 2019-05-27-research branch September 4, 2019 01:58
@gradientvera gradientvera mentioned this pull request Sep 4, 2019
Closed
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Oct 1, 2022
@Elijahrane
Empty prototypes for our lockers (space-wizards#264)
41fba44 
* Empty prototypes for our lockers

* fix name of mantis cabinet
Morb0 added a commit to Morb0/space-station-14 that referenced this pull request Oct 30, 2022
@Morb0 @wrexbe
@ike709 @Emisse @EmoGarbage404 @PJBot @metalgearsloth @keronshb @KIBORG04 @ElectroJr @themias @vulppine @Delete69 @Elijahrane @CrudeWax @mirrorcult @Peptide90 @Just-a-Unity-Dev @ProfanedBane @ScalyChimp @TaralGit @DogZeroX
Upstream sync (space-wizards#264)
bbf7dea 
* Remove merge conflict comment (space-wizards#8819)

* Revert "Remove merge conflict comment" (space-wizards#8820)

* Captain laser self recharge (space-wizards#8826)

* Update coffee.yml (space-wizards#8830)

* Automatic changelog update

* Nerf pistol firerate slightly (space-wizards#8810)

* Don't flag merge conflicts on draft PRs (space-wizards#8821)

* Automatic changelog update

* Guns will now eject magazines first instead of chamber (space-wizards#8827)

* Removal interaction without hands (space-wizards#8843)

* Automatic changelog update

* Disable lag rand (space-wizards#8847)

* Make doorbumps quiet (space-wizards#8812)

* Syndicate gas mask flash protection (space-wizards#8818)

* Syndicate gas masks protect from flashbangs

* fix var name

* update to loop through all slots

* update based on review comments

* Fix grenade whitelists (space-wizards#8851)

* Automatic changelog update

* fixes static not appearing inbetween camera changes client-side (space-wizards#8846)

* 39 buried 0 found (space-wizards#8856)

* The Rat King [Antag] (space-wizards#8706)

* vending machine go spit

* who's da rat, bozo

* fixes

* crown + fixes

* aaaa

* aa

* lololol

* removing vending shit + most annoying fix alive

* paul review

* moony fixes

* sloth review

* Minor diseasesystem fix

* inverse moment

* A

* Also reduce args allocations

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Increase fireplace brightness and radius (space-wizards#8870)

* Automatic changelog update

* Can't break other people's drags on cuffed people (space-wizards#8868)

* works on my machine

* speedrun

* Automatic changelog update

* Fishy swarmers: Carp content and Space Dragon! (space-wizards#7395)

Co-authored-by: mirrorcult <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Add docking window to shuttle consoles (space-wizards#8756)

* lewd

* A

* Realtime

* Sleepy dork

* Draw radar position

* Accurate infiltrator

* experiments

* Better drawing

* Labels

* I need aan adult

* Cleanup

* Show toggles

* display I guess

* A

* fix

* fix

* cleanupsies

* Bit more polish

* Make sure mass scanners actually work

* Remove dummy state

* fren

* opposite

* aghost crash

* comment

* What's in a name

* woops

* Show docking ports

* Dock highlighting

* Drawing dock

* Shitty docks

* Lots of docking drawing

* Autodock working

* dork

* More graceful shutdown

* zoomies

* Lines and distance change

* revert

* Good enough

* cleanup

* Fix default range

* Dock UI and loc update

* Update on undock

* Loc fixes

* Automatic changelog update

* Update submodule

* Reduce door hacking time (space-wizards#8852)

* Fix damagestatevisualizer (space-wizards#8876)

* Nerf gun damage (space-wizards#8853)

* Automatic changelog update

* One more damagestatevisualizer funny (space-wizards#8877)

* Fix damagestatevisualizer (space-wizards#8879)

* Make holofans use power cells (space-wizards#8813)

* Automatic changelog update

* Nerf dragon audio + do_after (space-wizards#8880)

* Power cell culling (space-wizards#8814)

* Automatic changelog update

* Fix powercell (space-wizards#8882)

* Individual bar sign entities (space-wizards#8159)

* Fixed rotation check for pulling (space-wizards#8845)

Co-authored-by: metalgearsloth <[email protected]>

* Reduced laser pistols to 10 size (space-wizards#8840)

* Automatic changelog update

* Fix carbine size

* make animals gibbable (space-wizards#8875)

* Automatic changelog update

* Fix addatmos from griduid artifact

* Station Specific Jobs: Reporter and Psychologist (space-wizards#8865)

* Update jobs.yml

* Add files via upload

* id moment

* Update identification_cards.yml

* Update pda.yml

* Add files via upload

* psych

* roleyml psych

* real

* Update jumpsuits.yml

* Add files via upload

* Add files via upload

* Add files via upload

* Update jobs.yml

* Update meta.json

* Update meta.json

* Update meta.json

* Update bagel.yml

* Update marathon.yml

* job iconz

* Update meta.json

* Basic Medication Overdoses (Chemistry 1984) (space-wizards#8844)

* 1984 george orwell

* Update medicine.yml

* Update medicine.yml

* Update medicine.yml

* Automatic changelog update

* Fix admin announce eui (space-wizards#8869)

Co-authored-by: metalgearsloth <[email protected]>

* Removes extra Sound from slippery component (space-wizards#8841)

* Add a Wiki Button to the escape menu (space-wizards#8837)

* UI change

* lang file change

* C# change

* fix wiki button

Co-authored-by: Just-a-Unity-Dev <[email protected]>

* Automatic changelog update

* Move cuffs to users hand when removed (space-wizards#8862)

* move cuffs to users hand when removed

* review

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Make ghost timer a cvar (space-wizards#8817)

Co-authored-by: Just-a-Unity-Dev <[email protected]>
Co-authored-by: Just-a-Unity-Dev <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* reduced duck yaml bloat (space-wizards#8858)

Co-authored-by: metalgearsloth <[email protected]>

* Fix mousetrap crate icon (space-wizards#8835)

* Fix bagel yml artifact (space-wizards#8885)

* Fix wide attacking in containers (space-wizards#8886)

* Automatic changelog update

* Clean up door remote (space-wizards#8829)

Co-authored-by: metalgearsloth <[email protected]>

* ECS containmentfieldgeneratorcomponent (space-wizards#8757)

* ECS containmentfieldgeneratorcomponent

* Fix tests and clean up one line

* check for anchored in a better way

* Fix dependency exception

I'm not really happy with this solution, it's not very good but I'm not
sure how to do it better without refactoring way more than I want to. Maybe
I'm missing something.

* review

Co-authored-by: metalgearsloth <[email protected]>

* water (space-wizards#8903)

* Cleanup the remainder of dragon (space-wizards#8881)

* Cleanup the remainder of dragon

- Fixed some of the niscellaneous changes made to yml
- Made devour use a whitelist
- Fixed spelling

* name fix

* a

* Update submodule

* Remove reporter tophat (space-wizards#8912)

* Disarm 1984 (space-wizards#8872)

* Automatic changelog update

* Make wide attacks optional for now (space-wizards#8924)

* Port miasma from nyano (space-wizards#8926)

Co-authored-by: Kara <[email protected]>

* Automatic changelog update

* Fix dragon devour and reduce time significantly (space-wizards#8921)

* deleted check (space-wizards#8893)

* Botany + engi belt whitelist update (space-wizards#8939)

* Automatic changelog update

* Mobster accents for rat king/servants (space-wizards#8927)

* basically perfect

* oops

* huh

* new substitutions from retequizzle, rane, and olddancejacket + crown accent

* fixes

* Automatic changelog update

* quickfix (space-wizards#8942)

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>

* More kinds of benos (space-wizards#8849)

* weh

Multiplies the amount of power used by the battery guns, triple-ish for the laser cannon and a fuckton more for the xray

* weh

* weeee

* Fix the offsets and bb

* remove arc

* rouny

* sound stuff and fix the typo

* Fix dork

* a

Co-authored-by: metalgearsloth <[email protected]>

* Adds other botany tools (space-wizards#8935)

* Automatic changelog update

* Add screwdriver head sprite (space-wizards#8828)

* Silent Station Events (space-wizards#8938)

* Automatic changelog update

* Update locale

Co-authored-by: wrexbe <[email protected]>
Co-authored-by: ike709 <[email protected]>
Co-authored-by: Emisse <[email protected]>
Co-authored-by: EmoGarbage404 <[email protected]>
Co-authored-by: PJBot <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: keronshb <[email protected]>
Co-authored-by: KIBORG04 <[email protected]>
Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: themias <[email protected]>
Co-authored-by: Flipp Syder <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Delete69 <[email protected]>
Co-authored-by: Rane <[email protected]>
Co-authored-by: CrudeWax <[email protected]>
Co-authored-by: mirrorcult <[email protected]>
Co-authored-by: Peptide90 <[email protected]>
Co-authored-by: eclips_e <[email protected]>
Co-authored-by: Just-a-Unity-Dev <[email protected]>
Co-authored-by: Profane McBane <[email protected]>
Co-authored-by: Just-a-Unity-Dev <[email protected]>
Co-authored-by: ScalyChimp <[email protected]>
Co-authored-by: TaralGit <[email protected]>
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: T-Stalker <[email protected]>
Morb0 added a commit to Morb0/space-station-14 that referenced this pull request Oct 30, 2022
@Morb0
Revert "Upstream sync (space-wizards#264)" (space-wizards#265)
9f4170f 
This reverts commit bbf7dea.
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Sep 4, 2023
@Kesiath
fix (space-wizards#264)
ec8cc6d
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Sep 4, 2023
@FrontierATC
Automatic Changelog (space-wizards#264)
48a82a6
deltanedas pushed a commit to deltanedas/space-station-14 that referenced this pull request Jul 23, 2024
@ps3moira
Merge pull request space-wizards#264 from greystation14/remove-the-ot…
7c7b3d6 
…her-nuke-songs

Remove Some Nuke Songs
Ilya246 pushed a commit to Ilya246/space-station-14 that referenced this pull request Oct 10, 2024
@Aidenkrz
Merge pull request space-wizards#264 from Goob-Station/spacewind
a455279 
Steal spacewind :-)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DamianX DamianX DamianX left review comments

@PJB3005 PJB3005 PJB3005 approved these changes

@ZoldorfTheWizard ZoldorfTheWizard Awaiting requested review from ZoldorfTheWizard

Assignees
No one assigned
Labels
T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Simple Research
4 participants
@gradientvera @ShadowCommander @DamianX @PJB3005