shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,375 Commits 5 Branches 0 Tags
d897dd5182122889338b0c3e17337d64cb3bd6ca
Commit Graph

6119 Commits

Author SHA1 Message Date
deathride58
06fc24e953 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 16:38:25 -05:00
deathride58
11c1e8fbf7 Merge pull request #6632 from Citadel-Station-13/upstream-merge-37620 
[MIRROR] Remove a leftover reference to the gang dominator
 2018-05-06 07:03:37 +00:00
kevinz000
6669328929 alt morph nerf (#37654) 2018-05-05 14:54:06 -05:00
LetterJay
bf66827936 Merge pull request #6652 from Citadel-Station-13/upstream-merge-37641 
[MIRROR] Use bundled rather than remote jquery in tooltips
 2018-05-05 09:44:39 -05:00
LetterJay
f387bb1694 Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622 
[MIRROR] Changes cockroach guts to insect guts
 2018-05-05 09:40:11 -05:00
LetterJay
4dd07fe4e7 Merge pull request #6641 from Citadel-Station-13/upstream-merge-37447 
[MIRROR] Fixes mousetraps not going off from being dumped out
 2018-05-05 09:38:11 -05:00
Jordan Brown
7104f28ed8 Merge pull request #37651 from 81Denton/donksoft-board 
Adds missing donksoft vendor board to illegal tech node
 2018-05-05 08:11:04 -05:00
Jordan Brown
6a940a7149 Merge pull request #37641 from AutomaticFrenzy/patch/tooltip-jquery 
Use bundled rather than remote jquery in tooltips
 2018-05-05 08:10:54 -05:00
LetterJay
bf42b89677 Merge pull request #6634 from Citadel-Station-13/upstream-merge-37625 
[MIRROR] Updates infrared emitters to use the rotate component
 2018-05-04 23:22:36 -05:00
LetterJay
65cd679e86 Merge pull request #6644 from Citadel-Station-13/upstream-merge-37657 
[MIRROR] Fixes Tequila Sunrise naming
 2018-05-04 23:20:00 -05:00
LetterJay
24776123f0 Merge pull request #6637 from Citadel-Station-13/upstream-merge-37636 
[MIRROR] constant chip fix
 2018-05-04 22:59:57 -05:00
LetterJay
db6f0727d2 Merge pull request #6638 from Citadel-Station-13/upstream-merge-37451 
[MIRROR] slighty upgrades the medbeam
 2018-05-04 22:58:40 -05:00
LetterJay
908394f1e2 Merge pull request #6640 from Citadel-Station-13/upstream-merge-37432 
[MIRROR] Fixes Several Machines Materials Insertion
 2018-05-04 22:57:32 -05:00
LetterJay
0c5912c834 Merge pull request #6635 from Citadel-Station-13/upstream-merge-37626 
[MIRROR] You can no longer print infinite ammunition.
 2018-05-04 22:54:00 -05:00
LetterJay
4f3f344369 Merge pull request #6643 from Citadel-Station-13/upstream-merge-37637 
[MIRROR] fixes a sentence ot spelled correctly.
 2018-05-04 22:52:32 -05:00
LetterJay
354371fcfc Merge pull request #6631 from Citadel-Station-13/upstream-merge-37621 
[MIRROR] Corrects brainwashing surgery program category
 2018-05-04 22:51:58 -05:00
PoeticIron
66f05776e6 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 06:50:43 -05:00
Armhulen
a00364268e ot dealing with bad grammar today (#37637) 2018-05-04 06:50:34 -05:00
kevinz000
4a7fae664e Fixes mousetraps not going off from being dumped out (#37447) 
* mousetrap fix

* fix mousetraps

* Update storage.dm

* Combine checks
 2018-05-04 04:43:12 -05:00
Fox McCloud
f5031bc4f7 Fixes Several Machines Materials Insertion (#37432) 
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
 2018-05-04 04:40:56 -05:00
Tlaltecuhtli
9533779be7 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 19:14:32 -05:00
Trevor Serpas
66f79a61c4 constant chip fix (#37636) 
removes extra pins from constant chip
 2018-05-03 19:13:20 -05:00
CitadelStationBot
d574fc5590 Merge pull request #6622 from Citadel-Station-13/upstream-merge-37289 
[MIRROR] Science can now print off processors as well
 2018-05-03 09:07:59 -05:00
CitadelStationBot
4dc647d8ff Merge pull request #6626 from Citadel-Station-13/upstream-merge-37595 
[MIRROR] Plasmamen organs GET sprites!
 2018-05-03 09:02:15 -05:00
CitadelStationBot
a351edea90 Merge pull request #6625 from Citadel-Station-13/upstream-merge-37414 
[MIRROR] Removes stock market
 2018-05-03 09:01:12 -05:00
Dax Dupont
a8a31c9e4b 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 08:45:17 -05:00
Jordan Brown
61263daa0b Merge pull request #37625 from ShizCalev/infrared 
Updates infrared emitters to use the rotate component
 2018-05-03 08:44:01 -05:00
Jordan Brown
deddd8debe Merge pull request #37622 from ShizCalev/cockarock 
Changes cockroach guts to insect guts
 2018-05-03 08:42:46 -05:00
Jordan Brown
19140f2cb2 Merge pull request #37620 from AutomaticFrenzy/patch/dominator 
Remove a leftover reference to the gang dominator
 2018-05-03 08:41:32 -05:00
Jordan Brown
5c758e2f3a Merge pull request #37621 from ShizCalev/brainwash-uplink-loc 
Corrects brainwashing surgery program category
 2018-05-03 08:41:23 -05:00
Armhulen
04057dc7d6 Plasmamen organs GET sprites! (#37595) 
* DONE

* initial

* Removes random slashes
 2018-05-02 21:21:11 -05:00
pigeons
2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
Grandmother of 50
d09ae95d42 Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes) (#37609) 
* Update alcohol_reagents.dm

* removes period
 2018-05-02 17:31:22 -05:00
Grandmother of 50
26fa3e1d12 Update machine_designs.dm (#37289) 2018-05-02 16:12:28 -05:00
deathride58
f5cbfd1c52 Merge pull request #6577 from Citadel-Station-13/upstream-merge-36839 
[MIRROR] Deactivate suicide prescans via ghost var
 2018-05-02 14:25:32 +00:00
deathride58
d2804694e0 Merge pull request #6618 from Citadel-Station-13/upstream-merge-37606 
[MIRROR] Corrects mistake in storage implant uplink description
 2018-05-02 14:25:14 +00:00
deathride58
711f309c46 Update suicide.dm 2018-05-02 10:01:47 -04:00
Jordan Brown
0a0875e447 Merge pull request #37606 from ShizCalev/storage-implant-uplink-description 
Corrects mistake in storage implant uplink description
 2018-05-02 08:38:09 -05:00
vuonojenmustaturska
49150c542f 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 01:32:34 -05:00
deathride58
9151a80461 Merge pull request #6613 from Citadel-Station-13/upstream-merge-37590 
[MIRROR] Reorganizes cargo's big "miscellaneous supplies" category
 2018-05-02 01:32:40 +00:00
deathride58
4d44701ee5 Merge pull request #6612 from Citadel-Station-13/upstream-merge-37580 
[MIRROR] Craftable HUDsunglasses
 2018-05-02 01:32:01 +00:00
deathride58
5c40a38457 Merge pull request #6609 from Citadel-Station-13/upstream-merge-37584 
[MIRROR] Readds missing nuked narsie cinematic.
 2018-05-02 01:30:19 +00:00
deathride58
a84f5c5328 Merge pull request #6608 from Citadel-Station-13/upstream-merge-37516 
[MIRROR] Changes the trauma formula so constant small ticks don't keep triggering traumas
 2018-05-02 01:30:00 +00:00
deathride58
a4b48cdc53 Merge pull request #6604 from Citadel-Station-13/upstream-merge-37562 
[MIRROR] Fix runtimes in corpse code due to mob_spawners becoming null
 2018-05-02 01:28:05 +00:00
deathride58
2760c61720 Merge pull request #6599 from Citadel-Station-13/upstream-merge-37572 
[MIRROR] Fixes the intergalactic stock market crash by removing the speculation/performance modifier
 2018-05-02 01:26:05 +00:00
deathride58
8f00bca017 Merge pull request #6598 from Citadel-Station-13/upstream-merge-37477 
[MIRROR] Makes dizziness work again
 2018-05-02 01:25:46 +00:00
deathride58
9c1a4303f9 Merge pull request #6597 from Citadel-Station-13/upstream-merge-37510 
[MIRROR] Circuits can't throw themselves
 2018-05-02 01:25:23 +00:00
deathride58
d26ba53e91 Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513 
[MIRROR] Adds traits for a character's preference towards pineapples.
 2018-05-02 01:25:04 +00:00
deathride58
ea5725cc4e Merge pull request #6595 from Citadel-Station-13/upstream-merge-37549 
[MIRROR] Resolved var name conflict for bounce_away()
 2018-05-02 01:24:36 +00:00
deathride58
7d01eeeb35 Merge pull request #6593 from Citadel-Station-13/upstream-merge-37556 
[MIRROR] More holosigns for techwebs
 2018-05-02 01:23:19 +00:00