CitadelStationBot
|
df9e22183d
|
[MIRROR] Servant golems do not have special names (#939)
* Servant golems do not have special names
* Update golems.dm
|
2017-05-18 11:28:09 -05:00 |
|
CitadelStationBot
|
c61bb0476f
|
[MIRROR] Cleans up some Initializes (#943)
* Cleans up some Initializes
* Update farm_animals.dm
* Delete farm_animals.dm.rej
* Update farm_animals.dm
|
2017-05-18 11:13:53 -05:00 |
|
CitadelStationBot
|
7a9e05e9d9
|
Cerestation Tweaks MK VII: BEES edition (#925)
|
2017-05-18 10:36:51 -05:00 |
|
CitadelStationBot
|
33941c29c8
|
[MIRROR] People can be cloned from heads or brains (#919)
* People can be cloned from heads or brains
* .rej fixes
* Update cloning.dm
|
2017-05-18 09:49:26 -05:00 |
|
CitadelStationBot
|
a317d23a51
|
[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916)
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie
* fixes .rej
|
2017-05-18 09:37:30 -05:00 |
|
CitadelStationBot
|
c6a671a11b
|
[MIRROR] Devil refactor+small revamp (#887)
* Devil refactor+small revamp
* Delete mind.dm.rej
* clean up rej
* Delete admin_investigate.dm.rej
* Delete mapping.dm.rej
* compile fix
|
2017-05-18 09:06:01 -05:00 |
|
CitadelStationBot
|
4022281599
|
[MIRROR] Plasma golem tweaks (#906)
* Plasma golem tweaks
* Update golems.dm
* Delete golems.dm.rej
|
2017-05-18 08:08:34 -05:00 |
|
CitadelStationBot
|
6617f68604
|
[MIRROR] Harvesters are more fun to play (#894)
* Harvesters are more fun to play
* resolve .rej
|
2017-05-18 07:12:29 -05:00 |
|
CitadelStationBot
|
eb359f1014
|
[MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876)
* Cerestation Tweaks VI: Shuttle Edition
* fix .rej
|
2017-05-18 06:51:26 -05:00 |
|
CitadelStationBot
|
43c05ad3da
|
[MIRROR] Fixes status stat panel (#878)
* Fixes status stat panel
* Update mob.dm
* Delete mob.dm.rej
|
2017-05-18 06:12:18 -05:00 |
|
CitadelStationBot
|
8bcaa54cbe
|
[MIRROR] Fixes language code ignoring holder restrictions (#858)
* Fixes language code ignoring holder restrictions
* resolve .rej file.
|
2017-05-18 04:13:57 -05:00 |
|
CitadelStationBot
|
4f971be3a9
|
[MIRROR] Golems do not have underclothing (#784)
* Golems do not have underclothing
* Resolves .rej
* Update golems.dm
* Update golems.dm
|
2017-05-18 03:53:14 -05:00 |
|
CitadelStationBot
|
257cf986c5
|
Repaths C4 (#808)
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
|
2017-05-18 00:37:20 -05:00 |
|
CitadelStationBot
|
cd122501fc
|
Refactors blood regeneration from nutriment (#839)
* Refactors blood regeneration from nutriment
* Update blood.dm
* Delete blood.dm.rej
* Update blood.dm
|
2017-05-18 00:03:51 -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
|
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 |
|