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

10330 Commits

Author SHA1 Message Date
deathride58 5d38c10581 Merge pull request #6661 from Citadel-Station-13/upstream-merge-37712 
[MIRROR] Fixes a radiation runtime related to going off the map edge
 2018-05-07 12:46:00 +00:00
deathride58 f15f3ffea4 Merge pull request #6662 from Citadel-Station-13/upstream-merge-37648 
[MIRROR] Moves removing the cell to screwdriver_act for APCs
 2018-05-07 12:45:42 +00:00
deathride58 e3ad766f33 Merge pull request #6664 from Citadel-Station-13/upstream-merge-37668 
[MIRROR] Axes the robotic fabricator (not the exofab)
 2018-05-07 12:45:09 +00:00
deathride58 9b7518e1e2 Merge pull request #6665 from Citadel-Station-13/upstream-merge-37578 
[MIRROR] Fix the top menus in the skin not working
 2018-05-07 12:44:35 +00:00
deathride58 8bc97a10d6 Merge pull request #6667 from Citadel-Station-13/upstream-merge-37676 
[MIRROR] Prevents electric grills from mass producing lightning through exploits
 2018-05-07 12:44:12 +00:00
deathride58 757cd6aa73 Merge pull request #6668 from Citadel-Station-13/upstream-merge-37680 
[MIRROR] Improves skittish code
 2018-05-07 12:43:47 +00:00
deathride58 d897dd5182 Merge pull request #6669 from Citadel-Station-13/upstream-merge-37681 
[MIRROR] Fixes supply pod duping
 2018-05-07 12:43:16 +00:00
deathride58 ab07f4a878 Merge pull request #6670 from Citadel-Station-13/upstream-merge-37679 
[MIRROR] Fixes rhumba beat as requested by naksu
 2018-05-07 12:42:57 +00:00
deathride58 034bf6ce79 Update verbs.dm 2018-05-06 17:38:25 -04:00
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
vuonojenmustaturska 0d7a0c0418 Merge pull request #37679 from DaxDupont/death 
Fixes rhumba beat as requested by naksu
 2018-05-06 16:38:16 -05:00
vuonojenmustaturska 4b36831fbe Merge pull request #37681 from kevinz000/patch-499 
Fixes supply pod duping
 2018-05-06 16:38:08 -05:00
vuonojenmustaturska 8e791af911 Merge pull request #37680 from kevinz000/patch-498 
Improves skittish code
 2018-05-06 16:37:57 -05:00
vuonojenmustaturska ed41503127 Merge pull request #37676 from AverageJoe82/electric-grill-engine 
Prevents electric grills from mass producing lightning through exploits
 2018-05-06 16:37:49 -05:00
Tad Hardesty af5e898dab Fix the top menus in the skin not working 2018-05-06 16:37:31 -05:00
81Denton ba0dc700df Axes the robotic fabricator (not the exofab) (#37668) 
* removes robofab

* that too
 2018-05-06 16:37:22 -05:00
Jordan Brown 81deaaca6d Merge pull request #37648 from vuonojenmustaturska/apcunsmash 
Moves removing the cell to screwdriver_act for APCs
 2018-05-06 16:37:04 -05:00
Jordan Brown 56e9fcd29c Merge pull request #37712 from ninjanomnom/dont-step-off-the-edge 
Fixes a radiation runtime related to going off the map edge
 2018-05-06 16:36:54 -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
deathride58 50eae25c92 Merge pull request #6656 from Citadel-Station-13/upstream-merge-37654 
[MIRROR] Morphs can no longer eat or attack while disguised
 2018-05-06 07:02:39 +00:00
81Denton d44b1b9b2e Adds desc to vendor circuit board (#37647) 
* FEED ME A STRAY CAT

* forgive me for I have web edited

* AAAAAHH
 2018-05-05 17:54:54 -05: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
LetterJay 889716fbd6 Merge pull request #6645 from Citadel-Station-13/upstream-merge-37640 
[MIRROR] Lengthen commit hashes in Show Server Revision
 2018-05-05 09:35:31 -05:00
CitadelStationBot bdd613fa05 Merge pull request #6650 from Citadel-Station-13/upstream-merge-37659 
[MIRROR] Crayons no longer use charge when used on a canvas
 2018-05-05 09:35:01 -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
CitadelStationBot 7bab794c6b Merge pull request #6627 from Citadel-Station-13/upstream-merge-37455 
[MIRROR] deadly brain tumor now gives -3 points
 2018-05-04 22:47:13 -05:00
oranges d5be66cf9a Crayons no longer use charge when used on a canvas 2018-05-04 22:27:00 -05:00
Jordan Brown 1aa0091ec1 Merge pull request #37640 from AutomaticFrenzy/patch/server-revision 
Lengthen commit hashes in Show Server Revision
 2018-05-04 08:42:44 -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
deathride58 288c61b1c1 obfuscates the gamemode in topic() calls 2018-05-03 21:14:15 -04: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