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

1088 Commits

Author SHA1 Message Date
CitadelStationBot
eadee76e87 Adds a few more abductee objectives. (#909) 2017-05-11 18:23:47 -07:00
LetterJay
916b1536ef Merge pull request #899 from Citadel-Station-13/config_loading 
fixes issue with config loading
 2017-05-10 23:41:42 -04:00
LetterJay
b7acf503eb rej cleanup 2017-05-10 22:35:01 -05:00
LetterJay
a66e0c949e Merge pull request #832 from Citadel-Station-13/upstream-merge-23201 
[MIRROR] [READY]DATUM VERBS AND TOP MENUS!
 2017-05-10 23:05:37 -04:00
LetterJay
746da812bf Delete client_procs.dm.rej 2017-05-10 22:00:44 -05:00
LetterJay
43318a88a5 rej fix 2017-05-10 21:59:41 -05:00
LetterJay
0411299a23 fixes issue with config loading 2017-05-10 21:42:48 -05: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
kevinz000
9f7dd3fe16 Update ghost.dm 2017-05-10 17:53:27 -07:00
LetterJay
57372ebdb0 merge 2017-05-10 19:41:55 -05:00
LetterJay
bc9805dab0 Merge pull request #830 from Citadel-Station-13/upstream-merge-27042 
[MIRROR] Fixes this annoying ass thing in the bandb I should have fixed before.
 2017-05-10 20:08:54 -04:00
CitadelStationBot
4d9b48e5c5 Commit hash in rev data is now shortened (#873) 2017-05-10 16:28:14 -07: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
4a818bee1f Adds Sticks of Butter, Mayonnaise, and Mix function to grinder (#896) 2017-05-10 16:16:48 -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
8fadc0e734 Nettles won't pierce PIERCEIMMUNE species (#852) 2017-05-10 16:14:31 -07:00
CitadelStationBot
bbff27bd58 [MIRROR] Make Lathe Design Names Capitalized Consistently (#860) 
* Make Lathe Design Names Capitalized Consistently

* Delete biogenerator_designs.dm.rej
 2017-05-10 16:14:06 -07:00
CitadelStationBot
1e1e0f7f6e More /vg/lighting tweaks (#884) 2017-05-10 16:11:22 -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
2625269439 t-ray mode on goggles resets lighting (#885) 2017-05-10 16:05:55 -07:00
CitadelStationBot
5b2521dad4 Tweaks the curator's access and clothing to improve his treasure hunting ability (#882) 2017-05-10 16:05:33 -07:00
CitadelStationBot
42fe8eb7c7 Fixes riding messages always using male pronouns (#869) 2017-05-10 16:05:14 -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
CitadelStationBot
ccf4550ac1 Lavaland Loot: Cursed heart upgraded to wizard version, New loot item that grants omnitongue (#890) 2017-05-10 16:04:21 -07:00
CitadelStationBot
062ba92bdc woops I used the wrong operator there (#893) 2017-05-10 16:03:33 -07:00
CitadelStationBot
d804e5e886 Fixes wizard academy spawner. (#892) 2017-05-10 16:03:03 -07:00
CitadelStationBot
18607f79a2 Wooden planks now sell for 50 instead of 25 cargo points (#897) 2017-05-10 16:00:59 -07:00
LetterJay
9687080cd0 Crab/Carp DEVOURALE = TRUE 2017-05-09 21:04:08 -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
c7b78203a5 Fixes spelling error when implanting BITTEN organs (#847) 2017-05-08 16:48:44 -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
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
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
44c29c6193 Fixes clothing damage message (#831) 2017-05-08 16:44:38 -07:00
CitadelStationBot
c506b6c7ce Makes initial adamantine golem shells non-anchored and non-dense (#856) 2017-05-08 16:44:11 -07:00
CitadelStationBot
92bbdafc94 Adjusts Meteor Shuttle name for grammar (#862) 2017-05-08 16:43:37 -07:00
CitadelStationBot
09eb38714d [MIRROR] Flushes Ling & Alien HUD info with the edge of the screen (#721) 
* Flushes Ling & Alien HUD info with the edge of the screen

* Update _defines.dm

* Delete _defines.dm.rej

* fucking endlines
 2017-05-08 00:32:40 -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
CitadelStationBot
a6cb12b84a [MIRROR] Plastic golems (#806) 
* Plastic golems

* Update lavaland_ruin_code.dm

* Delete lavaland_ruin_code.dm.rej
 2017-05-08 00:25:20 -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