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

16345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
CitadelStationBot
4f6abff0c3 constant chip fix 2018-05-03 19:13:21 -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
LetterJay
25b3828100 Merge pull request #6624 from Citadel-Station-13/upstream-merge-37609 
[MIRROR] Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes)
 2018-05-03 08:54:01 -05:00
LetterJay
71e7b461d5 Merge pull request #6623 from Citadel-Station-13/upstream-merge-37615 
[MIRROR] Fixes Midori cigs having no nicotine
 2018-05-03 08:52:46 -05:00
CitadelStationBot
04bdddf8d9 You can no longer print infinite ammunition. 2018-05-03 08:45:18 -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
CitadelStationBot
5edf4c86ab Updates infrared emitters to use the rotate component 2018-05-03 08:44:01 -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
CitadelStationBot
1e901e56c2 Corrects brainwashing surgery program category 2018-05-03 08:41:23 -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
Jordan Brown
2d3abdade1 Fixes the tequila sunrise sprite. 2018-05-02 23:51:25 -05:00
CitadelStationBot
c0ab1a3966 deadly brain tumor now gives -3 points 2018-05-02 21:24:27 -05:00
Armhulen
fa6292dbd5 deadly brain tumor now gives -3 points (#37455) 
* i can tweak it if need be yadda yadda one line change

* ok lets be SENSIBLE.
 2018-05-02 21:24:26 -05:00
CitadelStationBot
efc9680358 Plasmamen organs GET sprites! 2018-05-02 21:21:11 -05:00
Armhulen
04057dc7d6 Plasmamen organs GET sprites! (#37595) 
* DONE

* initial

* Removes random slashes
 2018-05-02 21:21:11 -05:00