This repository was archived by the owner on Jan 24, 2020. It is now read-only.
Theta merge#50
Open
Archemagus wants to merge 163 commits into
Open
Conversation
updates master yet again
sbvlsfhbnkjsbzn
aivobcoabsv
Added pickup_sound and drop_sound to all componets using the provided sounds, they are not all unique sounds, and share the same sound files, but i think its a nice little addition, also added these sounds to the mousetrap as it fit nicely.
hey maintainers what the fuck how did you not pick up on this
* Custom Map Loading Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com> * hh Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com> * Use load_map_config instead of just setting next_map_config Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com> * Some small changes. Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com> * Checks if map is correct and don't return on empty shuttle. Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com> * Thank you VSCode, very cool Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com> * Added a map bounds check. Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com> * Moved the config reset and file removal to the end of loadWorld() Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com> * Actually set the next map to default. Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
kevinz in his infinite wisdom had two spear initialize procs, making his entire addition of borg jousting two years ago completely worthless
…me minor fixes. (#47578) AKA: This shit again. About The Pull Request So based on feedback I've been getting over the past month, the main issue with medical kiosks is that even as a roundstart, public medical analyzer, the cost on use at T1 isn't anywhere near helpful enough to warrant not breaking into medical storage and printing an analyzer. This go around I'm pretty much scrapping the dependence on upgrades in order to turn it into an economy reliant machine instead. Now featuring so much info with all 4 scans, I had to put them into tabs! Now, the machine begins with the full docket of information typically provided by the Advanced Medical Analyzer, but each section of information is an individual purchase. General Information is provided under "Patient Health", Issues where the player may realize something non-obvious is wrong can be found under "Symptom Based Checkup", and "Neuro/Radiological Scan" covers the host of Cellular/Radiation issues. As a means of alleviating concerns about having the whole host of advanced medical scanner information available round-start, I've bumped up the minimum cost for each scan type to 10 credits, so for the whole set of information it'll cost you about 40 credits. Quick video link showing how it works in practice: https://cdn.discordapp.com/attachments/184507411648741378/642437277632561182/2019-11-08_13-49-31.mp4 In addition to that, some sanity checks that were missing from the first couple PRs were added, so Ghosts and Borgs won't runtime trying to use a machine that only works on the living. Bugfixes from the first time (I am so sorry about the line spacing) Have a working, functional TGUI that shows all the old Kiosk information plus what you can get off of medical analyzers that I skipped over And these things if/when I get to it: Adds emagged functionality. Allow for crew to scan other crew using the machine. In the meantime this is SUPER DNM until at least those first 3 are ironed out. Why It's Good For The Game Helps to Enforce the Medical Kiosk as what I initially hoped it would function as, a money sink for Medbay. With the new budget changes, this means that crew who use the medical kiosk are actively paying every member of medbay. Additionally, the feedback I got from literally everyone I've talked to has been pretty universal: The medical kiosk is pretty much worthless to use, even at shift start, because it's not worth upgrading and by the time you DO upgrade it, you can just print your own medical analyzer and skip the whole process. Changelog cl add: Medical Kiosks now have more functionality available, including showing blood levels, virus information, and cumulative total health. add: You now now alt-click a Medical Kiosk to remove a medical scanner wand, so that you can scan someone else. add: Medical Kiosks now use TGUI-next. tweak: Now, the information in the medical kiosk is split up between 4 different scan types, General, Symptom based, Neuro/Radiologic, and Chemical Analysis scans. balance: Each medical kiosk scan costs a base 10 credits minimum. fix: Medical Kiosks don't runtime on ghosts and borgs anymore. /cl
…elay() (#47808) Gravity still needs a rewrite but at least it's a speed modification now. EDIT: And now it's the last one, goodbye movement_delay()! cl ninjanomnom fix: Gravity slowdown applies to all mobs instead of just humanoids tweak: If you're floating in high gravity somehow you're no longer slowed down /cl
Removes extra COMSIG_MOVABLE_HEAR signal for mobs
* Logs atmos port wrenching * swap.avi
* BSA beam delams the SM via a new signal Adds a BSA beam blocker element that blocks bluespace artillery beams. SM and singulo have it. * Shut up Travis * Destroy the singularity when it's BSA'd * No shooting nar-nar with BSA * Removed an incorrect and unhelpful comment
Traitor uplink search fix
* 1 * doc * Update code/game/objects/items/tools/wrench.dm Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com> * sdsd
…isting ones. (#47898) * Adds back sprites for the Particle Acceleration Rifle, and updates the back sprites for the combat and riot shotguns. * Adds adds a back slot icon for compact combat shotguns. * Adds a back slot icon for the surplus rifle. * Adds back slot icon for the Mosin Nagant and allows it to be worn on the back.
…47515) * cast proc edit I like these fringe interactions that punish you for trying something stupid in the hopes it does something game breaking. * dead project style *dabs* * cleaning up the code 1/2 * still needs work, fuu * Update code/modules/spells/spell_types/shapeshift.dm Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com> * fixes the check, once and for all * FINALLY * 😔 💯 Co-Authored-By: skoglol <skoglol@users.noreply.github.com> * even more improvements Co-Authored-By: skoglol <kriskog@users.noreply.github.com> * here we go
… people on lavaland if the whiteship lands. (#47596) * phase 1 * boxstation + meta polish * deltastation * delta * no whiteship doc * no tile coloring change * dme fix * seal region + move console * cleanup * small fixes
This reverts commit f45dd70.
This reverts commit 62847c1.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Anyone alive here?