Commit Graph

6066 Commits

Author SHA1 Message Date
necromanceranne
044f065a68 bullet swatting 2020-02-24 12:23:10 +11:00
Ryll-Ryll
33d2628c34 spacing and correcting comments 2020-02-23 07:03:01 -05:00
necromanceranne
dc3a5b33cb Some additional adjustments 2020-02-23 22:50:50 +11:00
Ryll-Ryll
7e384752e6 moves topic, cleans code, adds sticky tape to maint loot 2020-02-23 06:50:18 -05:00
necromanceranne
fd810e30f2 Merge branch 'master' into let-sleeping-carp-lie 2020-02-23 22:16:56 +11:00
necromanceranne
1dcf24306c current work 2020-02-23 22:01:37 +11:00
Unit2E
488cf996b9 headset uplink code is weird and this fixes a null 2020-02-23 03:17:15 +01:00
Ryll-Ryll
0ecd64c74d e 2020-02-22 04:27:17 -05:00
necromanceranne
3c06b9140d still not finished 2020-02-22 20:06:51 +11:00
necromanceranne
e6388ec433 eh not so keen on this after all even if it did work 2020-02-22 19:55:25 +11:00
Ryll-Ryll
cb3b82bdc1 lets you update embedding behavior, also makes red pens faster 2020-02-22 02:15:19 -05:00
Unit2E
230d343686 Adds owner of uplink to logs. 2020-02-22 05:19:57 +01:00
Unit2E
b73fddfb28 adds logging for uplink horribly. 2020-02-22 04:04:27 +01:00
EgorDinamit
a57808f45d Merge branch 'master' into master 2020-02-21 21:23:07 +04:00
kevinz000
df38abf7a1 Merge branch 'master' into movespeed_modifiers_take_two 2020-02-21 01:38:09 -07:00
necromanceranne
5e6425ecaf aaah 2020-02-21 19:23:52 +11:00
Mickyan
cebc8d428e Merge branch 'master' of https://github.com/tgstation/tgstation into chewing_gum 2020-02-20 16:09:01 +01:00
Bobbahbrown
476399a346 the span of these changes is immense (#49432) 2020-02-20 13:48:13 +01:00
spookydonut
6401ba5708 Merge pull request #49421 from ShizCalev/define-cleanup
Cleans up redundant math defines
2020-02-20 19:32:36 +08:00
EgorDinamit
af5f27b5ef Merge branch 'master' of git://github.com/tgstation/tgstation 2020-02-20 14:57:21 +04:00
AffectedArc07
0315245729 Adds in discord auto-roling (#49374)
About The Pull Request

When a user successfully links their BYOND accounts and discord accounts, they will now be automatically roled, based on config settings.

NOTE: This does not update pre-linked accounts, but I can write an external bot to do that if needed

RUST-G has also been updated in this PR, to be inline with this PR over at RUST-G tgstation/rust-g#23

Why It's Good For The Game

People with linked accounts can now be given a specific role in the discord, which is good for verification.
Changelog

🆑 AffectedArc07
add: Linking your discord and BYOND accounts will now give you a role in the discord
/🆑
2020-02-20 22:37:14 +13:00
necromanceranne
188e9167cc few more changes 2020-02-19 23:35:25 +11:00
necromanceranne
739a4b9084 working hard or hardly working just like this code probably 2020-02-19 22:08:58 +11:00
EgorDinamit
da1bbd2b0a Merge branch 'master' into master 2020-02-19 10:00:26 +04:00
ShizCalev
7a24755696 Merge pull request #49393 from kriskog/keybinds
Forces basic keybind reset, fixes some older savefile issues.
2020-02-18 22:43:04 -05:00
ShizCalev
17d94aa57e Merge pull request #49362 from nightred/spacesuitbug
Several Spacesuit bug fixes
2020-02-18 22:39:40 -05:00
kevinz000
851f5f2939 Merge remote-tracking branch 'tgstation/master' into movespeed_modifiers_take_two 2020-02-18 16:44:19 -07:00
kevinz000
8f1a1a586d woops 2020-02-18 03:59:39 -07:00
kevinz000
6dc2f47411 better idea 2020-02-18 03:59:28 -07:00
EgorDinamit
e3fd3c1ac0 Merge branch 'master' into master 2020-02-18 11:32:19 +04:00
TheVekter
572be45c12 Adds the Vibebot (#49251)
* Adds the Vibebot and associated files

* Refactored code

* Further code fixes

* Fixed UI issue

* See last commit

* god why

* Fixed bug related to color priority
2020-02-18 08:25:02 +01:00
Ryll-Ryll
8566aa8d60 still gotta figure out how to update embedding stats on the fly 2020-02-18 02:06:35 -05:00
Ryll-Ryll
1fae3d4c22 new beginnings 2020-02-18 02:06:35 -05:00
kevinz000
8d16c25825 these need ids 2020-02-18 00:06:12 -07:00
ShizCalev
7209ac3c93 Removes unnessacary math defines 2020-02-17 23:09:09 -05:00
ShizCalev
fcf32c3d2d Merge pull request #49399 from AnturK/512begone
Drops 512 support.
2020-02-17 22:52:47 -05:00
81Denton
3858591c78 Merge pull request #48965 from XDTM/MorQuantum
Adds the quantum alignment special brain trauma
2020-02-17 23:46:26 +01:00
XDTM
99500d05e0 Adds the Enhanced Interrogation Chamber as a BEPIS tech node (#49047)
About The Pull Request

Adds the Enhanced Interrogation Chamber as a BEPIS reward.

This security-only machine is able to implant a deep-rooted trigger phrase onto a subject; if they hear that phrase after the procedure, they will immediately enter a state of hypnotic trance, which can be used to demand truthful answers for your ongoing investigation.

The enslavement of criminal and non-criminal subjects is frowned upon by space law. Do not abuse the Enhanced Interrogation Chamber for personal gain.
Bad choice or mishandling of trigger words may lead to loss of control over the subject.

Side effects include dizziness, nausea, confusion, vomit, loss of eyesight, violent tendencies, loss of sanity, depression, oppression, loss of free will, spontaneous hypnotic trance, loss of hair, death.
Use with care.
Why It's Good For The Game

Make your own Manchurian Candidate!

Allows "rehabilitation" of dangerous criminals by security, which is more interesting than straight-up execution.
Could lead to fun situations if a team antag is caught and forced to be a mole.
It could also be used by any antag who manages to get to the sec protolathe.

However, the "conversion" is still shaky! The main cure is surgery, as the triggered trance is effectively just a brain trauma, healable with surgery. On top of this, even if the subject is unable to hear their trigger phrase, if someone else knows it they can override commands at any time. Even if that doesn't happen, it's possible that another message sneaks in before you can give your command, intercepting the hypnosis.
On top of this, the chamber has a 10% chance of giving the hypnotic stupor trauma instead of the triggered trance, making the subject even more of a wildcard.

Effectively, this is a very powerful tool in the antag-vs-security conflict, but over-reliance on it will probably bite back in amusing ways.
Changelog

cl
add: Added the Enhanced Interrogation Chamber as a BEPIS researchable tech.
add: The EIC can be used to implant trigger phrases in subjects that cause an instant hypnotic trance.
/cl
2020-02-18 09:34:14 +13:00
nightred
35cea2de35 fixed the return, it was just wrong 2020-02-17 09:35:45 -06:00
nightred
f9e11dc58e now with signals, and other cleanups 2020-02-17 09:35:45 -06:00
nightred
d8344a5a60 clean that up a bit 2020-02-17 09:34:21 -06:00
nightred
f9fa5acb4f action button is a thing i have to deal with now 2020-02-17 09:34:21 -06:00
JJRcop
a1392847bd Remove ismovableatom macro (#9) 2020-02-17 15:03:16 +01:00
kevinz000
256d20cde0 Merge remote-tracking branch 'tgstation/master' into movespeed_modifiers_take_two 2020-02-17 05:50:27 -07:00
EgorDinamit
e580900b63 Merge branch 'master' into master 2020-02-17 14:57:50 +04:00
Time-Green
980837fc79 PLUMBING: Lavaland geysers, pumps and regrettable balance decisions! (#49067)
Implements the geysers and pumps I originally added along with the first draft of plumbing.

Geysers
A geyser can be plungered with a reinforced plunger to activate. At wich point, it'll either produce clf3, hollow water, protozine or rarely wittel.

Pumps
Adds the liquid pump to the plumbing RCD. Place on an active geyser and wrench it to start pumping the geyser of its delicious juicess. I also changed it to not use power, because it would be awful drawing kilometer long wires along with the ducts.

Chems
Hollow water works basically like blood and mutage, where you can mix it with 1 unit of holy water for more holy water.

Protozine has a .2 healing, down from omnizine's .5. The healing is just kind of a side thing and not really what this chem was implemented for.

If it wasn't obvious, this allows chemists to industrialize strange reagent creation, with hollow water being able to create limitless holy water alongside protozine being a valid replacement for omnizine. Getting 2 geysers with those chems and on lavaland is quite the hassle, and you still need to get some holy water from the chaplain as kickstarter. I honestly think this is fine, and otherwise I could add a unique botany catalyst, so they don't become useless in the process.

Wittel
Adds wittel, wich is rare. Does nothing, but can be processed into two fun/regrettable chems.

Adds gravitum. Metabolizes very slowly. Drinking it makes you weightless, and spraying it makes that object temporarily weightless. Make 10u by mixing 1 wittel with 10 sorium

Adds metalgen. Created by mixing it with mutagen and bluespace powder. Must then be mixed with 40u of a powedered material and 1u of liquid dark matter.
The material used becomes imprinted on the chem. It can then be applied to anything, except mobs, to turn it into that material. Radiation is bad, and no you can't turn the nuke into plasma to blow it up.
The chem is difficult to get and use, but it can turn the escape shuttle into solid gold wich looks really cool. You could also turn it into plasma and vaporize everything. It can be used to, with some effort, duplicate materials.

🆑
add: Adds geysers to lavaland! They can be activated by using a reinforced plunger found in the medical vendor. They can be harvested by using a new plumbing device, magically powered liquid pumps!
add: Adds Hollow Water to geysers, wich can be combined with Holy Water as catalyst for more Holy Water
add: Adds Protozine to geyers, a very weak version of Omnizine. Can be used in Strange Reagent mixing
add: Adds Wittel, a very rare geyser chem. Can be processed into gravitum, wich removes gravity. Can also be processed into metalgen, wich has a strange tendency to transform objects into the imprinted material.
/🆑

Why:
This is what I originally wanted to do. The idea was to have a lot more chems, but I can't focus on one thing for that long. Hopefully this'll empower the bored chemist and make the rounds just that more interesting. Hopefully this'll spark the creation of some other geyser chems aswell.

That and makes shaft miners not the only ones hunting on lavaland.
2020-02-17 21:33:19 +13:00
EgorDinamit
801e32b397 Merge branch 'master' into master 2020-02-17 09:19:15 +04:00
Emmett Gaines
9e34b3d6a1 Supports named arguments in AddComponent and AddElement (#49098)
AddComponent/AddElement now support named arguments. This requires passing around an argument list instead of using actual proc args which a bit gross but we can blame byond for forcing this.

InheritComponent uses mirrored init arguments instead of an argument list which means no more accessing it via index to get to the same arguments as in init.

As a small bonus I restructured dcs defines to be a bit more manageable. Mainly just splits them into separate files and gives them their own folder.
2020-02-17 17:57:52 +13:00
JJRcop
163c463b27 Stasis supports multiple sources (#49237)
* Add grouped status effect
This status effect can be applied by multiple sources
Will not be removed until all sources remove themselves

* Stasis is now a grouped status effect
2020-02-16 18:03:06 -08:00
Mickyan
56d08f9908 space drugs 2020-02-16 16:49:37 +01:00