LetterJay
|
8d237cd8bb
|
define var
|
2017-05-14 00:11:23 -05:00 |
|
LetterJay
|
52fa1f314f
|
Merge branch 'master' into upstream-merge-26760
|
2017-05-14 01:02:26 -04:00 |
|
LetterJay
|
e66cbfd7db
|
my v key is broken
|
2017-05-13 23:32:47 -05:00 |
|
LetterJay
|
36de555483
|
commit
|
2017-05-13 23:32:23 -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
|
bba7b9246d
|
rej cleanup
|
2017-05-13 00:12:05 -05:00 |
|
LetterJay
|
f5e8a7e4e4
|
rej merges
|
2017-05-12 23:57:11 -05:00 |
|
CitadelStationBot
|
c5ed5b84e3
|
Zombies can see in the dark
|
2017-05-12 15:57:11 -05:00 |
|
LetterJay
|
6989a33584
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-05-12 15:25:26 -05:00 |
|
LetterJay
|
adc1b96b74
|
this is kenzie's fault
|
2017-05-12 15:25:11 -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 |
|
LetterJay
|
91c58632b3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-05-12 10:55:10 -05:00 |
|
LetterJay
|
6d1fb0d48a
|
the ride never ends
|
2017-05-12 10:54:57 -05:00 |
|
LetterJay
|
2abeadb92b
|
Merge pull request #845 from Citadel-Station-13/upstream-merge-27056
[MIRROR] Corrects get id query to ckey
|
2017-05-12 11:08:18 -04:00 |
|
LetterJay
|
745bf3b321
|
client procs... client procs.... client procs....
|
2017-05-12 09:57:20 -05:00 |
|
LetterJay
|
55492bb8ec
|
even more client fixes! this time with added admin fixes
|
2017-05-12 09:52:42 -05:00 |
|
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
|
a679933cc7
|
SDQL cleanup (#904)
|
2017-05-11 18:26:15 -07:00 |
|
CitadelStationBot
|
7f0f7e1cc6
|
Cleans up meter's Initialize (#905)
|
2017-05-11 18:24:00 -07: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
|
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
|
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
|
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
|
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
|
43dd22425b
|
Citadel hat DMI/DM
Cleans up pointless files
|
2017-05-10 17:33:13 -05:00 |
|