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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keybindable emotes followup #47868

Merged
merged 2 commits into from
Nov 20, 2019

Conversation

ninjanomnom
Copy link
Member

@ninjanomnom ninjanomnom commented Nov 18, 2019

I hope you had your fun with unrestricted emote keybinds while they lasted because here's the fun removal pr.

🆑 ninjanomnom
fix: Keybound emotes now count as intentional. This means emotes that don't play a sound when you type the emote also don't play a sound when you use the keybinding.
fix: Emotes can no longer be stacked on one key.
tweak: Emotes have been given cooldowns. Each emote has their own cooldown so you can still do your flip and scream.
tweak: You can fall over if you try to flip too much.
/:cl:

fixes #47831

@tgstation-server tgstation-server added Fix Rewrites a bug so it appears in different circumstances Tweak labels Nov 18, 2019
@RaveRadbury
Copy link
Member

RaveRadbury commented Nov 18, 2019

I was really enjoying providing my own studio audience by spamming *laugh and *clap as clown.

@cacogen
Copy link
Contributor

cacogen commented Nov 18, 2019

The flip thing is lame imo, spamming it was already made a non-issue when they removed the message from it

@ninjanomnom
Copy link
Member Author

Blame action for that one, they made me think it'd be funny to fall over when you flip too fast

@TheVekter
Copy link
Contributor

Yeah, no, all of these are fantastic except for the flip thing. I enjoy being a spinning singularity from hell.

@optimumtact
Copy link
Member

having funny results from spamming is better than just not being able to do it all the time, which as a general rule of thumb is actually how things should be.

@kriskog
Copy link
Contributor

kriskog commented Nov 18, 2019

A couple smallish issues I noticed with the UI.
Scream and gnarl has two "unbound" buttons in addition to secondary.
Binding a key they unbinding it removes the option for adding secondary. This does not reset. (See point)
image

@ghost
Copy link

ghost commented Nov 18, 2019

flipping and falling would be great for clowns. But I don't think it's really needed for general crew-members.

@ATH1909
Copy link
Contributor

ATH1909 commented Nov 19, 2019

Could you reduce the cooldown for *spin to 0? It's fun to spin in place really quickly while waiting for something (like the emergency escape shuttle) with other people.

@ninjanomnom
Copy link
Member Author

@kriskog That doesn't look like something that could be caused by code in this pr and looks more likely to be an issue with save files.

@kriskog
Copy link
Contributor

kriskog commented Nov 19, 2019

Oh huh, yeah I assumed it was an emote thing but I see we got these issues on all the keybinds

@actioninja
Copy link
Member

honestly manual screaming and laughing are funny and should have been that way for a while. It's just the incessant spam to both audio and chat that gets old

@ShizCalev
Copy link
Member

Fixes #47831?

@actioninja
Copy link
Member

Semper sic emote

@actioninja actioninja merged commit 53952e7 into tgstation:master Nov 20, 2019
AustationBot referenced this pull request in austation/austation Nov 20, 2019
Keybindable emotes followup
@ninjanomnom ninjanomnom deleted the stop-all-your-emotin branch December 8, 2019 21:16
Gargule pushed a commit to Gargule/sigma that referenced this pull request Mar 27, 2020
* more sprites

* final

* Update limb_augmentation.dm

* what what

* Added Basic sounds to all componets. (igniter,infrared, ect)

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.

* fixes nitric acid

hey maintainers what the fuck how did you not pick up on this

* wallet sprites

* Custom (station) map loading for admin use. (tgstation#47778)

* 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>

* Automatic changelog generation for PR tgstation#47778 [ci skip]

* Fixes the issue of women on Charlie Station spawning with facial hair.

* cleans up spear initialize()

kevinz in his infinite wisdom had two spear initialize procs, making his entire addition of borg jousting two years ago completely worthless

* [READY]Medical Kiosks V3.0. New TGUI Interface, New functionality, some minor fixes. (tgstation#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

* Automatic changelog generation for PR tgstation#47578 [ci skip]

* Converts gravity slowdown into a movespeed mod and removes movement_delay() (tgstation#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

* Automatic changelog generation for PR tgstation#47808 [ci skip]

* Gives body back to owner on split personality death (tgstation#47809)

* Automatic changelog generation for PR tgstation#47809 [ci skip]

* Adds atmos port and tank swap logging (tgstation#47802)

* Logs atmos port wrenching

* swap.avi

* Automatic changelog generation for PR tgstation#47802 [ci skip]

* Fixes some admin lookups (tgstation#47806)

* Automatic changelog compile, [ci skip]

* Part 1 - Phantom Code

* Shooting a BSA beam at the SM will make it delaminate (tgstation#47748)

* 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

* Automatic changelog generation for PR tgstation#47748 [ci skip]

* Fixes runtime when cloudsyncing nanites without programs errors. (tgstation#47786)

* Only use implant radio with supported channels (tgstation#47790)

* Automatic changelog generation for PR tgstation#47790 [ci skip]

* Removes illegal tech from syndicate thrown weapons (tgstation#47820)

* Changes loot table to remove syndicate throwing items from gambling drop table
Removes illegal tech from Mateba revolver.

* Okay fine we'll do it this way

* Something something hugbox

* Automatic changelog generation for PR tgstation#47820 [ci skip]

* tgui-next: Turbine computer and station alert console (tgstation#47735)

* Turbine computer interface

* Station alert console

* requested chagne

* updated to master

* Automatic changelog generation for PR tgstation#47735 [ci skip]

* Automatic changelog generation for PR tgstation#47823 [ci skip]

* Adds international garbage day, a day to respect janitors everywhere

* Removes the non bitflag slot defines (tgstation#47742)

Removes the non bitflag slot defines

* Fixed

* more fix

* Wait, this is better in the use proc

* Removes an active turf.

* Fixes grammar issue in machine frame code.

* Add map icon states for the ED-209 (tgstation#47833)

* Fixes alignment of status tab (tgstation#47829)

* Automatic changelog generation for PR tgstation#47829 [ci skip]

* Fixes runtime when examining posibrains without radios (tgstation#47827)

* Cleans up observer mind on control transfer, ghosting, DNR, suicide (tgstation#47826)

* Fixes admin ghost drag

* Covers more cases

* And assume control

* Automatic changelog generation for PR tgstation#47826 [ci skip]

* You can only draw one blood rune at a time (tgstation#47717)

* you can only draw one rune at once

* oversight fix in runes

* Automatic changelog generation for PR tgstation#47717 [ci skip]

* Automatic changelog compile, [ci skip]

* Maintenance loot table revamp (tgstation#47646)

* new maint loot tables

* Loot spawn probability finder

* maint loot pool changes

* Automatic changelog generation for PR tgstation#47646 [ci skip]

* borg buckle nerf (tgstation#47851)

* borg buckle nerf

* half a second

* Automatic changelog generation for PR tgstation#47851 [ci skip]

* Biodegrade dissolves legcuffs (tgstation#47845)

* Automatic changelog generation for PR tgstation#47845 [ci skip]

* Fixes storage slot items slowing you down (tgstation#47830)

* Automatic changelog generation for PR tgstation#47830 [ci skip]

* Fixes bola slowdown (tgstation#47847)

Because for some reason you can drop an item without a mob to do the dropping.

* Automatic changelog generation for PR tgstation#47847 [ci skip]

* Update description of Sonic Jackhammer (tgstation#47843)

tgstation#46019 Removed the demolition of walls with the sonic jackhammer.
However its description still says that it can remove walls.

* Automatic changelog generation for PR tgstation#47843 [ci skip]

* Ling clothes delete properly on dismember (tgstation#47844)

* Automatic changelog generation for PR tgstation#47844 [ci skip]

* Automatic changelog generation for PR tgstation#47846 [ci skip]

* Automatic changelog generation for PR tgstation#47824 [ci skip]

* unga bunga me make code more efficient

Efficiency changes

* Forgot one

Forgot one

* Automatic changelog generation for PR tgstation#47680 [ci skip]

* Automatic changelog generation for PR tgstation#47721 [ci skip]

* Automatic changelog compile, [ci skip]

* Fixes travis issue

* Adds National Hot Dog Day to the holidays list.

* Part 2 - Shitcode Tendency

* Automatic changelog generation for PR tgstation#47837 [ci skip]

* oops

* Makes the hypnosis text color animation smoother

* Automatic changelog compile, [ci skip]

* Keybindable emotes followup (tgstation#47868)

Keybindable emotes followup

* Automatic changelog generation for PR tgstation#47868 [ci skip]

* Borg spinning no longer stuns. (tgstation#47866)

* Automatic changelog generation for PR tgstation#47866 [ci skip]

* Automatic changelog compile, [ci skip]

* Adds a new server restart option: regular restart with a custom delay time (tgstation#47870)

* Adds a new server restart option: soft restart with a custom delay time

* cancel returns

* Automatic changelog generation for PR tgstation#47870 [ci skip]

* Add files via upload

* Updated license for title0.ogg

* More NtOS interfaces, random fixes, client-side theming (tgstation#47836)

* General tgui fixes

* Handle ui_style on client side

* NtOS Net Downloader

* Rebuild tgui

* Fix regression on Tabs

* Fix bools

* Automatic changelog generation for PR tgstation#47836 [ci skip]

* Automatic changelog generation for PR tgstation#47813 [ci skip]

* Some small random tgui-next uis (tgstation#47712)

* dna vault

* engraved messages

* holodeck

* fix

* remove unusued imports

* spawners menu

* small tweak

* </b>

* rebuild

* Automatic changelog generation for PR tgstation#47712 [ci skip]

* uplink (tgstation#47727)

small tweaks

proper theme

search + input bar theming

properly functional input theme

rebuild

* Automatic changelog generation for PR tgstation#47727 [ci skip]

* Cobbduceus: Healing lvl? (Medical Skill) (tgstation#47538)

* b

* helps to commit huh

* math is hard

* parenthesis are even harder

* Update code/datums/skills/_skill.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* removes efficiency... or efficacy 😏

* baby sha... i mean files

* Automatic changelog generation for PR tgstation#47538 [ci skip]

* Automatic changelog generation for PR tgstation#47888 [ci skip]

* uplink fixes

* Automatic changelog generation for PR tgstation#47917 [ci skip]

* Automatic changelog generation for PR tgstation#47880 [ci skip]

* Automatic changelog generation for PR tgstation#47904 [ci skip]

* Automatic changelog generation for PR tgstation#47892 [ci skip]

* Automatic changelog compile, [ci skip]

* tgui-next: Tank, spaceheater and some touchups (tgstation#47887)

* Tank + spaceheater + touchups

* Mint update

* Automatic changelog generation for PR tgstation#47887 [ci skip]

* Portals no longer use hascall. (tgstation#47889)

* Portals no longer use hascall.

* noop

* comment removals

* Nanite timer rework and general code improvements (tgstation#47745)

* Automatic changelog generation for PR tgstation#47745 [ci skip]

* Fixes chem filter ui not opening. (tgstation#47930)

* Automatic changelog generation for PR tgstation#47930 [ci skip]

* uplink search fix

* More lollipop / plunger runtime fixes (tgstation#47916)

* Automatic changelog generation for PR tgstation#47931 [ci skip]

* medical wrench no longer dupes on suicide (tgstation#47744)

* 1

* doc

* Update code/game/objects/items/tools/wrench.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* sdsd

* Automatic changelog generation for PR tgstation#47744 [ci skip]

* Adds several new back slot icons for guns, while also updating two existing ones. (tgstation#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.

* Automatic changelog generation for PR tgstation#47898 [ci skip]

* [READY] shapeshifting in a pipe violently kills you: I WON EDITION (tgstation#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

* Automatic changelog generation for PR tgstation#47515 [ci skip]

* emBALming fluid (tgstation#47770)

* Automatic changelog generation for PR tgstation#47770 [ci skip]

* fixes limb updating (tgstation#47926)

* Automatic changelog generation for PR tgstation#47926 [ci skip]

* Relocates the mining shuttle so it stops spamming errors and trapping people on lavaland if the whiteship lands. (tgstation#47596)

* phase 1

* boxstation + meta polish

* deltastation

* delta

* no whiteship doc

* no tile coloring change

* dme fix

* seal region + move console

* cleanup

* small fixes

* Automatic changelog generation for PR tgstation#47596 [ci skip]

* Фиксим мерж

* Revert "Фиксим мерж"

This reverts commit f45dd704c1c818037e65aac0653f8e179bbf466e.

* Revert "Revert "Фиксим мерж""

This reverts commit 62847c1447e4584b9e1b0fbc17d43a9490533cd0.

* Ебать конем ТГ
Gargule pushed a commit to Gargule/sigma that referenced this pull request Mar 27, 2020
* more sprites

* final

* Update limb_augmentation.dm

* what what

* Added Basic sounds to all componets. (igniter,infrared, ect)

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.

* fixes nitric acid

hey maintainers what the fuck how did you not pick up on this

* wallet sprites

* Custom (station) map loading for admin use. (tgstation#47778)

* 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>

* Automatic changelog generation for PR tgstation#47778 [ci skip]

* Fixes the issue of women on Charlie Station spawning with facial hair.

* cleans up spear initialize()

kevinz in his infinite wisdom had two spear initialize procs, making his entire addition of borg jousting two years ago completely worthless

* [READY]Medical Kiosks V3.0. New TGUI Interface, New functionality, some minor fixes. (tgstation#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

* Automatic changelog generation for PR tgstation#47578 [ci skip]

* Converts gravity slowdown into a movespeed mod and removes movement_delay() (tgstation#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

* Automatic changelog generation for PR tgstation#47808 [ci skip]

* Gives body back to owner on split personality death (tgstation#47809)

* Automatic changelog generation for PR tgstation#47809 [ci skip]

* Adds atmos port and tank swap logging (tgstation#47802)

* Logs atmos port wrenching

* swap.avi

* Automatic changelog generation for PR tgstation#47802 [ci skip]

* Fixes some admin lookups (tgstation#47806)

* Automatic changelog compile, [ci skip]

* Part 1 - Phantom Code

* Shooting a BSA beam at the SM will make it delaminate (tgstation#47748)

* 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

* Automatic changelog generation for PR tgstation#47748 [ci skip]

* Fixes runtime when cloudsyncing nanites without programs errors. (tgstation#47786)

* Only use implant radio with supported channels (tgstation#47790)

* Automatic changelog generation for PR tgstation#47790 [ci skip]

* Removes illegal tech from syndicate thrown weapons (tgstation#47820)

* Changes loot table to remove syndicate throwing items from gambling drop table
Removes illegal tech from Mateba revolver.

* Okay fine we'll do it this way

* Something something hugbox

* Automatic changelog generation for PR tgstation#47820 [ci skip]

* tgui-next: Turbine computer and station alert console (tgstation#47735)

* Turbine computer interface

* Station alert console

* requested chagne

* updated to master

* Automatic changelog generation for PR tgstation#47735 [ci skip]

* Automatic changelog generation for PR tgstation#47823 [ci skip]

* Adds international garbage day, a day to respect janitors everywhere

* Removes the non bitflag slot defines (tgstation#47742)

Removes the non bitflag slot defines

* Fixed

* more fix

* Wait, this is better in the use proc

* Removes an active turf.

* Fixes grammar issue in machine frame code.

* Add map icon states for the ED-209 (tgstation#47833)

* Fixes alignment of status tab (tgstation#47829)

* Automatic changelog generation for PR tgstation#47829 [ci skip]

* Fixes runtime when examining posibrains without radios (tgstation#47827)

* Cleans up observer mind on control transfer, ghosting, DNR, suicide (tgstation#47826)

* Fixes admin ghost drag

* Covers more cases

* And assume control

* Automatic changelog generation for PR tgstation#47826 [ci skip]

* You can only draw one blood rune at a time (tgstation#47717)

* you can only draw one rune at once

* oversight fix in runes

* Automatic changelog generation for PR tgstation#47717 [ci skip]

* Automatic changelog compile, [ci skip]

* Maintenance loot table revamp (tgstation#47646)

* new maint loot tables

* Loot spawn probability finder

* maint loot pool changes

* Automatic changelog generation for PR tgstation#47646 [ci skip]

* borg buckle nerf (tgstation#47851)

* borg buckle nerf

* half a second

* Automatic changelog generation for PR tgstation#47851 [ci skip]

* Biodegrade dissolves legcuffs (tgstation#47845)

* Automatic changelog generation for PR tgstation#47845 [ci skip]

* Fixes storage slot items slowing you down (tgstation#47830)

* Automatic changelog generation for PR tgstation#47830 [ci skip]

* Fixes bola slowdown (tgstation#47847)

Because for some reason you can drop an item without a mob to do the dropping.

* Automatic changelog generation for PR tgstation#47847 [ci skip]

* Update description of Sonic Jackhammer (tgstation#47843)

tgstation#46019 Removed the demolition of walls with the sonic jackhammer.
However its description still says that it can remove walls.

* Automatic changelog generation for PR tgstation#47843 [ci skip]

* Ling clothes delete properly on dismember (tgstation#47844)

* Automatic changelog generation for PR tgstation#47844 [ci skip]

* Automatic changelog generation for PR tgstation#47846 [ci skip]

* Automatic changelog generation for PR tgstation#47824 [ci skip]

* unga bunga me make code more efficient

Efficiency changes

* Forgot one

Forgot one

* Automatic changelog generation for PR tgstation#47680 [ci skip]

* Automatic changelog generation for PR tgstation#47721 [ci skip]

* Automatic changelog compile, [ci skip]

* Fixes travis issue

* Adds National Hot Dog Day to the holidays list.

* Part 2 - Shitcode Tendency

* Automatic changelog generation for PR tgstation#47837 [ci skip]

* oops

* Makes the hypnosis text color animation smoother

* Automatic changelog compile, [ci skip]

* Keybindable emotes followup (tgstation#47868)

Keybindable emotes followup

* Automatic changelog generation for PR tgstation#47868 [ci skip]

* Borg spinning no longer stuns. (tgstation#47866)

* Automatic changelog generation for PR tgstation#47866 [ci skip]

* Automatic changelog compile, [ci skip]

* Adds a new server restart option: regular restart with a custom delay time (tgstation#47870)

* Adds a new server restart option: soft restart with a custom delay time

* cancel returns

* Automatic changelog generation for PR tgstation#47870 [ci skip]

* Add files via upload

* Updated license for title0.ogg

* More NtOS interfaces, random fixes, client-side theming (tgstation#47836)

* General tgui fixes

* Handle ui_style on client side

* NtOS Net Downloader

* Rebuild tgui

* Fix regression on Tabs

* Fix bools

* Automatic changelog generation for PR tgstation#47836 [ci skip]

* Automatic changelog generation for PR tgstation#47813 [ci skip]

* Some small random tgui-next uis (tgstation#47712)

* dna vault

* engraved messages

* holodeck

* fix

* remove unusued imports

* spawners menu

* small tweak

* </b>

* rebuild

* Automatic changelog generation for PR tgstation#47712 [ci skip]

* uplink (tgstation#47727)

small tweaks

proper theme

search + input bar theming

properly functional input theme

rebuild

* Automatic changelog generation for PR tgstation#47727 [ci skip]

* Cobbduceus: Healing lvl? (Medical Skill) (tgstation#47538)

* b

* helps to commit huh

* math is hard

* parenthesis are even harder

* Update code/datums/skills/_skill.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* removes efficiency... or efficacy 😏

* baby sha... i mean files

* Automatic changelog generation for PR tgstation#47538 [ci skip]

* Automatic changelog generation for PR tgstation#47888 [ci skip]

* uplink fixes

* Automatic changelog generation for PR tgstation#47917 [ci skip]

* Automatic changelog generation for PR tgstation#47880 [ci skip]

* Automatic changelog generation for PR tgstation#47904 [ci skip]

* Automatic changelog generation for PR tgstation#47892 [ci skip]

* Automatic changelog compile, [ci skip]

* tgui-next: Tank, spaceheater and some touchups (tgstation#47887)

* Tank + spaceheater + touchups

* Mint update

* Automatic changelog generation for PR tgstation#47887 [ci skip]

* Portals no longer use hascall. (tgstation#47889)

* Portals no longer use hascall.

* noop

* comment removals

* Nanite timer rework and general code improvements (tgstation#47745)

* Automatic changelog generation for PR tgstation#47745 [ci skip]

* Fixes chem filter ui not opening. (tgstation#47930)

* Automatic changelog generation for PR tgstation#47930 [ci skip]

* uplink search fix

* More lollipop / plunger runtime fixes (tgstation#47916)

* Automatic changelog generation for PR tgstation#47931 [ci skip]

* medical wrench no longer dupes on suicide (tgstation#47744)

* 1

* doc

* Update code/game/objects/items/tools/wrench.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* sdsd

* Automatic changelog generation for PR tgstation#47744 [ci skip]

* Adds several new back slot icons for guns, while also updating two existing ones. (tgstation#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.

* Automatic changelog generation for PR tgstation#47898 [ci skip]

* [READY] shapeshifting in a pipe violently kills you: I WON EDITION (tgstation#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

* Automatic changelog generation for PR tgstation#47515 [ci skip]

* emBALming fluid (tgstation#47770)

* Automatic changelog generation for PR tgstation#47770 [ci skip]

* fixes limb updating (tgstation#47926)

* Automatic changelog generation for PR tgstation#47926 [ci skip]

* Relocates the mining shuttle so it stops spamming errors and trapping people on lavaland if the whiteship lands. (tgstation#47596)

* phase 1

* boxstation + meta polish

* deltastation

* delta

* no whiteship doc

* no tile coloring change

* dme fix

* seal region + move console

* cleanup

* small fixes

* Automatic changelog generation for PR tgstation#47596 [ci skip]

* Фиксим мерж

* Revert "Фиксим мерж"

This reverts commit f45dd704c1c818037e65aac0653f8e179bbf466e.

* Revert "Revert "Фиксим мерж""

This reverts commit 62847c1447e4584b9e1b0fbc17d43a9490533cd0.

* Ебать конем ТГ

* Merge remote-tracking branch 'TGstation/master' into theta-merge

* TGshniki
Gargule pushed a commit to Gargule/sigma that referenced this pull request Mar 27, 2020
* more sprites

* final

* Update limb_augmentation.dm

* what what

* Added Basic sounds to all componets. (igniter,infrared, ect)

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.

* fixes nitric acid

hey maintainers what the fuck how did you not pick up on this

* wallet sprites

* Custom (station) map loading for admin use. (tgstation#47778)

* 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>

* Automatic changelog generation for PR tgstation#47778 [ci skip]

* Fixes the issue of women on Charlie Station spawning with facial hair.

* cleans up spear initialize()

kevinz in his infinite wisdom had two spear initialize procs, making his entire addition of borg jousting two years ago completely worthless

* [READY]Medical Kiosks V3.0. New TGUI Interface, New functionality, some minor fixes. (tgstation#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

* Automatic changelog generation for PR tgstation#47578 [ci skip]

* Converts gravity slowdown into a movespeed mod and removes movement_delay() (tgstation#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

* Automatic changelog generation for PR tgstation#47808 [ci skip]

* Gives body back to owner on split personality death (tgstation#47809)

* Automatic changelog generation for PR tgstation#47809 [ci skip]

* Adds atmos port and tank swap logging (tgstation#47802)

* Logs atmos port wrenching

* swap.avi

* Automatic changelog generation for PR tgstation#47802 [ci skip]

* Fixes some admin lookups (tgstation#47806)

* Automatic changelog compile, [ci skip]

* Part 1 - Phantom Code

* Shooting a BSA beam at the SM will make it delaminate (tgstation#47748)

* 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

* Automatic changelog generation for PR tgstation#47748 [ci skip]

* Fixes runtime when cloudsyncing nanites without programs errors. (tgstation#47786)

* Only use implant radio with supported channels (tgstation#47790)

* Automatic changelog generation for PR tgstation#47790 [ci skip]

* Removes illegal tech from syndicate thrown weapons (tgstation#47820)

* Changes loot table to remove syndicate throwing items from gambling drop table
Removes illegal tech from Mateba revolver.

* Okay fine we'll do it this way

* Something something hugbox

* Automatic changelog generation for PR tgstation#47820 [ci skip]

* tgui-next: Turbine computer and station alert console (tgstation#47735)

* Turbine computer interface

* Station alert console

* requested chagne

* updated to master

* Automatic changelog generation for PR tgstation#47735 [ci skip]

* Automatic changelog generation for PR tgstation#47823 [ci skip]

* Adds international garbage day, a day to respect janitors everywhere

* Removes the non bitflag slot defines (tgstation#47742)

Removes the non bitflag slot defines

* Fixed

* more fix

* Wait, this is better in the use proc

* Removes an active turf.

* Fixes grammar issue in machine frame code.

* Add map icon states for the ED-209 (tgstation#47833)

* Fixes alignment of status tab (tgstation#47829)

* Automatic changelog generation for PR tgstation#47829 [ci skip]

* Fixes runtime when examining posibrains without radios (tgstation#47827)

* Cleans up observer mind on control transfer, ghosting, DNR, suicide (tgstation#47826)

* Fixes admin ghost drag

* Covers more cases

* And assume control

* Automatic changelog generation for PR tgstation#47826 [ci skip]

* You can only draw one blood rune at a time (tgstation#47717)

* you can only draw one rune at once

* oversight fix in runes

* Automatic changelog generation for PR tgstation#47717 [ci skip]

* Automatic changelog compile, [ci skip]

* Maintenance loot table revamp (tgstation#47646)

* new maint loot tables

* Loot spawn probability finder

* maint loot pool changes

* Automatic changelog generation for PR tgstation#47646 [ci skip]

* borg buckle nerf (tgstation#47851)

* borg buckle nerf

* half a second

* Automatic changelog generation for PR tgstation#47851 [ci skip]

* Biodegrade dissolves legcuffs (tgstation#47845)

* Automatic changelog generation for PR tgstation#47845 [ci skip]

* Fixes storage slot items slowing you down (tgstation#47830)

* Automatic changelog generation for PR tgstation#47830 [ci skip]

* Fixes bola slowdown (tgstation#47847)

Because for some reason you can drop an item without a mob to do the dropping.

* Automatic changelog generation for PR tgstation#47847 [ci skip]

* Update description of Sonic Jackhammer (tgstation#47843)

tgstation#46019 Removed the demolition of walls with the sonic jackhammer.
However its description still says that it can remove walls.

* Automatic changelog generation for PR tgstation#47843 [ci skip]

* Ling clothes delete properly on dismember (tgstation#47844)

* Automatic changelog generation for PR tgstation#47844 [ci skip]

* Automatic changelog generation for PR tgstation#47846 [ci skip]

* Automatic changelog generation for PR tgstation#47824 [ci skip]

* unga bunga me make code more efficient

Efficiency changes

* Forgot one

Forgot one

* Automatic changelog generation for PR tgstation#47680 [ci skip]

* Automatic changelog generation for PR tgstation#47721 [ci skip]

* Automatic changelog compile, [ci skip]

* Fixes travis issue

* Adds National Hot Dog Day to the holidays list.

* Part 2 - Shitcode Tendency

* Automatic changelog generation for PR tgstation#47837 [ci skip]

* oops

* Makes the hypnosis text color animation smoother

* Automatic changelog compile, [ci skip]

* Keybindable emotes followup (tgstation#47868)

Keybindable emotes followup

* Automatic changelog generation for PR tgstation#47868 [ci skip]

* Borg spinning no longer stuns. (tgstation#47866)

* Automatic changelog generation for PR tgstation#47866 [ci skip]

* Automatic changelog compile, [ci skip]

* Adds a new server restart option: regular restart with a custom delay time (tgstation#47870)

* Adds a new server restart option: soft restart with a custom delay time

* cancel returns

* Automatic changelog generation for PR tgstation#47870 [ci skip]

* Add files via upload

* Updated license for title0.ogg

* More NtOS interfaces, random fixes, client-side theming (tgstation#47836)

* General tgui fixes

* Handle ui_style on client side

* NtOS Net Downloader

* Rebuild tgui

* Fix regression on Tabs

* Fix bools

* Automatic changelog generation for PR tgstation#47836 [ci skip]

* Automatic changelog generation for PR tgstation#47813 [ci skip]

* Some small random tgui-next uis (tgstation#47712)

* dna vault

* engraved messages

* holodeck

* fix

* remove unusued imports

* spawners menu

* small tweak

* </b>

* rebuild

* Automatic changelog generation for PR tgstation#47712 [ci skip]

* uplink (tgstation#47727)

small tweaks

proper theme

search + input bar theming

properly functional input theme

rebuild

* Automatic changelog generation for PR tgstation#47727 [ci skip]

* Cobbduceus: Healing lvl? (Medical Skill) (tgstation#47538)

* b

* helps to commit huh

* math is hard

* parenthesis are even harder

* Update code/datums/skills/_skill.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* removes efficiency... or efficacy 😏

* baby sha... i mean files

* Automatic changelog generation for PR tgstation#47538 [ci skip]

* Automatic changelog generation for PR tgstation#47888 [ci skip]

* uplink fixes

* Automatic changelog generation for PR tgstation#47917 [ci skip]

* Automatic changelog generation for PR tgstation#47880 [ci skip]

* Automatic changelog generation for PR tgstation#47904 [ci skip]

* Automatic changelog generation for PR tgstation#47892 [ci skip]

* Automatic changelog compile, [ci skip]

* tgui-next: Tank, spaceheater and some touchups (tgstation#47887)

* Tank + spaceheater + touchups

* Mint update

* Automatic changelog generation for PR tgstation#47887 [ci skip]

* Portals no longer use hascall. (tgstation#47889)

* Portals no longer use hascall.

* noop

* comment removals

* Nanite timer rework and general code improvements (tgstation#47745)

* Automatic changelog generation for PR tgstation#47745 [ci skip]

* Fixes chem filter ui not opening. (tgstation#47930)

* Automatic changelog generation for PR tgstation#47930 [ci skip]

* uplink search fix

* More lollipop / plunger runtime fixes (tgstation#47916)

* Automatic changelog generation for PR tgstation#47931 [ci skip]

* medical wrench no longer dupes on suicide (tgstation#47744)

* 1

* doc

* Update code/game/objects/items/tools/wrench.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* sdsd

* Automatic changelog generation for PR tgstation#47744 [ci skip]

* Adds several new back slot icons for guns, while also updating two existing ones. (tgstation#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.

* Automatic changelog generation for PR tgstation#47898 [ci skip]

* [READY] shapeshifting in a pipe violently kills you: I WON EDITION (tgstation#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

* Automatic changelog generation for PR tgstation#47515 [ci skip]

* emBALming fluid (tgstation#47770)

* Automatic changelog generation for PR tgstation#47770 [ci skip]

* fixes limb updating (tgstation#47926)

* Automatic changelog generation for PR tgstation#47926 [ci skip]

* Relocates the mining shuttle so it stops spamming errors and trapping people on lavaland if the whiteship lands. (tgstation#47596)

* phase 1

* boxstation + meta polish

* deltastation

* delta

* no whiteship doc

* no tile coloring change

* dme fix

* seal region + move console

* cleanup

* small fixes

* Automatic changelog generation for PR tgstation#47596 [ci skip]

* Фиксим мерж

* Revert "Фиксим мерж"

This reverts commit f45dd704c1c818037e65aac0653f8e179bbf466e.

* Revert "Revert "Фиксим мерж""

This reverts commit 62847c1447e4584b9e1b0fbc17d43a9490533cd0.

* Ебать конем ТГ

* Merge remote-tracking branch 'TGstation/master' into theta-merge

* TGshniki

* Merge remote-tracking branch 'TGstation/master' into theta-merge

* Чиним трубы
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Rewrites a bug so it appears in different circumstances
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Crashing clients and inducing lag with the new emotes (binding same key to emotes multiple times)