CitadelStationBot
|
acbaa45aee
|
Adds a few new recipes created with plastic sheets (#979)
|
2017-05-18 11:53:17 -05:00 |
|
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
|
a681b306a6
|
[MIRROR] Buffs plasma and nerfs snow (#924)
* Buffs plasma and nerfs snow
* Update mineral.dm
* Delete mineral.dm.rej
|
2017-05-18 11:13:28 -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
|
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 |
|
LetterJay
|
d40c2224c3
|
Merge pull request #624 from Citadel-Station-13/upstream-merge-26492
[MIRROR] Adds new debug verb for highlighting roundstart ATs
|
2017-05-18 05:51:54 -04:00 |
|
CitadelStationBot
|
ff9928fdd7
|
[MIRROR] Makes it clear whether (in)complete golem shells are free or servant (#857)
* Makes it clear whether (in)complete golem shells are free or servant
* resolves rej file
|
2017-05-18 04:40:12 -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
|
47fa8353eb
|
[MIRROR] Moves playsound_local() to mob and gets rid of a useless proc. (#710)
* Moves playsound_local() to mob and gets rid of a useless proc.
* Fixes compile errors
|
2017-05-18 01:39:16 -05:00 |
|
CitadelStationBot
|
ae5897cd82
|
Ash walkers speak Draconic by default, but still know common (#834)
|
2017-05-18 01:12:55 -05:00 |
|
CitadelStationBot
|
d2be6cfeb5
|
Refactors leather & Crafting with Bigenerator (#849)
|
2017-05-18 01:11:58 -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 |
|
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 |
|
CitadelStationBot
|
242bff4288
|
Prepends object names with 'The' in speech
|
2017-05-17 05:13:47 -05:00 |
|
LetterJay
|
bdbedd33f4
|
Merge branch 'master' into upstream-merge-26776
|
2017-05-17 05:14:18 -04:00 |
|
LetterJay
|
f978e3d56e
|
rej cleanup
|
2017-05-17 03:50:34 -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
|
f52625b18c
|
Refactors supply talismans to be less shitcode
|
2017-05-15 17:54:16 -05:00 |
|
cebutris
|
fc628bcb89
|
adds the holoparasite box, and adds it to traitor uplinks (#913)
|
2017-05-14 20:36:22 -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 |
|
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 |
|
CitadelStationBot
|
b95d4e0459
|
[MIRROR] Land Claim Flag (#951)
* Land Claim Flag
* Delete charter.dm.rej
* Update charter.dm
|
2017-05-14 20:16:17 -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
|
051de8da99
|
Merge pull request #936 from Citadel-Station-13/upstream-merge-27184
[MIRROR] Explosion flame_range now defaults to light range instead of zero
|
2017-05-14 16:33:00 -04:00 |
|
LetterJay
|
bf26c247e0
|
Merge pull request #931 from Citadel-Station-13/upstream-merge-27167
[MIRROR] Ports dakimakuras from HippieStation.
|
2017-05-14 16:32:40 -04:00 |
|
LetterJay
|
1c422705d0
|
Merge pull request #950 from Citadel-Station-13/upstream-merge-27190
[MIRROR] WHOSE FOOTPRINTS ARE THESE
|
2017-05-14 16:28:05 -04:00 |
|
LetterJay
|
d64e569d6c
|
Merge pull request #954 from Citadel-Station-13/upstream-merge-27199
[MIRROR] Free Golems can purchase their own royal capes
|
2017-05-14 16:27:25 -04:00 |
|
CitadelStationBot
|
962d114339
|
Petting is better
|
2017-05-14 07:36:55 -05:00 |
|
LetterJay
|
52fa1f314f
|
Merge branch 'master' into upstream-merge-26760
|
2017-05-14 01:02:26 -04:00 |
|
CitadelStationBot
|
73101cbd88
|
Free Golems can purchase their own royal capes
|
2017-05-13 21:17:37 -05:00 |
|
CitadelStationBot
|
9dcac046ef
|
WHOSE FOOTPRINTS ARE THESE
|
2017-05-13 18:01:40 -05:00 |
|
CitadelStationBot
|
3d4356cd7c
|
Explosion flame_range now defaults to light range instead of zero
|
2017-05-13 18:00:49 -05:00 |
|
CitadelStationBot
|
474fd582ea
|
Ports dakimakuras from HippieStation.
|
2017-05-13 18:00:32 -05:00 |
|
LetterJay
|
22aef374e2
|
Merge branch 'master' into upstream-merge-26140
|
2017-05-13 01:28:34 -04: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 |
|
CitadelStationBot
|
5790e8359a
|
[MIRROR] GPS Personalizations [Post TGPSUI] (#642)
* GPS Personalizations [Post TGPSUI]
* Delete gps.dm.rej
* Update gps.dm
* eol
|
2017-05-10 16:27:49 -07:00 |
|
CitadelStationBot
|
93e652e07b
|
Capitalizes machine names when they talk on radio (#886)
|
2017-05-10 16:04:58 -07:00 |
|
CitadelStationBot
|
914ae0cc4f
|
You can now buy double eswords from the uplink, but you can no longer use two eswords to construct them (#891)
|
2017-05-10 16:04:42 -07:00 |
|
kevinz000
|
005d8a8156
|
Lets try that again... (#868)
* TGUI GPS
* fixes .rej
|
2017-05-08 22:58:46 -07:00 |
|
kevinz000
|
77c066d93a
|
Revert "[MIRROR] TGUI GPS" (#867)
* Revert "Automatic changelog generation for PR #608 [ci skip]"
This reverts commit 7701c39fde.
* Revert "TGUI GPS (#608)"
This reverts commit ba0f4b1c59.
|
2017-05-08 22:48:34 -07:00 |
|
CitadelStationBot
|
ba0f4b1c59
|
TGUI GPS (#608)
|
2017-05-08 22:46:42 -07: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
|
c506b6c7ce
|
Makes initial adamantine golem shells non-anchored and non-dense (#856)
|
2017-05-08 16:44:11 -07:00 |
|
CitadelStationBot
|
98765ec854
|
Small Click refactor.
|
2017-05-08 03:06:05 -05:00 |
|