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

335 Commits

Author SHA1 Message Date
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
1948b007d1 fix roundstart/rej cleanup 2017-05-17 05:08:51 -05:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04: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
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
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
CitadelStationBot
226fdf9040 Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973) 2017-05-14 20:12:00 -07:00
CitadelStationBot
45a81d32a4 Adds round ID to MC panel (#846) 2017-05-14 20:10:22 -07:00
LetterJay
6c4a355379 Merge pull request #850 from Citadel-Station-13/upstream-merge-26980 
[MIRROR] Small Click refactor.
 2017-05-14 16:40:30 -04:00
LetterJay
c329a74c4b Merge pull request #942 from Citadel-Station-13/upstream-merge-27173 
[MIRROR] Fixes something not using create_reagents
 2017-05-14 16:29:44 -04:00
LetterJay
f838bb36ac Merge pull request #953 from Citadel-Station-13/upstream-merge-27203 
[MIRROR] Soul Vessels now have the proper laws
 2017-05-14 16:27:39 -04:00
LetterJay
6ab7cfe9b9 Merge pull request #957 from Citadel-Station-13/upstream-merge-27215 
[MIRROR] Petting is better
 2017-05-14 16:27:08 -04:00
CitadelStationBot
e661d82030 Goats eat glowshrooms 2017-05-14 07:38:00 -05:00
CitadelStationBot
962d114339 Petting is better 2017-05-14 07:36:55 -05:00
LetterJay
00b17f1649 maybe 2017-05-14 00:28:07 -05:00
LetterJay
3d0a1b2573 commit 2017-05-14 00:05:53 -05:00
LetterJay
a9e0b28872 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26908 2017-05-14 00:04:52 -05:00
CitadelStationBot
e59c48b20d Soul Vessels now have the proper laws 2017-05-13 21:15:32 -05:00
CitadelStationBot
b0bfcdabe9 Fixes something not using create_reagents 2017-05-13 18:01:12 -05:00
LetterJay
485bca003f Merge pull request #640 from Citadel-Station-13/upstream-merge-26527 
[MIRROR] Zombie/limb refactors/fixes
 2017-05-13 01:24:55 -04:00
LetterJay
bba7b9246d rej cleanup 2017-05-13 00:12:05 -05:00
CitadelStationBot
c5ed5b84e3 Zombies can see in the dark 2017-05-12 15:57:11 -05:00
CitadelStationBot
4c2d6e4ef5 Wraiths now refund part of Phase Shift's cooldown by attacking 2017-05-11 20:40:18 -05:00
kevinz000
9f7dd3fe16 Update ghost.dm 2017-05-10 17:53:27 -07:00
CitadelStationBot
afdf829abc [MIRROR] Visible ghosts emit light (#877) 
* Visible ghosts emit light

* Update ghost.dm

* Delete ghost.dm.rej
 2017-05-10 16:16:23 -07:00
CitadelStationBot
42fe8eb7c7 Fixes riding messages always using male pronouns (#869) 2017-05-10 16:05:14 -07:00
LetterJay
9687080cd0 Crab/Carp DEVOURALE = TRUE 2017-05-09 21:04:08 -05:00
CitadelStationBot
faf8829d30 [MIRROR] Adamantine golem leadership (#785) 
* Adamantine golem leadership

* Update stylesheet.dm

* Delete golems.dm.rej

* Delete stylesheet.dm.rej

* Update golems.dm

* fuck line endings
 2017-05-08 22:16:09 -07:00
CitadelStationBot
9abfbb46d4 Fixes female undershirts showing all the time (#741) 2017-05-08 16:47:35 -07:00
CitadelStationBot
c782e15d64 [MIRROR] Fix server hop (#740) 
* Fix server hop

* Delete new_player.dm.rej
 2017-05-08 16:47:21 -07:00
CitadelStationBot
98765ec854 Small Click refactor. 2017-05-08 03:06:05 -05:00
CitadelStationBot
a6cb12b84a [MIRROR] Plastic golems (#806) 
* Plastic golems

* Update lavaland_ruin_code.dm

* Delete lavaland_ruin_code.dm.rej
 2017-05-08 00:25:20 -07:00
kevinz000
bd8bfe1327 Merge pull request #684 from Citadel-Station-13/upstream-merge-26728 
[MIRROR] A bunch of sparks to do_sparks [Travis error unrelated to PR]
 2017-05-07 22:41:24 -07:00
kevinz000
68e1087825 Merge pull request #823 from Citadel-Station-13/upstream-merge-26959 
[MIRROR] Mega arachnid
 2017-05-07 19:17:10 -07:00
kevinz000
6c293e3e3d Merge pull request #716 from Citadel-Station-13/upstream-merge-26768 
[MIRROR] Species-locked inventory slots are now indicated.
 2017-05-07 19:15:02 -07:00
kevinz000
2a8acb13d2 Merge pull request #840 from Citadel-Station-13/upstream-merge-26966 
[MIRROR] Fixes being able to stand on chasms
 2017-05-07 19:07:59 -07:00
LetterJay
2efe90055f Revert "[MIRROR] Fixes say verbs not working" 2017-05-07 19:41:33 -04:00
CitadelStationBot
884338d048 Fixes being able to stand on chasms 2017-05-07 18:06:44 -05:00
LetterJay
75ca44a767 Merge pull request #827 from LetterJay/snap 
Snap Emote
 2017-05-07 15:41:32 -05:00
LetterJay
659139ca1c finger snap emote 2017-05-07 12:41:45 -05:00
CitadelStationBot
617bb4ed38 Mega arachnid 2017-05-07 08:55:11 -05:00
kevinz000
035dd93158 Merge pull request #756 from Citadel-Station-13/upstream-merge-26848 
[MIRROR] Adds spewium toxin in traitor kits
 2017-05-06 21:43:08 -07:00
kevinz000
5ac3bb924f Merge pull request #799 from Citadel-Station-13/upstream-merge-26939 
[MIRROR] Blorble
 2017-05-06 21:41:56 -07:00
kevinz000
4a2a0e8a0d Merge pull request #732 from Citadel-Station-13/upstream-merge-26778 
[MIRROR] Plasma vessels regenerate slowly off resin
 2017-05-06 15:26:10 -07:00
kevinz000
cc8d113c0f Merge branch 'master' into upstream-merge-26928 2017-05-06 14:05:16 -07:00
kevinz000
bf5a9a5037 Update mob.dm 2017-05-06 14:04:17 -07:00