shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,942 Commits 5 Branches 0 Tags
558a989d8a957504ea3fe0e1a5b3f21ba34e8597
Commit Graph

12374 Commits

Author SHA1 Message Date
LetterJay
6c4e6d9e4b language holder for constructs 2017-05-17 10:20:12 -05:00
LetterJay
ac4e4ab39a honk 2017-05-17 10:16:54 -05:00
LetterJay
00b14017c0 ook ook language 2017-05-17 10:15:30 -05:00
LetterJay
5da8c5d520 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26952 2017-05-17 10:12:36 -05:00
LetterJay
5b1fc3194d Merge pull request #810 from Citadel-Station-13/upstream-merge-26991 
[MIRROR] Follow links on adamantine vocal cords now work
 2017-05-17 11:05:10 -04:00
LetterJay
58909705e5 MAPPING DEBUG! WOO! 2017-05-17 10:01:38 -05:00
LetterJay
d7c24de679 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26492 2017-05-17 09:58:53 -05:00
LetterJay
da2fc1da0d Merge pull request #990 from Citadel-Station-13/upstream-merge-27271 
[MIRROR] Refactors supply talismans to be less shitcode
 2017-05-17 10:51:02 -04:00
LetterJay
fe582cad7c Merge pull request #989 from Citadel-Station-13/upstream-merge-27214 
[MIRROR] Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband
 2017-05-17 10:50:20 -04:00
LetterJay
d82f9bf152 Merge pull request #974 from Citadel-Station-13/upstream-merge-27246 
[MIRROR] Fixes Graviton Typo
 2017-05-17 10:48:40 -04:00
LetterJay
d8c07bed4d Merge pull request #966 from Citadel-Station-13/upstream-merge-27221 
[MIRROR] Fixes the ore redemption machine's sheet amount upgrade
 2017-05-17 10:48:23 -04:00
LetterJay
6d8aa16c45 Merge pull request #917 from Citadel-Station-13/upstream-merge-27119 
[MIRROR] Wraiths now refund part of Phase Shift's cooldown by attacking
 2017-05-17 10:47:06 -04:00
LetterJay
c8a8f77be8 Merge pull request #1023 from Citadel-Station-13/upstream-merge-27333 
[MIRROR] Stops people from beating a dead horse (revenant)
 2017-05-17 10:45:38 -04:00
LetterJay
5730df22d0 Merge pull request #1022 from Citadel-Station-13/upstream-merge-27321 
[MIRROR] Fixes spelling on the EM Pulse action
 2017-05-17 10:45:27 -04:00
LetterJay
ce925fa04c Merge pull request #1024 from Citadel-Station-13/upstream-merge-27360 
[MIRROR] Prepends object names with 'The' in speech
 2017-05-17 10:45:04 -04:00
CitadelStationBot
242bff4288 Prepends object names with 'The' in speech 2017-05-17 05:13:47 -05:00
LetterJay
1948b007d1 fix roundstart/rej cleanup 2017-05-17 05:08:51 -05:00
LetterJay
932f323e39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26974 2017-05-17 05:06:23 -05:00
CitadelStationBot
bf3b6702c3 Stops people from beating a dead horse (revenant) 2017-05-17 05:03:31 -05:00
CitadelStationBot
013101bd48 Fixes spelling on the EM Pulse action 2017-05-17 05:01:25 -05:00
LetterJay
2d66148b44 Update holocall.dm 2017-05-17 04:30:52 -05:00
LetterJay
1ee7686a5b Update holocall.dm 2017-05-17 04:26:16 -05:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay
e121ad79c9 commit 2017-05-17 04:03:54 -05:00
LetterJay
ff21afdcbd Merge pull request #744 from Citadel-Station-13/upstream-merge-26828 
[MIRROR] Moves tongues to `mutanttongue` var
 2017-05-17 04:50:52 -04:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay
fe62f7b737 Merge pull request #734 from Citadel-Station-13/upstream-merge-26780 
[MIRROR] Draconic language, for lizards
 2017-05-17 04:49:13 -04:00
LetterJay
a3cc3087b3 warrghhlbrarrggll 2017-05-16 23:55:38 -05:00
LetterJay
e03b4b7905 ooga booga lizard 2017-05-16 23:46:37 -05:00
LetterJay
46f5c4bb1b commit 2017-05-16 23:35:54 -05:00
LetterJay
45c283a935 applies the previous fixes for cult on a closed PR 2017-05-16 22:59:41 -05:00
LetterJay
be1702ff0d Revert "CultFix" 
This reverts commit f3e8cd3e2d.
 2017-05-16 22:49:23 -05:00
LetterJay
f3e8cd3e2d CultFix 2017-05-16 21:36:07 -05:00
kevinz000
d557c03ca2 fix 2017-05-16 17:09:39 -07:00
LetterJay
7b41f8cd55 merge 2017-05-16 16:22:57 -05:00
LetterJay
2d7c5cdbd7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26991 2017-05-16 16:22:12 -05:00
LetterJay
4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631 
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
 2017-05-16 17:13:30 -04:00
LetterJay
296ae25734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-16 15:27:46 -05:00
LetterJay
42d354f9c8 cryo pod icon fix 2017-05-16 15:27:30 -05:00
CitadelStationBot
f52625b18c Refactors supply talismans to be less shitcode 2017-05-15 17:54:16 -05:00
CitadelStationBot
1f66249428 Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband 2017-05-15 17:04:23 -05:00
CitadelStationBot
59b609c79d Reverts favoring empty positions 2017-05-15 10:36:56 -05:00
CitadelStationBot
db47433f40 Fixes Graviton Typo 2017-05-14 23:51:13 -05:00
kevinz000
99297bb544 Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items 2017-05-14 20:54:47 -07:00
cebutris
fc628bcb89 adds the holoparasite box, and adds it to traitor uplinks (#913) 2017-05-14 20:36:22 -07:00
CitadelStationBot
176c2003f9 [MIRROR] Enable Ambrosia Gaia, attempt balance (#962) 
* Enable Ambrosia Gaia, attempt balance

* Update ambrosia.dm

* Delete ambrosia.dm.rej
 2017-05-14 20:34:15 -07:00
CitadelStationBot
148666efed Disables Gaia mutation (#928) 2017-05-14 20:30:29 -07:00
CitadelStationBot
040ac1236d [MIRROR] woops i forgot to check tick cannons fill proc. (#968) 
* woops i forgot to check tick cannons fill proc.

* Delete pneumaticCannon.dm.rej

* Update pneumaticCannon.dm
 2017-05-14 20:23:39 -07:00
kevinz000
da615b1440 h 2017-05-14 20:19:26 -07:00
CitadelStationBot
41f110380c [MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons (#935) 
* [READY]Gives the clown a pie cannon, also improves pneumatic cannons

* Delete gang.dm.rej
 2017-05-14 20:18:02 -07:00