Commit Graph

12948 Commits

Author SHA1 Message Date
skoglol
cc7391ee3b Merge pull request #49613 from SteelSlayer/airlock-painter-improvements
Airlock painter code improvements. Fixes some mixed up in-hand sprites for it
2020-02-29 22:50:59 +01:00
skoglol
d0c48cb3fc Merge pull request #49523 from tralezab/bye-bye!
transit tube violence
2020-02-29 22:05:54 +01:00
skoglol
ca1d3adb7a Merge pull request #49477 from Cobraman202/nospaces
Monk's Frock name changed
2020-02-29 21:56:11 +01:00
skoglol
7037fee68f Merge pull request #49607 from AnturK/painting_fixup
Persistent painting fixup
2020-02-29 21:54:25 +01:00
ShizCalev
9054a4c201 Merge pull request #49596 from ArcaneDefence/Carp_classic_fix
Carp classic carpotoxin fix
2020-02-27 23:36:58 -05:00
ArcaneDefence
84b1dff5e0 Update cigs_lighters.dm 2020-02-27 15:52:05 -07:00
SteelSlayer
5ee0cf0f32 airlock painter 2020-02-27 15:17:06 -06:00
AnturK
555d80ae21 Persistent painting fixup 2020-02-27 20:08:53 +01:00
TWATICUS
8facec32c9 bola time 2020-02-27 09:48:25 -05:00
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
ArcaneDefence
edf74e5c05 Update cigs_lighters.dm
Fix for https://github.com/tgstation/tgstation/issues/49588
2020-02-26 17:45:16 -07: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
Mickyan
7495a68808 Adds the art gallery to Deltastation (#49517)
* it's art

* readds photocopier and bookbinder

* trims persistence ids

* let's try this again

* here we go

* fixed a pipe
2020-02-25 18:42:37 +01:00
ArcaneMusic
59ff677b9d Initial Commit. (#49484) 2020-02-25 16:34:30 +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
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
6f74b6a51b Merge pull request #49510 from Arkatos1/ElectropackUI
tgui: Electropack
2020-02-24 15:36:24 +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
6d379bf62b fixes a few bugs 2020-02-24 01:09:36 -05:00
tralezab
3d08c2d3e7 Merge branch 'bye-bye!' of https://github.com/tralezab/tgstation into bye-bye! 2020-02-23 11:19:38 -08:00
Ryll-Ryll
33d2628c34 spacing and correcting comments 2020-02-23 07:03:01 -05:00
Ryll-Ryll
7e384752e6 moves topic, cleans code, adds sticky tape to maint loot 2020-02-23 06:50:18 -05:00
tralezab
b9ad061e60 Update transit_tube_pod.dm 2020-02-23 01:46:29 -08:00
tralezab
02bb6dc723 Update transit_tube_pod.dm 2020-02-23 01:32:15 -08:00
tralezab
0027b55583 violence 2020-02-23 01:28:43 -08: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
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
AnturK
745fec6cc5 Paintings icons and persistence. (#49233)
Restores canvases showing up their content on the map.
This only gets updated on finalizing/naming the painting.
Adds persistent paintings, set persistence_id on sign/painting on your map to use it.

Bumps rustg up to 4.3
2020-02-23 00:22:53 +13: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
Cobraman202
586621e786 Changed "Monk's Frock" to the more modern term of "Monk's Habit" 2020-02-21 00:12:38 -06: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
ShizCalev
4028b3444c Merge pull request #49418 from Arkatos1/TTVUI
tgui: Tank Transfer Valve
2020-02-20 22:52:58 -05: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
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