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

422 Commits

Author SHA1 Message Date
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
c05c7334a5 Merge pull request #923 from Citadel-Station-13/upstream-merge-27151 
[MIRROR] Adds a visible message to teleport runes being teleported to
 2017-05-14 16:36:49 -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
42bb7a5ccd Merge pull request #941 from Citadel-Station-13/upstream-merge-27166 
[MIRROR] Fixes the recycler gibbing brainmobs
 2017-05-14 16:29:59 -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
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
5f603b7d85 Makes turrets less of a joke 2017-05-14 08:01:28 -05:00
CitadelStationBot
962d114339 Petting is better 2017-05-14 07:36:55 -05:00
LetterJay
4b72cc0486 Merge pull request #712 from Citadel-Station-13/upstream-merge-26760 
[MIRROR] Changes a bunch of hrefs to the proper defines
 2017-05-14 01:32:52 -04:00
LetterJay
e36d24ee24 Merge pull request #739 from Citadel-Station-13/upstream-merge-26783 
[MIRROR] Mania Motors now do minor damage and continue to affect targets after they leave its range
 2017-05-14 01:12:34 -04:00
LetterJay
52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
LetterJay
38eeeaa6d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26783 2017-05-13 23:42:19 -05:00
LetterJay
a09e1ff34b Merge branch 'master' into upstream-merge-26840 2017-05-14 00:37:03 -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
b19b680467 Fixes the recycler gibbing brainmobs 2017-05-13 18:01:09 -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
LetterJay
8c4fbd35e7 Merge pull request #697 from Citadel-Station-13/upstream-merge-25596 
[MIRROR] Clockcult component generation will automatically focus on components needed to activate the Ark
 2017-05-13 00:57:48 -04:00
LetterJay
f5e8a7e4e4 rej merges 2017-05-12 23:57:11 -05:00
LetterJay
18bb37f34a rej remove 2017-05-12 23:03:48 -05:00
LetterJay
a7a32e6127 commit 2017-05-12 23:03:27 -05:00
LetterJay
a1c04dd314 Merge pull request #898 from LetterJay/master 
Adds a hunter hat to the game/clothesmate
 2017-05-12 16:24:17 -04:00
CitadelStationBot
4280c20af8 Adds a visible message to teleport runes being teleported to 2017-05-12 15:12:46 -05:00
CitadelStationBot
779ba7ac89 Fixes a GC error with holocalls (#903) 2017-05-11 18:26:52 -07:00
CitadelStationBot
b6c5f0b4fa Removes explosion delays (#911) 2017-05-11 18:24:28 -07:00
CitadelStationBot
eadee76e87 Adds a few more abductee objectives. (#909) 2017-05-11 18:23:47 -07:00
LetterJay
3c131800b6 Merge pull request #722 from Citadel-Station-13/upstream-merge-26645 
[MIRROR] Persistent investigate and game logs separated by round ID
 2017-05-10 21:12:08 -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
71a36f1606 [MIRROR] 150 hours of testing (fixes master) (#889) 
* 150 hours of testing (fixes master)

* Update gang.dm

* Delete gang.dm.rej
 2017-05-10 16:10:38 -07:00
CitadelStationBot
69d72877a2 [DNM] [MIRROR] Probably fixes the ending cinematic to Gang War (#888) 
* Probably fixes the ending cinematic to Gang War

* Update gang.dm

* Delete gang.dm.rej

* Update gang.dm
 2017-05-10 16:08:32 -07:00
CitadelStationBot
82deebb863 Dominators now require a significant amount of open turf around them (#895) 2017-05-10 16:06:29 -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
LetterJay
43dd22425b Citadel hat DMI/DM 
Cleans up pointless files
 2017-05-10 17:33:13 -05: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
5c8a9c5342 Syndicate borg/reinforcement spawners have a Never For This Round option. (#851) 2017-05-08 16:48:28 -07:00
CitadelStationBot
8e0e77cd35 Nerfs Chaplain smoke book. (#758) 2017-05-08 16:45:59 -07:00
CitadelStationBot
53dba37fca Fixes decals on shuttles (#855) 2017-05-08 16:44:59 -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
CitadelStationBot
65729cdd55 [MIRROR] Fixes being unable to hit trophy cases in melee (#844) 
* Fixes being unable to hit trophy cases in melee

* Update displaycase.dm

* Delete displaycase.dm.rej

* Update displaycase.dm
 2017-05-08 00:31:54 -07:00
CitadelStationBot
9acc4da365 [MIRROR] Curator starts with the key to the display cases instead of being the key (#763) 
*  Curator starts with the key to the display cases instead of being the key

* Update displaycase.dm

* Delete displaycase.dm.rej

* Delete civilian.dm.rej

* Update civilian.dm

* fuck line endings

* define true/false
 2017-05-08 00:25:59 -07:00