Commit Graph

30500 Commits

Author SHA1 Message Date
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
spookydonut
a41928ba66 Merge pull request #49509 from AdmiralPancakes1/helbital-fix
Fixes helbital hurting you instead of healing you, slight cleanup
2020-02-24 15:36:56 +08:00
Ryll-Ryll
7e384752e6 moves topic, cleans code, adds sticky tape to maint loot 2020-02-23 06:50:18 -05:00
Capsandi
b15932acbc Warm flavored pocket, not flavored warm pocket (#49404)
About The Pull Request

fixes #49373
Why It's Good For The Game

Who doesn't like a pizza with possibly pizza flavored donk-pockets on it?
Changelog

🆑
fix: Donk Pocket Pizza is back on the menu
/🆑
2020-02-23 08:47:36 +13:00
TheVekter
bc44988ba2 [READY] R&D Rework: Splits anomaly cores into separate versions, modifies build paths (#49448)
* Splits anomaly cores into separate versions

* Converts the wormhole projector to require a bluespace core.

* Cleaned up a few lines

* Fixed small bug issues

* The gravity gun now requires a grav core. Increased weight of some anomalies.

* Enables high-intensity grav anomaly

* Fixing minor issues
2020-02-22 20:40:40 +01:00
bumtickley00
ddc02aba55 cobby 2020-02-22 11:21:35 -05:00
nightred
2bfe630f58 Fix for space ninjas not living in space (#49460)
* spaceninja cell size reset, removed regulator, hard set temp controls

* max charge removed
2020-02-22 12:27:53 +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
spookydonut
1a958408ee Add autodocs for reagents (#49478) 2020-02-22 22:20:06 +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
Krysonism
a8b96a6125 [READY]Da hydrowear update. Resprites hydro jumpsuit and adds horticultural waders. (#49164)
This PR does two things:

It resprites the default botany jumpsuit and jumpskirt.
The new jumpsuit sprites are less flat, less noisy and the green colour is a slightly bluer shade.

Secondly it adds the horticultural waders: type of apron made of thick leather, it is a bit less permeable than the normal apron but is otherwise identical in function. It is available from the hydrobe.

Why It's Good For The Game

I have always had a dislike for the standard hydro outfit. It is a mess of bright green, blue and yellow. It gets even worse when someone puts on a botany bandana. An eyesore is how i would describe it.

The problem areas in my mind are the backpack, apron and jumpsuit.

The backpack can be replaced with a leather satchel so that is a not much of an issue. But the apron doesn't have a decent replacement and i think most players will want to wear their department jumpsuit.

I personally think my new hydroponics jumpsuit looks a lot better, I know respriting such an old core sprite is going to incite controversy, let me know what you think in the comments.

The waders are a stylish and thematically appropriate option to the apron that covers up a lot of your very bright jumpsuit to prevent it from stealing the show.

They kind of looks like something a Victorian gardener would wear and they seem like they would be a good choice in the wet, thorny and dirty environment of the hydroponics lab.
2020-02-22 12:46:00 +13:00
ShizCalev
05ded9f4e7 Merge pull request #49456 from Anonmare/patch-1
AIs can now have their laws directly adjusted
2020-02-20 22:58:11 -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
c6fa3711ac Merge pull request #49446 from Dennok/patch-6
Add Rapid Pipe Dispenser (RPD) to enginering protolathes.
2020-02-20 22:55:29 -05:00
ShizCalev
f54e26fefa Merge pull request #49431 from Mickyan/chewing_gum
Adds bubble gum
2020-02-20 22:53:33 -05:00
ShizCalev
4028b3444c Merge pull request #49418 from Arkatos1/TTVUI
tgui: Tank Transfer Valve
2020-02-20 22:52:58 -05:00
spookydonut
3792c44717 Merge pull request #49447 from trollbreeder/master
Fixes #49156, godhand touch spells now visible as item
2020-02-21 11:45:22 +08:00
Qustinnus
72fb1458a7 Adds the shower bot, makes sure you don't become too bloody (#49083)
* Epicgamers

* woops

* Update code/modules/mob/living/simple_animal/bot/construction.dm

Co-Authored-By: TheChosenEvilOne <34602646+TheChosenEvilOne@users.noreply.github.com>

* slip

* fix

* epic

* emag functionality

* Update code/modules/mob/living/simple_animal/bot/hygienebot.dm

* Update code/modules/mob/living/simple_animal/bot/hygienebot.dm

* step 1

* woops

* fixes

* fixes

* fixes++

* fixes a broken thing

* lol ok

* fixes

* oopsie

* oneliner

* lmao webedits

* small brain

Co-authored-by: TheChosenEvilOne <34602646+TheChosenEvilOne@users.noreply.github.com>
2020-02-20 22:31:22 +01:00
Dennok
c05c0e6fef no rpd in autolate 2020-02-20 22:13:32 +02: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
ArcaneMusic
3caacfd7a4 Changes documentation to NTOS Arcade and fixes the boss HP bar. (#49425)
* Oh mother f-

* Holdover from testing.

* rebuilds tgui
2020-02-20 13:47:03 +01:00
Arkatos
1bd1ecb22e Review fixes and conflict resolution 2020-02-20 13:45:31 +01:00
ShizCalev
ed49470634 Fixes helmets not properly updating icons when worn (#49451) 2020-02-20 13:44:15 +01:00
spookydonut
fa9c266863 Merge pull request #49331 from tralezab/patch-80
fixes terrible alert by making it announce area instead of turf (and a bad span thing)
2020-02-20 19:37:28 +08:00
spookydonut
6401ba5708 Merge pull request #49421 from ShizCalev/define-cleanup
Cleans up redundant math defines
2020-02-20 19:32:36 +08: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
Nick
bf157b0e6e [READY]Easter additions:Electric Bugaloo 2 (#49191)
* Update easter.dm

* the carrotoning

* carrotless version

* THE FINAL TOUCH

* boop

* Update easter.dm

* Push

* Final
2020-02-20 10:04:13 +01:00
Anonmare
2dcdad6bf3 Ignore that, I'm tired 2020-02-20 02:52:55 +00:00
Anonmare
1be181c4da AIs can now have their laws directly adjusted
Also fixes the spark system while I'm here
2020-02-20 02:47:47 +00:00
tralezab
09572ab93c review 2020-02-19 18:27:38 -08:00
XDTM
19655de8c7 Makes sixth sense only able to hear regular deadchat 2020-02-19 18:57:22 +01:00
Mickyan
c50153a981 documentation 2020-02-19 16:38:59 +01:00
trollbreeder
687fcbf80d I've had EI NATH of you. 2020-02-19 13:56:15 +01:00
Dennok
b1aaed14ad PRD to adv_engi node 2020-02-19 12:26:37 +02:00
Dennok
a4d522dda4 RPD design 2020-02-19 12:21:29 +02:00
ShizCalev
8cc290474e Removes depreciated chem reaction vars (#49440) 2020-02-19 06:16:00 +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
1be21a5ea3 Merge pull request #49125 from ATH1909/ghetto-saw
Adds all sharp items that have a force >=10 to the list of items that can be used for the saw bone step in ghetto surgery
2020-02-18 23:55:33 -05:00
ShizCalev
71f584f39e Merge pull request #49325 from itseasytosee/Hiveminderaser
Adds a new drink. The Hivemind eraser.
2020-02-18 23:45:11 -05:00
ShizCalev
b73946f957 Merge pull request #49329 from nemvar/goodbye
Removes reaction id and name.
2020-02-18 23:44:34 -05:00
ShizCalev
326b93a104 Merge pull request #49334 from Mickyan/paramedic_loadout
Tweaks paramedic loadout
2020-02-18 23:36:53 -05:00
ShizCalev
6f370508e5 Merge pull request #49342 from Fikou/custom-holopara
[READY] Adds Guardian Customization
2020-02-18 23:36:29 -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
ShizCalev
aa0bff9594 Merge pull request #49294 from RaveRadbury/5u-gulp
Removes bottle/flask gulp adjustment
2020-02-18 23:04:36 -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