LetterJay
|
ebb4e134cb
|
commit
|
2017-05-13 23:45:02 -05:00 |
|
LetterJay
|
38eeeaa6d5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26783
|
2017-05-13 23:42:19 -05:00 |
|
LetterJay
|
a09e1ff34b
|
Merge branch 'master' into upstream-merge-26840
|
2017-05-14 00:37:03 -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
|
4b2b5e7520
|
commit
|
2017-05-13 23:21:40 -05:00 |
|
CitadelStationBot
|
73101cbd88
|
Free Golems can purchase their own royal capes
|
2017-05-13 21:17:37 -05:00 |
|
CitadelStationBot
|
e59c48b20d
|
Soul Vessels now have the proper laws
|
2017-05-13 21:15:32 -05:00 |
|
kevinz000
|
25024432fe
|
more procs and roundstart loading files
|
2017-05-13 16:23:43 -07:00 |
|
CitadelStationBot
|
9dcac046ef
|
WHOSE FOOTPRINTS ARE THESE
|
2017-05-13 18:01:40 -05:00 |
|
CitadelStationBot
|
eacd4305e6
|
Clipboard Initialize + GC fixes
|
2017-05-13 18:01:26 -05:00 |
|
CitadelStationBot
|
a57afab0a9
|
Fixes an overlays runtime
|
2017-05-13 18:01:22 -05:00 |
|
CitadelStationBot
|
d9a2939143
|
Fixes pizza box icons
|
2017-05-13 18:01:19 -05:00 |
|
CitadelStationBot
|
b0bfcdabe9
|
Fixes something not using create_reagents
|
2017-05-13 18:01:12 -05:00 |
|
CitadelStationBot
|
b19b680467
|
Fixes the recycler gibbing brainmobs
|
2017-05-13 18:01:09 -05:00 |
|
CitadelStationBot
|
b9e3e99faa
|
Adds Several Butter-filled Foods
|
2017-05-13 18:00:57 -05:00 |
|
CitadelStationBot
|
b9ad2c31c9
|
Buffs honey
|
2017-05-13 18:00:53 -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 |
|
kevinz000
|
9e0866871e
|
lists and stuff
|
2017-05-13 11:26:07 -07: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
|
8c4fbd35e7
|
Merge pull request #697 from Citadel-Station-13/upstream-merge-25596
[MIRROR] Clockcult component generation will automatically focus on components needed to activate the Ark
|
2017-05-13 00:57:48 -04:00 |
|
LetterJay
|
f5e8a7e4e4
|
rej merges
|
2017-05-12 23:57:11 -05:00 |
|
LetterJay
|
18bb37f34a
|
rej remove
|
2017-05-12 23:03:48 -05:00 |
|
LetterJay
|
a7a32e6127
|
commit
|
2017-05-12 23:03:27 -05:00 |
|
LetterJay
|
74ea8ce4b4
|
Merge pull request #790 from Citadel-Station-13/upstream-merge-26962
[MIRROR] Patches the new cleanbot bug
|
2017-05-12 23:54:29 -04: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 |
|
CitadelStationBot
|
4280c20af8
|
Adds a visible message to teleport runes being teleported to
|
2017-05-12 15:12:46 -05:00 |
|
CitadelStationBot
|
5625ff030a
|
Dominators require an open space, except it works this time
|
2017-05-12 11:11:34 -05: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
|
4c2d6e4ef5
|
Wraiths now refund part of Phase Shift's cooldown by attacking
|
2017-05-11 20:40:18 -05:00 |
|
CitadelStationBot
|
ff7125efb6
|
pAI requests now tell ghosts who is making the request. (#900)
|
2017-05-11 18:27:05 -07:00 |
|