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
9687080cd0
Crab/Carp DEVOURALE = TRUE
2017-05-09 21:04:08 -05: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
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
44c29c6193
Fixes clothing damage message ( #831 )
2017-05-08 16:44:38 -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
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
49881624e2
Merge pull request #772 from Citadel-Station-13/upstream-merge-26874
...
[MIRROR] Fixes the most annoying thing about admin helping.
2017-05-07 23:16:33 -07:00
kevinz000
010baa6a34
Merge pull request #661 from Citadel-Station-13/upstream-merge-26705
...
[MIRROR] Fixes spelling for Lavaland Syndicate
2017-05-07 22:53:29 -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
9ca8b570b2
Merge branch 'master' into upstream-merge-26705
2017-05-07 22:53:14 -07:00
kevinz000
52a8aacd00
Delete lavaland_ruin_code.dm.rej
2017-05-07 22:52:47 -07:00
kevinz000
204a3a3938
Update lavaland_ruin_code.dm
2017-05-07 22:52:39 -07:00
kevinz000
bd8bfe1327
Merge pull request #684 from Citadel-Station-13/upstream-merge-26728
...
[MIRROR] A bunch of sparks to do_sparks [Travis error unrelated to PR]
2017-05-07 22:41:24 -07:00
kevinz000
8c80fee6aa
Merge pull request #835 from Citadel-Station-13/upstream-merge-26993
...
[MIRROR] Allows Mediborg organ storage to hold inorganic bodyparts
2017-05-07 22:36:52 -07:00
kevinz000
2e0dd27978
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813
2017-05-07 22:28:00 -07:00
