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

16367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
81Denton ba0dc700df Axes the robotic fabricator (not the exofab) (#37668) 
* removes robofab

* that too
 2018-05-06 16:37:22 -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
deathride58 16ad31516c Merge pull request #6658 from Citadel-Station-13/upstream-merge-37647 
[MIRROR] Adds desc to vendor circuit board
 2018-05-06 07:02:17 +00:00
CitadelStationBot e6b04e5f24 Adds desc to vendor circuit board 2018-05-05 17:54:55 -05: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
CitadelStationBot 9659062dc2 Morphs can no longer eat or attack while disguised 2018-05-05 14:54:07 -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
CitadelStationBot e1bdd0d21c Merge pull request #6646 from Citadel-Station-13/upstream-merge-37649 
[MIRROR] Fixes runtimestation RnD machinery, adds circ printer+analyzer
 2018-05-05 09:32:34 -05:00
CitadelStationBot 6468c7b809 Merge pull request #6653 from Citadel-Station-13/upstream-merge-37651 
[MIRROR] Adds missing donksoft vendor board to illegal tech node
 2018-05-05 09:30:11 -05:00
deathride58 eb60353808 Merge pull request #6651 from Citadel-Station-13/donator1 
Donator Item
 2018-05-05 14:17:08 +00:00
CitadelStationBot 08758e72e7 Adds missing donksoft vendor board to illegal tech node 2018-05-05 08:11:05 -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
CitadelStationBot a5237eb1ee Use bundled rather than remote jquery in tooltips 2018-05-05 08:10:54 -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 1fbc06234f Update __donator.dm 2018-05-05 07:24:37 -05:00
LetterJay bbebcc85e7 Update __donator.dm 2018-05-05 07:23:33 -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 58973fac50 Merge pull request #6629 from Citadel-Station-13/upstream-merge-37639 
[MIRROR] Fixes the tequila sunrise sprite.
 2018-05-04 22:52:13 -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
CitadelStationBot b38083fa81 Crayons no longer use charge when used on a canvas 2018-05-04 22:27:00 -05:00
oranges d5be66cf9a Crayons no longer use charge when used on a canvas 2018-05-04 22:27:00 -05:00
CitadelStationBot 6a473380ac Fixes runtimestation RnD machinery, adds circ printer+analyzer 2018-05-04 11:17:40 -05:00
Jordan Brown 5fae4a6c90 Merge pull request #37649 from 81Denton/watch-me-mash-my-keyboard-fwgiupghebipuernbvepw9vb85344355v 
Fixes runtimestation RnD machinery, adds circ printer+analyzer
 2018-05-04 11:17:40 -05:00
CitadelStationBot 95e5464fff Lengthen commit hashes in Show Server Revision 2018-05-04 08:42:45 -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
CitadelStationBot 91b38cd0a7 Fixes Tequila Sunrise naming 2018-05-04 06:50:43 -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
CitadelStationBot f4940bb316 fixes a sentence ot spelled correctly. 2018-05-04 06:50:35 -05:00
Armhulen a00364268e ot dealing with bad grammar today (#37637) 2018-05-04 06:50:34 -05:00
CitadelStationBot 5f339b73e7 Fixes mousetraps not going off from being dumped out 2018-05-04 04:43:13 -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
CitadelStationBot 48433fa6df Fixes Several Machines Materials Insertion 2018-05-04 04:40:56 -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
LetterJay f27088a346 Merge pull request #6639 from deathride58/fuckinmetagamers 
Fixes an OOC exploit that reveals the gamemode
 2018-05-03 20:36:15 -05:00
deathride58 288c61b1c1 obfuscates the gamemode in topic() calls 2018-05-03 21:14:15 -04:00
CitadelStationBot 4300ae4931 slighty upgrades the medbeam 2018-05-03 19:14:32 -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