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

384 Commits

Author SHA1 Message Date
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
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
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
41341e50a5 Merge pull request #696 from Citadel-Station-13/upstream-merge-25458 
[MIRROR] Belligerent now prevents you from running even between chants
 2017-05-07 23:19:35 -07:00
kevinz000
a87424e105 Merge pull request #735 from Citadel-Station-13/upstream-merge-26813 
[MIRROR] Curator Update
 2017-05-07 22:53:24 -07:00
kevinz000
106a9d3ad9 Delete clockwork_slab.dm.rej 2017-05-07 22:48:04 -07:00
kevinz000
e12fc21d60 Update clockwork_slab.dm 2017-05-07 22:47:58 -07:00
kevinz000
54b8375f9c Merge pull request #803 from Citadel-Station-13/upstream-merge-26881 
[MIRROR] Updated: Reduces dominator timer ceiling, changes territory scaling
 2017-05-07 22:36:03 -07:00
kevinz000
4a59682803 Update gang.dm 2017-05-07 22:35:54 -07:00
kevinz000
6bf46e1a6d Delete gang.dm.rej 2017-05-07 22:35:48 -07:00
kevinz000
9012783adb Merge pull request #838 from Citadel-Station-13/upstream-merge-26888 
[MIRROR] Adds several weapons and cost adjustments to Gangtool
 2017-05-07 22:35:11 -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
03a52b2bc9 Merge pull request #836 from Citadel-Station-13/upstream-merge-26984 
[MIRROR] Fixes clockwork obelisk logic
 2017-05-07 19:21:56 -07:00
LetterJay
2efe90055f Revert "[MIRROR] Fixes say verbs not working" 2017-05-07 19:41:33 -04:00
CitadelStationBot
db468a1dd6 Adds several weapons and cost adjustments to Gangtool 2017-05-07 18:00:26 -05:00
CitadelStationBot
e3b3921bf2 Fixes clockwork obelisk logic 2017-05-07 17:15:22 -05:00
kevinz000
482ac95873 Merge pull request #822 from Citadel-Station-13/upstream-merge-26987 
[MIRROR] Sigils of Transgression are brighter
 2017-05-07 13:07:14 -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
CitadelStationBot
281f382605 Sigils of Transgression are brighter 2017-05-07 08:54:06 -05: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
cc25c18196 Merge pull request #801 from Citadel-Station-13/upstream-merge-26921 
[MIRROR] Internal affairs upgrades [READY]
 2017-05-07 06:23:59 -07:00
kevinz000
2f2c850937 Delete scripture_applications.dm.rej 2017-05-06 22:09:58 -07:00