Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
TG Merge 6.5 (Special Edition) (#378)
* sets EOL to LF * Normalize all the line endings * Sets vscode to default to unix / LF line endings (#52273) * Adds ignored commit file for git blame (#52344) * Adds ignored commit file for blame * contributing.dm * Changes ignored blame commit to an accurate one * [READY] The Portable Chemical Mixer (#51964) * New device: Portable Chemical Mixer * Added entries to the tech web and the medical techfab * removed unused icons for chemical cartridges * small bugfix in build_path of portablechemicalmixer * changed description and added info message * Added newline * Added a functioning newline * Added a vortex anomaly core requirement * Replaced old sorting method with sortBy * Updated tgui.bundle to work with the latest code changes * Added documentation to all variables and procs * Small fix in wording * Removed all non-class level documentation * Updated tgui.bundle for the newest offical code version * Updated tgui.bundle to work with the newest code version * Updated the tgui.bundle to work with the newest version * Arconomy Productions presents: The Bounty Board (#51449) * Startwork * stopwork again * AGAIN. * Good place to call it for now * Startwork but I actually put some work in * The left list doesn't work, stop for now. * God remind me to squash these commits later. * Well, I think I can safely say I have actual work done now * The post-Brisk iced tea patch. * God damnit nothing works I hate this worl * Good place to stop, stuck in a chronic error state * I take it back now I need to sleep jesus god * I am grown POWERFUL in my dispair * FINALLY READY TO PR. * Request order swap * Update and tgui recompile * Adds a kiosknet, so adding a new bounty alerts all the bountyboards * Renames file, attempts to port to modular app too because fuck my life * Fuckin feature creep I tells ya * Removes an unused proc * Rebuildin * Hopefully updates tgui and fixes an easy runtime * Finishes updating/conflicts * Mapmerges my shit. * Rebuilds tguiiiiiiiiiiii * Updates tgui * Updated once more * merge conflict fixaroni * God I wish that I had a game I was dedicated enough to finish in a single setting * Rebuild of PR: You will (Not) compile * Cobby's changes and Anturk's Suggestions. * Should probably prevent a runtime. * Rebuilds TGUI. * Lets not delete my own files please god * Style's changes * ALL the warriors * What if I didn't delete ZX's app sprites again * Start workin on a text component later * Makes some code suggestions, doing it all in UI will kill me * tgui update * DNM until I get this gosh darn text working. * The changes that I need afaik * And a tgui rebuild to boot * When that program datum spoke to me, I felt that. * Makes changes to text input sanity, Pray * By god I think I've cracked the code. * Had no idea you could atomize UIs like that, this is revolutionary * Spaces Co-authored-by: Aleksej Komarov <[email protected]> * tgui: MIT License (#50969) * MIT license headers * various tweaks - Tweak jsdoc headers a bit - Use an old-school format with SPDX-License-Identifier for SCSS - Add headers to tgui dmcode * Simplify the license section * Rebuild tgui, small tweaks Co-authored-by: ZeWaka <[email protected]> About The Pull Request All relevant source code now contains copyright headers, that explicitly assert copyright and license for every file. This has been done to prepare TGUI for wider adoption. Goon station devs are interested in using TGUI, and hopefully this will result in a nice collaboration and improvements to both codebases. The following files were relicensed under MIT: code/controllers/subsystem/tgui.dm code/modules/tgui/*.dm tgui/**/*.js tgui/**/*.scss The following files were kept untouched: tgui/packages/tgui/interfaces/**/*.js tgui/packages/tgui/styles/interfaces/**/*.scss Project is still basically AGPL-3.0 under /tg/station's parent license (with added MIT texts), but allows importing MIT code into MIT-compatible codebases. * Adds Syndicate tablets, replaces the pinpointer used by Nuke Ops (#51386) * Synux * cleanup * I bet this merge conflicts we hate tgui.bundle * extra bits * Syndix * small fixes * Summary (required) * this linter drives me up the wall * final touchups * Forgot this thing * fixes and tweaks * Replace BSQL with rust-g, paramaterize all queries (#51255) cl refactor: BSQL has been replaced with rust-g, improving SQL reliability and safety. /cl Queries were parameterized as much as possible. Careful code read by someone else also versed in SQL would be a good idea. Things seemed fine spot-testing roundstart, library, bans, and polls, but more stress-testing may be useful. Also updates rust-g to v0.4.5: Improved Linux .so detection Perlin noise functions Also updates Travis script to bionic. * tgui: Jukebox (#52014) * Jukebox TGUI * Line endings * Review fixes * tgui: Tachyon-Doppler Array (#51568) * Doppler array UI without actions * TachyonArray UI * Final version * TGUI fixes * tgui: Biogenerator (#51022) * First version * Pre-release version * Cleanup * Review fixes and finishing touches * Updates vend-a-trays to have a unique UI, improves accessibility. (#51931) * Initial commit, updates trays into 2020 * Adds vend-a-trays as a service machine, without it being a machine. * Replaced the mapped vend-a-trays with service unique versions. * "YoUr BuIlD DiFfErS fRoM mAsTeR" * Removes {}s from img, workin on the other part * All my homies recompile on merge conflict * Fixes end of line because honestly there must be no god on this green earth * hopefully this isn't too excessive. * How's this? * Applies Anturk's Confirm suggestion. * Shipped, workshopped with style a bit * Alright that's probably enough fiddling for now * Rebuilds. * html moment (#51956) * Turret Control TGUI (#51777) * tgui: Portable Turret (#51840) * Turret TGUI * Review fixes Co-authored-by: Bobbahbrown <[email protected]> * Review fixes 2 * Finishing touches Co-authored-by: Bobbahbrown <[email protected]> * [Ready] Skillcapes II: Revenge of the broken github: A Skill Menu Special: New Sprites Edition (#50656) * 10K hours 60,000 minutes hahah sure if you want a trailing newline i can do that default cloak gets default skill lazy list and no equip good necessary ig Update code/datums/skills/_skill.dm Co-Authored-By: nemvar <[email protected]> Update code/datums/skills/gaming.dm Co-Authored-By: Angust <[email protected]> WIP PDA skill monitor program hacky fixes till i refactor skills refactors skills a bit, adds admin skill edit menu If you have a failing, it's that you're always demanding perfection ...IF you have a failing i think that's it for the admin skill manger appeases lord flord bruh level names FUCK!! unga Update code/modules/vehicles/vehicle_key.dm Co-authored-by: Rohesie <[email protected]> Update code/modules/admin/topic.dm Co-authored-by: Rohesie <[email protected]> Update code/modules/admin/skill_panel.dm Co-authored-by: Rohesie <[email protected]> Update code/modules/admin/skill_panel.dm Co-authored-by: Rohesie <[email protected]> Apply suggestions from code review frick Co-authored-by: Rohesie <[email protected]> EOL and dumb spaces more rohsie bait tgui: Query Windows Registry for BYOND cache directory hell yeah brother update tgui and dmi CLRF and bat file typo ig * tgui and new janicloak that i accdiently changed on another branch * jani * gamer cloak * trim trailing whitespace * tgui * bruh * variable renaming * Tiny skill neatness tweaks (#51309) * minor neatness tweaks * topic * tgui: Fix Seed Extractor and update to tgui (#50928) * Initial Seed Extract Update Updates the seed extractor to work and the ui * Damnit, forgot to run webpack * Removed the logger and fixed toTitleCase You would think working on a PR for 14 hours you would remember the small stuff * Fixed the wierd Table.cell spacing. I have no clue how that got there. * Trying to fix some webpack issues Travis is reporing a dffrent webpack id so its failing? did a yarn update and repack * forgot the lock file * Clean up the code, final rebuild * Deleted yarn.lock in the root Co-authored-by: Style Mistake <[email protected]> * tgui 4.0 (#52085) * tgui 4.0 hyper squash * Upgrade dependencies * tgui 4.0: Reduced Logging (#52280) * CDN asset scaffolding: generated urls. * tgui: Fixes assets, CDN support (#52321) * tgui: Better asset code, CDN support * Rebuild tgui * µ-fix * Fix sending of updates (#52282) tgui: Fix sending of updates for non-interactive but observable UIs. * tgui: Scalable UI (#52283) * tgui: Scalable UI * ProgressBar scaling fix * Rebuild tgui * tgui 4.1 version bump (#52408) * Fix bluescreens due to a localStorage bug in IE11 (#52356) * 2spooky now no interact with tgui * tgui: Telecommunications UI (#52357) * Telecommunication Machine UI Overhaul This replaces the UI of the tcomm machines from the old html system to the new TGUI system. * Telecommunication Machine UI Overhaul This replaces the UI of the tcomm machines from the old html system to the new TGUI system. * Updated TGUI.Bundle * Housekeeping Added final newline, shortened value-values, spread out boxes, renamed Tcomm to Telecomms, and made the backend use full numbers while the frontend used decimals. Thanks for the feedback, y'all. * Removes forcesay on attack (#52341) * Fix pulsing the power wire shocking you repeatedly unless you close tgui (#52541) * Fixes #52538 * Allow those with insulated gloves to mess with airlocks still * Fix not being able to interact with insulos * Fix style qualms * Add shock immune to should_electrocute * updates turdis to not use BSQL * Bumps minimum savefile version, fixes some forgotten hotkeys (#52312) * Bumps minimum savefile version, fixes some forgotten hotkeys * Removes job flags * Fixes keybind fuckup (#52406) * Fixes keybind fuckup * Right fix * improved savefile versioning by MSO, cherrypick too fucked to want to fix * Adds Runechat Subsystem - Deprecates Use of Timers for Runechat (#52425) * first pass * one wacky dot * documentation * we're the garbage man now * doc update * couple of bugs never hurt nobody * Gun locker now uses a radial menu (#52506) * Gun Locker Radials * Smaller radius * Review fixes * Update code/game/objects/structures/guncase.dm Co-authored-by: Rohesie <[email protected]> * Review fixes 2 * Apply suggestions from code review Co-authored-by: Rohesie <[email protected]> Co-authored-by: Rohesie <[email protected]> * Drone radial menus (#52618) * Patching the DMAPI (#50862) * DMAPI 5.2.2 (#51100) * Update DMAPI to v5.1.0 * Add more event handlers * Patch * DMAPI 5.2.0 * DMAPI 5.2.1 * Add missing trailing new line * Fix the version we print after updates * 5.2.2 * Add handler for TGS_EVENT_WATCHDOG_SHUTDOWN (#51665) * Add handler for TGS_EVENT_WATCHDOG_SHUTDOWN Thought I did this... * speling * Gotta go fast * Update TGS DMAPI to 5.2.3 (#52608) * Fixes cinematics for widescreen. (#52464) * Simple mob AI wakes up less (#52228) There's no reason to wake every mob on the Z level when we can simply wake up only those nearest to the mob In theory we could even not do this at all, but there would be a few seconds delay before the idle automated actions ran and the AI wokeup anyway * SimpleMob AI now enters IDLE state when a client enters a z level This occurs if no client was on the z level before they moved in (implying the AI could have turned off) If they are within a certain distance we also ask them if they want to move from IDLE to fully awake and targeting * Remove instances of `var varname` in dm code * People drift through z levels properly now (#52686) * Adds more documentation to TGS chat funcs (#52601) * Fix using `tag` instead of `custom_tag` in send2chat (#52675) * Adds more documentation to TGS chat funcs * Fix using `tag` instead of `custom_tag` for chat channels * Make new game notifcation message clearer * Adds screen_glass.dmi (#52691) transparent hud * Replaces modular computer card eject verbs with UI buttons (#52489) * Replaces mod-CPU card eject verbs with UI buttons * ? * Try to replace light overlay to vis_contents (#52389) * Try to replace light overlay to vis_contents * move glowybit creation in Initialize * ups * change mutable_appearance to SSvis_overlays * set right settings * Adds reference tracking (#51467) About The Pull Request Adds extools-powered reference tracking. Includes a couple procs that retrieve the back and forward references of a datum - Back references let you see what is referencing your object and potentially preventing it from garbage collecting, and forward ones show you what your object in turn references. Also made a cool GUI to inspect and follow these references. The tracking adds some overhead to all variable sets and list operations. Init time is increased by ~15%. I haven't actually benched it so it might impact the actual game less. Why It's Good For The Game no lagging caused by hard dels scanning the entire planet (once coders fix them) * Reference tracking (#52403) * ref tracking * legacy * legacy procs * fixes * tweaks * clarity comments * wth * Adds an atmos debugging tool and excited group visualizer (#52395) * Adds an atmos debugging tool and excited group visualizer * rebuild moment * yarn install -> yarn run build * Sigh * Fixed UI, did not test, needs a rebuild. * Proper flexing * Adds varied colors, improved ui courtusy of stylemistake: * Fixes a runtime, updates tgui * added superconductors, cleaned up some shitcode, removed a clashing color * Woop * Speed * rebuild * Adds a tick count * begone auto-update * color defines * rebuild moment * color improvements, fixes updating * adds another preprocesser define to handle showing max shares in the ui * test of application system? * patches up some display issues, allows for smooth flowing from one group to another * overlay-ified * client testing * dmi moment * plane master * it fucking works * size change * passthrough * rebuild moment * adresses review concerns, toggles active turf vis on when testing Co-authored-by: Aleksej Komarov <[email protected]> * fixes the poll menu from breaking the join menu when the DB is misconfigured * Adds Documentation for Entire Timer Subsystem With Minor Refactors (#52415) * temp * cleanup * more * Revert "more" This reverts commit 8707bfe75dc69a5dcfd1d71bd12140f6c45a3125. * less is better * some documentation * almost there * we did it * words * better words * Update code/controllers/subsystem/timer.dm Co-authored-by: Kyle Spier-Swenson <[email protected]> * Update code/controllers/subsystem/timer.dm Co-authored-by: Kyle Spier-Swenson <[email protected]> * whitespace Co-authored-by: Kyle Spier-Swenson <[email protected]> * Revert "Adds an atmos debugging tool and excited group visualizer (#52395)" This reverts commit 5a17005ffef89f2d116b157397daad8c819e2af5. * rebuild TGUI * fixes some TGUI interfaces * rebuilding FUCKING TGUI * fixes prefs * more fixes * Hitscan Emitters 2 Electric Boogaloo (#375) * Emitters 2 Electric Boogaloo * margularize it in waspstation folder since Toast wont 👀 Co-authored-by: Shayne Fitzgerald <[email protected]> Co-authored-by: Shayne Fitzgerald <[email protected]> * final runtime fixes * possible ORM fixes * misc runtime fixes * credits fixes and general runtime remedies * fucking undeleted queries Co-authored-by: ShizCalev <[email protected]> Co-authored-by: skoglol <[email protected]> Co-authored-by: LordVollkorn <[email protected]> Co-authored-by: ArcaneMusic <[email protected]> Co-authored-by: Aleksej Komarov <[email protected]> Co-authored-by: zxaber <[email protected]> Co-authored-by: Tad Hardesty <[email protected]> Co-authored-by: Arkatos1 <[email protected]> Co-authored-by: Arkatos <[email protected]> Co-authored-by: Bobbahbrown <[email protected]> Co-authored-by: MrDoomBringer <[email protected]> Co-authored-by: Ryll Ryll <[email protected]> Co-authored-by: WarlockD <[email protected]> Co-authored-by: MrStonedOne <[email protected]> Co-authored-by: Timberpoes <[email protected]> Co-authored-by: WondaMegapon <[email protected]> Co-authored-by: Jared-Fogle <[email protected]> Co-authored-by: Rohesie <[email protected]> Co-authored-by: Jordan Brown <[email protected]> Co-authored-by: AnturK <[email protected]> Co-authored-by: oranges <[email protected]> Co-authored-by: LemonInTheDark <[email protected]> Co-authored-by: Fhaxaris <[email protected]> Co-authored-by: Dennok <[email protected]> Co-authored-by: MCHSL <[email protected]> Co-authored-by: Shayne Fitzgerald <[email protected]> Co-authored-by: Shayne Fitzgerald <[email protected]>
- Loading branch information
28 people
authored
Aug 18, 2020
1 parent
b861bf2
commit d8b3dcb