Commit Graph

30522 Commits

Author SHA1 Message Date
LemonInTheDark df9d859da8 Fixes tesla bugs, makes code better (#49260)
* Cleans shit up, adds some upper limits on zap count, makes explosions less commen. Need to fix apc issue before
I test how it plays

* Mood, buffs and nerfs tesla

* Cherry-Picking

* eyyo

* back to basics

* aight

* broooooooooooooooooo

* adds else

* range

* fixes shit

* Sure

* Cleans shit up

* Fixes prob issue

* Gee I like this spooky guy

* I swear to god if prob picks just makes a list I am gonna blow a gasket
2020-02-27 12:06:52 +01:00
ShizCalev ddcb56404c Merge pull request #49585 from Ryll-Ryll/cmdr-beepsky
Promotes Beepsky
2020-02-27 04:45:32 -05:00
Arkatos1 59379b371f tgui: Malfunction Module Picker (#49532)
* Module Picker UI

* Bugfixes, tweaks, malf theme

* Malfunction theme removed, generalized Uplink interface and tweaks

* Revert "Malfunction theme removed, generalized Uplink interface and tweaks"

This reverts commit e30dd183567325dd7a339ec3eb9d237a98b5fe3e.

* Rename and cleanup

* Cleanup
2020-02-27 01:19:26 -08:00
LemonInTheDark 7d1b96fb6c Wew god (#49593) 2020-02-26 16:58:56 -05:00
AnturK a2ff959950 Batch of runtime fixes. (#49568)
* Fixes secret sauce recipe paper.

* Fixes say runtime

* Fixes modular computer on holodeck runtime

* Fixes bee runtime

* Fixes grav holopara runtime

* Fixes olfaction runtime

* Fixes zombie runtime.

* Cleanup
2020-02-26 20:47:31 +08:00
Ryll-Ryll fba8f793c2 promotes beepsky 2020-02-25 21:02:57 -05:00
skoglol 2220049fc2 Fixes blindfolds not properly counting as being blind (#49541)
* Fixes blindfolds not properly counting as being blind

* Call the proper proc
2020-02-25 19:15:33 +01:00
Yenwodyah 988737b8f2 Geneticist consistency fixes (#49475)
* Remove genetics/medbay leftovers

* Forgot this

* One more thing
2020-02-25 16:38:56 +01:00
ArcaneMusic 59ff677b9d Initial Commit. (#49484) 2020-02-25 16:34:30 +01:00
Arkatos1 395b8cb29f Gas Turbine UI (#49485) 2020-02-25 16:21:45 +01:00
Time-Green e114d67d02 kills all reac bugs with the power shame (#49504) 2020-02-25 16:16:22 +01:00
Time-Green 0cac6d4e20 adds snail achievement to genetics (#49515) 2020-02-25 16:07:42 +01:00
Nick 950568c64b Update magicarp.dm (#49508) 2020-02-25 16:05:50 +01:00
pireamaineach 8c8afcaaa2 [READY] Plasmaman sprite changes. (#49406)
* Does the thing.

* whoops I fucked up some item_states

* when I said item_states I meant icon_states also I didn't properly fix it

* Update hats.dmi

* Makes the prisoner suit look more unique.

* "Forcing the Icon Bot to Do it's Job"

* Update mime.dm

* Adds a new plasmaman name!

* Update plasmaman.txt

* Update plasmaman.txt

* Did the thing.

* plasmagloves^tm

* arms

* Update packs.dm

* Trailing newline done
2020-02-25 15:51:01 +01:00
Bobbahbrown 91eea7ea20 Wigs Now Use Atom Color (#49526)
* atom color

* cleanup

* death to random whitespace
2020-02-25 15:23:57 +01:00
Yenwodyah f44765d510 Re-adds insect welfare (#49542)
* cleans pacifist consciences

* Update code/modules/mob/living/simple_animal/hostile/cockroach.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* other mobs can be pacifists too

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2020-02-25 15:19:38 +01:00
ArcaneMusic 94f27c7b25 [READY]Arconomy: Sales Taggers, split profits on barcoded, sold items! (#49111)
* Startwork

* "Arcane: Everything works up until the export datum bullshit"

* I got up to "Split Profit" in "sell object"

* This is when I switched over to components and it STILL doesn't work

* alright stopwork for the 'night'

* So this is the version that crashes

* One step further in my descent to madness.

* Alright, this should be working (Minus maybe profit_split)

* Alright splitting up custom sales splits is broken right now.

* Profit split works now.

* Alright what the hell is going on here.

* Revert "Alright what the hell is going on here."

This reverts commit 6cb3b6eb56ea45ede3496bbe219ca18302c806e2.

* Oh wait, I can do commit messages through VSC?

* Adds a quick little box with all the shipping supplies you'll ever want, unwrapping signal

* Added shipping box to all maps and the service/cargo lathes.

* Fuck you mapmerge hook you ain't shit

* Alright, yet another take of making it get rid of the pricetag

* [3:43 PM] oranges: anturk is smart (This is true)

* Tested, cleaned up component procs,  and limits signals sent a bit.

* Whoops

* Other comments from Ninja over discord

* Left in a comment line.

* Fixes the issue with ind. barcodes, adds examine.

* Well thank GOD the children wern't there to see it

* Adds a do_after to prevent accidents.

* Fixes merge conflicts

* Fixes merge conflict. Twice in one day.

* Fixes merge conflict.

* one tiny bit of documentation

* Travis play nice.
2020-02-25 20:42:01 +08:00
Bobbahbrown 63d65bf7ba Unsanitized input on blob broadcast allows HTML injection (#49561)
About The Pull Request

Unsanitized input allows for raw HTML injection on broadcasting message as blob. The repeated message by blob mobs is sanitized, so clients are safe, but still allows HTML injection into the blob's chat window.
2020-02-25 15:26:49 +13:00
fluffe9911 5eea39977d [READY TO BE MERGED] King Goat Achievements, bugfixes, and minor tweaks (#49159)
* king goat memes

* I cant grammar

* newline

* the arena is no longer pressurised

* How into grammar

* I am embarrassed I did not notice this

* no hotel vacations in the arena

* better goat hoof sprite curticy of stephen

* new goat gun sprite

* might as well

* grammar

* no more king goat plushies in toy crates

* Update code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm

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

* done

* based and redpilled

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-02-24 20:47:42 -05:00
spookydonut cea5360e4b Updates codedocs with links (#49497)
About The Pull Request

Updating the best written documentation with the new linking feature.
2020-02-25 08:17:45 +13: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
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
ShizCalev 0228bc2fbe Call the proper proc 2020-02-24 01:31:38 -05:00
ShizCalev df81c5be4a Fixes blindfolds not properly counting as being blind 2020-02-24 01:10:34 -05: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