Commit Graph

25143 Commits

Author SHA1 Message Date
deathride58
d96bb95aa4 Makes it plausible for the lone operative event to roll if the nuclear disk stays still for long enough (#37468)
* makes it possible for the lone operative event to roll if the nuclear disk stays still for long enough

* makes the event weight increase chance reset if the disk moves

* slows this shit *WAY* down, adds a minimum time for the weight to start rolling for an increase (approximately 10 minutes)

* .

* this was an absolute pain in the ass to test - addresses reviews

* addresses ninjanomnom's review, makes it possible for the loneop event weight to decrease if the disk moves
2018-05-06 05:22:49 -04:00
vuonojenmustaturska
880d6d0ff9 Merge pull request #37692 from tgstation/revert-37666-Cyberboss-patch-1
Revert "Adds star wars holiday"
2018-05-05 23:35:28 +03:00
KorPhaeron
94338926ea Revert "Adds star wars holiday (#37666)"
This reverts commit 179ac487c5.
2018-05-05 15:12:37 -05:00
kevinz000
93d76a8679 alt morph nerf (#37654) 2018-05-05 15:53:56 -04:00
Jordan Brown
179ac487c5 Adds star wars holiday (#37666)
* Adds star wars holiday

* Based JC
2018-05-05 15:33:30 -04:00
Jordan Brown
7287b7f95e Merge pull request #37641 from AutomaticFrenzy/patch/tooltip-jquery
Use bundled rather than remote jquery in tooltips
2018-05-05 09:10:06 -04:00
Jordan Brown
6e8d618e7c Merge pull request #37651 from 81Denton/donksoft-board
Adds missing donksoft vendor board to illegal tech node
2018-05-05 09:09:36 -04:00
Armhulen
fef5ccb42d ot dealing with bad grammar today (#37637) 2018-05-04 07:50:20 -04:00
PoeticIron
d76975891c Fixes Tequila Sunrise naming (#37657)
Changes 'tequila Sunrise' to 'Tequila Sunrise' as per Issue #37652
(https://github.com/tgstation/tgstation/issues/37652)
2018-05-04 07:49:59 -04:00
Jordie
e44298a36c some dbadmin fixes (#37623) 2018-05-04 12:14:35 +02:00
kevinz000
2d91fdbd93 Fixes mousetraps not going off from being dumped out (#37447)
* mousetrap fix

* fix mousetraps

* Update storage.dm

* Combine checks
2018-05-04 11:42:55 +02:00
Fox McCloud
76cb1cf060 Fixes Several Machines Materials Insertion (#37432)
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
2018-05-04 11:40:46 +02:00
Tlaltecuhtli
b8d5d8689c slighty upgrades the medbeam (#37451)
🆑
tweak: medbeams heal tox and oxy slighty
/🆑
why: because some dude having 1 tox damage and not being able to heal is really frustating
2018-05-03 20:13:27 -04:00
Trevor Serpas
a79ba6e889 constant chip fix (#37636)
removes extra pins from constant chip
2018-05-03 20:12:26 -04:00
ShizCalev
ba1030f803 Makes more messages pronoun sensitive (#37582)
* Makes more messages pronoun sensitive

* Some cleanup

* more pronouns

* rever
2018-05-03 18:45:55 -04:00
Denton
73a889d955 d o n k 2018-05-03 19:37:27 +02:00
Dax Dupont
1790cf7944 You can no longer print infinite ammunition. (#37626)
* You can no longer print infinite ammunition.

* henk

lazy

anus

Reduces .38

Casings now give a tiny bit of metal so the janitor gets a buff

spacing
2018-05-03 09:44:32 -04:00
Jordan Brown
a1ca98e1cf Merge pull request #37625 from ShizCalev/infrared
Updates infrared emitters to use the rotate component
2018-05-03 09:42:54 -04:00
Jordan Brown
c4e04b4a22 Merge pull request #37622 from ShizCalev/cockarock
Changes cockroach guts to insect guts
2018-05-03 09:41:41 -04:00
Jordan Brown
0e6e9693b4 Merge pull request #37621 from ShizCalev/brainwash-uplink-loc
Corrects brainwashing surgery program category
2018-05-03 09:40:57 -04:00
Jordan Brown
b160697aa2 Merge pull request #37620 from AutomaticFrenzy/patch/dominator
Remove a leftover reference to the gang dominator
2018-05-03 09:40:31 -04:00
Tad Hardesty
d3bde2fda4 Use bundled rather than remote jquery in tooltips 2018-05-03 00:05:02 -07:00
Armhulen
d4413fafcb Plasmamen organs GET sprites! (#37595)
* DONE

* initial

* Removes random slashes
2018-05-02 22:20:15 -04:00
pigeons
cd9ac761e2 Removes stock market (#37414)
This removal is motivated by both gameplay and technical reasons.
Gameplay:

The stock market being a part of a station's Cargo department does not make sense, for either practical or lore purposes. The mechanic is bad because players are receiving cargo points from literally nothing. There no kind of freight handling or any other sort of bottleneck at all, just number entry on a computer from a seat. The stock market code is quite complex and a good attempt was made at simulating a stock market. However the attempt falls short, as it is still quite easy to manage stocks to grow points passively and safely. The stock market is also a multiplicative source of income so any other cargo point source gets extra scrutiny over balance, undeservedly so. Other aspects of cargo have already repeatedly taken hits. Such nerfs include the decreasing marginal returns for most exports and the base export price of plasma. I've noticed cargo doesn't care as much about exporting plasma as much as they used to.
Technical:

There seems to be a major issue with stock growth, particularly one bug in particular that grows stock prices to astronomical levels. As I mentioned before, the stock market code is quite complex, not to mention long. @Iamgoofball himself does not seem to making an earnest attempt to properly maintain and fix the issues, instead constantly making controversial band-aid fixes and removals (pot, kettle here I know). I would normally make a fix attempt as the code seems interesting but I do not agree with the stock market being a part of the game for gameplay reasons and thus have no interest. I have other ideas for cargo but they are still in the ideas stage so they are worth nothing. Still, I think removing the stock market and making room for other cargo features is the best move.
2018-05-03 10:47:57 +12:00
Grandmother of 50
56713f1439 Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes) (#37609)
* Update alcohol_reagents.dm

* removes period
2018-05-02 18:30:23 -04:00
Grandmother of 50
dfc2cabfe4 Update machine_designs.dm (#37289) 2018-05-02 23:11:33 +02:00
Tad Hardesty
9763ddbca9 Remove a leftover reference to the gang dominator 2018-05-02 11:17:55 -07:00
vuonojenmustaturska
fd4c753a04 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 (#37597)
* kill BANG_PROTECT_2

* let's put this back in

* dirty

* kill OMNITONGUE_2

This is a write-only variable, probably leftover from some refactor years ago

* kill flags_2
2018-05-02 14:13:41 -04:00
Hyacinth-OR
b0b7f2df9a Adds grenadine. (#37598)
* Adds the grenadine sprite to drinks.dmi

* Everything else, woops!

* Sprite tweaks.

* Requested changes!

* hopefully fixes merge conflict issues.

* Removes bad files!

* Messed that one up!

* dupe!

* dupes...
2018-05-02 14:12:37 -04:00
Jordan Brown
39bfefe4d3 Merge pull request #37606 from ShizCalev/storage-implant-uplink-description
Corrects mistake in storage implant uplink description
2018-05-02 09:37:32 -04:00
ShizCalev
969248a99e infrared emitter rotate component 2018-05-02 07:40:50 -04:00
ShizCalev
8f64b6cb22 Changes cockroach guts to insect guts 2018-05-02 06:44:35 -04:00
ShizCalev
3512f492ad Corrects brainwashing surgery program category 2018-05-02 06:33:41 -04:00
vuonojenmustaturska
1f1bc2ed32 Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too (#37035)
* APC crap

* moar define

* honk

* cover defines
2018-05-02 08:32:00 +02:00
Jordan Brown
9e42524ff5 Merge pull request #37590 from 81Denton/cargo-categories
Reorganizes cargo's big "miscellaneous supplies" category
2018-05-01 16:38:04 -04:00
Jordan Brown
b3938446f1 Merge pull request #37580 from 81Denton/craftable-hudsunglasses
Craftable HUDsunglasses
2018-05-01 16:35:47 -04:00
europax
5a78cf1874 Adds 5 new drinks (#37589)
* Added 4 sprites

Added sprites for Alexander, Between the Sheets, Kamikaze and Sidecar.

* Added recipes for 5 drinks

Added recipes for Alexander, Between the Sheets, Kamikaze, Mojito and Sidecar.

* Added 5 drinks

Added Alexander, Between the Sheets, Kamikaze, Mojito and Sidecar.

* Added Creme de Menthe to Mojito

* Changed Creme de Menthe to Menthol in Mojito

* Adds menthol and sake to the dispensers

* Adds menthol to drink reagents

* Removes menthol from drug reagents

* Added the box of menthol

* Adds menthol to the booze-o-mat

* Adds the menthol box sprite
2018-05-01 13:42:05 -05:00
AnturK
346819e30c Readds missing nuked narsie cinematic. (#37584) 2018-05-01 12:04:55 -04:00
Jordan Brown
6ff57368b0 Merge pull request #37516 from XDTM/LinearBrainDamage
Changes the trauma formula so constant small ticks don't keep triggering traumas
2018-05-01 10:56:18 -04:00
ShizCalev
ee512437d9 Corrects mistake in storage implant description 2018-05-01 08:19:56 -04:00
XDTM
e733e139c5 fix 2018-05-01 12:23:20 +02:00
Denton
e48edaf637 alphabetical order 2018-05-01 10:12:58 +02:00
Jordan Brown
f91f5bb08f Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes
Fix runtimes in corpse code due to mob_spawners becoming null
2018-04-30 22:19:26 -04:00
Jordan Brown
748d9a9233 Merge pull request #37572 from deathride58/fixesdepression
Fixes the intergalactic stock market crash by removing the speculation/performance modifier
2018-04-30 22:14:51 -04:00
Alomga
f3840f8715 Makes dizziness work again 2018-04-30 14:38:37 -04:00
Denton
17deccd316 cargo categories + crate types 2018-04-30 20:23:10 +02:00
Jordan Brown
0ebc0d81b2 Merge pull request #37510 from JJRcop/throw_myself
Circuits can't throw themselves
2018-04-30 14:05:01 -04:00
Jordan Brown
32f2f07e4d Merge pull request #37513 from ShizCalev/pineapple-memes
Adds traits for a character's preference towards pineapples.
2018-04-30 14:02:59 -04:00
Jordan Brown
2a2ad8fd79 Merge pull request #37549 from ShizCalev/bounce_away-fixes
Resolved var name conflict for bounce_away()
2018-04-30 13:52:52 -04:00
Jordan Brown
0fc0625ed2 Merge pull request #37539 from pigeonsk/sakememe
Ports sake with new sprites
2018-04-30 13:49:51 -04:00