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

1106 Commits

Author SHA1 Message Date
LetterJay
59497ff049 more client fixes 2017-05-12 02:41:12 -05:00
LetterJay
e748d40401 Update client_procs.dm 2017-05-12 02:29:03 -05:00
LetterJay
19db647c58 Merge pull request #793 from Citadel-Station-13/upstream-merge-26922 
[MIRROR] Adds player age and byond account age to player panel
 2017-05-12 03:16:06 -04:00
LetterJay
c7fce18213 travis 2017-05-12 01:54:20 -05:00
LetterJay
fd5b7566fd update client_procs.dm 2017-05-12 01:49:56 -05:00
LetterJay
6a1cac4e1e Merge branch 'master' into upstream-merge-26425 2017-05-12 00:08:32 -04:00
LetterJay
8bb34472b7 fuck 2017-05-11 23:07:50 -05:00
LetterJay
ff414d3a27 rej cleanup 2017-05-11 23:00:26 -05:00
CitadelStationBot
6c4524700b Fixes character saves getting fucked up if there are no configured round start races. (#742) 2017-05-11 19:24:59 -07:00
CitadelStationBot
ff7125efb6 pAI requests now tell ghosts who is making the request. (#900) 2017-05-11 18:27:05 -07:00
CitadelStationBot
779ba7ac89 Fixes a GC error with holocalls (#903) 2017-05-11 18:26:52 -07:00
CitadelStationBot
ce65bd28b0 Hopefully fixes a holocall runtime (#902) 2017-05-11 18:26:33 -07:00
CitadelStationBot
a679933cc7 SDQL cleanup (#904) 2017-05-11 18:26:15 -07:00
CitadelStationBot
0265ab60ff Cleans up an MC statement (#907) 2017-05-11 18:24:48 -07:00
CitadelStationBot
b6c5f0b4fa Removes explosion delays (#911) 2017-05-11 18:24:28 -07:00
CitadelStationBot
7f0f7e1cc6 Cleans up meter's Initialize (#905) 2017-05-11 18:24:00 -07:00
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