Commit Graph

8356 Commits

Author SHA1 Message Date
SteelSlayer
5ee0cf0f32 airlock painter 2020-02-27 15:17:06 -06:00
spookydonut
1a9ddbee5f Merge pull request #48959 from Ryll-Ryll/embeddead
Refactors embedding, adds harmless embeds, sticky tape, admin buttons to make everything embeddable
2020-02-24 15:43:36 +08:00
Ryll-Ryll
6d379bf62b fixes a few bugs 2020-02-24 01:09:36 -05:00
Ryll-Ryll
7e384752e6 moves topic, cleans code, adds sticky tape to maint loot 2020-02-23 06:50:18 -05:00
Arkatos
988b2b5f36 Tweaks and fixes 2020-02-22 17:33:12 +01:00
Arkatos
4a778725df Electropack UI 2020-02-22 15:53:38 +01:00
ShizCalev
4316f79d32 Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
typo fixes, inconsistencies with Nanotrasen capitalization, ect
2020-02-22 22:35:53 +13:00
moo
0133414559 Cobbduceus: (Baby) C2 Additions (Rhig,Troph) and Changes (Helbital) (#49356)
It's the year of the rat sisters, and now it's time to cut out those pesky C3s in your life!

Why It's Good For The Game

Rhig and Troph are no brainers considering they're on the same level of ease2make as the C2s and have no downside. They will still be good but they have some C2 component now. Kinda minor compared to the others but I'll see how it plays out.
Changelog

🆑
balance: Helbital now is more simple to use and is based off not crit/softcrit/hardcrit. You want to be in hardcrit for the best brute healing.
tweak: Troph has now been converted into a C2 with tweaks, now named Probital. Same recipe. Downside is stamina damage
tweak: Rhig has now been converted into a C2 with tweaks, now named Hercuri. Same Recipe. Downside is it can cool to dangerous levels.
/🆑
2020-02-22 22:24:36 +13:00
XDTM
ef5ef2d463 Adds a hypnotic flashbang to the uplink (#49137)
Adds a hypnotic flashbang, disguised as a regular flashbang, to the traitor/nuke op uplink. Pretty much an AoE one-use hypnotic flash, but it doesn't require weakening the targets as long as they can be affected by the sound of the grenade, since it causes minor hallucinations.
Why It's Good For The Game

Effectively this is a non-lethal, non-destructive chaos-making tool. Even without the hypnosis it's a better flashbang; if everything goes right you've got a roomful of followers obeying your orders, but on the other hand something might go wrong, and then Poly is the one with the roomful of followers.
Changelog

🆑
add: Added a hypnotic flashbang to the uplink for 12 TC. It can hypnotize people much like a hypnoflash, and the sound will automatically make victims vulnerable to the trance.
/🆑
2020-02-22 22:13:27 +13:00
Ryll-Ryll
cb3b82bdc1 lets you update embedding behavior, also makes red pens faster 2020-02-22 02:15:19 -05:00
ShizCalev
12bf56f5df Merge pull request #49449 from XDTM/deadNdeaf
Makes sixth sense only able to hear regular deadchat
2020-02-20 22:56:16 -05:00
ShizCalev
f54e26fefa Merge pull request #49431 from Mickyan/chewing_gum
Adds bubble gum
2020-02-20 22:53:33 -05:00
Mickyan
cebc8d428e Merge branch 'master' of https://github.com/tgstation/tgstation into chewing_gum 2020-02-20 16:09:01 +01:00
Arkatos
0b11eeb09a Conflict resolution 2020-02-20 13:50:13 +01:00
Bobbahbrown
476399a346 the span of these changes is immense (#49432) 2020-02-20 13:48:13 +01:00
Arkatos
1bd1ecb22e Review fixes and conflict resolution 2020-02-20 13:45:31 +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
XDTM
19655de8c7 Makes sixth sense only able to hear regular deadchat 2020-02-19 18:57:22 +01:00
ShizCalev
f8ecffdebe Merge pull request #49245 from itseasytosee/Holster_timeishere
[READY] The holster overhaul is here.
2020-02-18 23:57:58 -05:00
ShizCalev
33dcbb1315 Merge pull request #49438 from tralezab/patch-82
omega soap suicide
2020-02-18 23:48:39 -05:00
ShizCalev
326b93a104 Merge pull request #49334 from Mickyan/paramedic_loadout
Tweaks paramedic loadout
2020-02-18 23:36:53 -05:00
ShizCalev
eb1ebaaad3 Merge pull request #49350 from Iamgoofball/you_son_of_a_bitch_im_in
Adds more flavor to conversion.
2020-02-18 23:32:58 -05:00
tralezab
4a3470f202 haha funny line 2020-02-18 20:02:03 -08:00
ShizCalev
722da36291 Merge pull request #49413 from Arkatos1/LaserUI
tgui: Radioactive Microlaser
2020-02-18 22:52:29 -05:00
ShizCalev
d1e853f9c8 Merge pull request #49409 from cacogen/batonofshieldsunchecked+15
Stun batons respect shields
2020-02-18 22:50:59 -05:00
ShizCalev
377d474ca2 Merge pull request #49400 from plapatin/airpods
nanotrasen-brand spacepods can play music just like headphones now
2020-02-18 22:45:20 -05:00
tralezab
abdda91ea0 ok 2020-02-18 19:08:53 -08:00
tralezab
3d5700bf62 oops 2020-02-18 18:28:00 -08:00
Mickyan
7b17f20973 pop 2020-02-18 20:10:11 +01:00
Mickyan
81354500be glomp 2020-02-18 18:31:00 +01:00
Arkatos
3ef0a31a0c Final cleanup 2020-02-18 16:59:53 +01:00
Arkatos
d37ea7cf19 Final cleanup 2020-02-18 15:32:48 +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
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
Iamgoofball
64933efc23 Update implant_mindshield.dm 2020-02-17 16:06:01 -08:00
Iamgoofball
aafcd54345 Update implant_mindshield.dm 2020-02-17 15:59:40 -08:00
Unknown
a98590dfff Slimes with belts? And clumsy people now shoot themselves 2020-02-17 17:40:34 -06:00
ShizCalev
7ea02ec454 Merge pull request #49264 from necromanceranne/claymore_take_two
Claymore Resprite: Take Two
2020-02-17 17:18:48 -05:00
Mickyan
2f5f44b619 chomp 2020-02-17 22:53:54 +01:00
Arkatos
255b06e649 Conflict resolution 2020-02-17 22:31:26 +01:00
Arkatos
fe5742bab2 Conflict resolution 2020-02-17 22:11:13 +01:00
Arkatos
187b698edd Assembly UI sanity, cleanup, TTV UI 2020-02-17 22:08:49 +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
moo
854c10408f Fixes Mafia Name Inputs (#49401)
* Update miscellaneous.dm

* silly me

* webedit 2, bad name boogaloo
2020-02-17 20:59:07 +01:00
cacogen
66295b2358 we make a slight edit to a comment
to force travis to run again
2020-02-18 08:05:18 +13:00
Arkatos
ec9e2a9e79 I said REAL tgui 2020-02-17 17:18:08 +01:00
plapatin
3a8f3dab76 webedit time 2020-02-17 07:04:47 -08:00
JJRcop
a1392847bd Remove ismovableatom macro (#9) 2020-02-17 15:03:16 +01:00