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

188 Commits

Author SHA1 Message Date
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
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
CitadelStationBot
e89bdb6422 [MIRROR] Fixes some stuff (#768) 
* Fixes some stuff

* line fucking endings
 2017-05-08 00:25:40 -07:00
kevinz000
335b6cde56 Merge branch 'master' into upstream-merge-26813 2017-05-07 22:31:16 -07:00
kevinz000
a87cee8a05 copy-paste-this-from-tg 2017-05-07 22:30:43 -07:00
kevinz000
68f7ea7fd0 handled rejects 2017-05-07 22:30:28 -07:00
kevinz000
2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
kevinz000
066c8e8de8 Merge pull request #720 from Citadel-Station-13/upstream-merge-26822 
[MIRROR] Trophy case hotfixes
 2017-05-07 22:27:05 -07:00
kevinz000
48d9e2e349 fixes rejects 2017-05-07 22:24:26 -07:00
kevinz000
5d2f131d07 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26822 2017-05-07 22:22:24 -07:00
kevinz000
13b0ae2b45 Merge pull request #676 from Citadel-Station-13/upstream-merge-26725 
[MIRROR] Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass
 2017-05-07 19:37:35 -07:00
kevinz000
78d64cbeed Merge pull request #825 from Citadel-Station-13/upstream-merge-26941 
[MIRROR] C4 planting takes 3 seconds, down from 5
 2017-05-07 12:59:10 -07:00
CitadelStationBot
1a5050692b Fixes his grace CtrlClick 2017-05-07 11:33:55 -05:00
CitadelStationBot
b0cceb8766 C4 planting takes 3 seconds, down from 5 2017-05-07 09:31:51 -05:00
kevinz000
cd95e42b69 Merge pull request #753 from Citadel-Station-13/upstream-merge-26870 
[MIRROR] Adds an effect to Mending Mantra to show who is chanting it
 2017-05-07 07:08:06 -07:00
kevinz000
d9908a74a7 Merge pull request #748 from Citadel-Station-13/upstream-merge-26808 
[MIRROR] Adds aesthetic basalt floor tiles
 2017-05-07 06:24:50 -07: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
c8dbcb8597 Merge pull request #754 from Citadel-Station-13/upstream-merge-26863 
[MIRROR] Fixes dropped cyborg repair modules
 2017-05-06 21:30:12 -07:00
kevinz000
1168d06c9e Merge pull request #759 from Citadel-Station-13/upstream-merge-26849 
[MIRROR] New Tree Sprites
 2017-05-06 21:25:06 -07:00
kevinz000
329190d660 Merge pull request #809 from Citadel-Station-13/upstream-merge-26933 
[MIRROR] Makes medbay vending machines buildable
 2017-05-06 14:22:08 -07:00
kevinz000
638250993c Merge pull request #770 from Citadel-Station-13/upstream-merge-26873 
[MIRROR] Fixes grammar error on spawner grenades
 2017-05-06 14:11:18 -07:00
kevinz000
d1a8f643d6 Merge pull request #738 from Citadel-Station-13/upstream-merge-26774 
[MIRROR] Fixes alien eggs
 2017-05-06 13:59:33 -07:00
CitadelStationBot
30f7e170a3 Makes medbay vending machines buildable 2017-05-06 13:52:12 -05:00
CitadelStationBot
5de94c22e7 Fixes grammar error on spawner grenades 2017-05-04 20:25:46 -05:00