c1932be528
last second edit woops
2020-07-25 21:53:11 +01:00
8b2a92994f
less rng reliance
2020-07-25 20:14:41 +01:00
3a894f79d0
less rng reliant this is way better
2020-07-25 19:56:46 +01:00
4d397bd8ae
Merge branch 'wounds-part-2' of https://github.com/timothyteakettle/Citadel-Station-13 into wounds-part-2
2020-07-25 18:15:19 +01:00
4f7ea622d6
hey this is important
2020-07-25 18:15:05 +01:00
e18bfb41b7
woopsy
2020-07-25 02:16:39 +01:00
b708be60e9
hey look ma i removed a space
2020-07-25 02:12:21 +01:00
c4a1019059
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-07-25 02:03:01 +01:00
697301ad53
error fixies?
2020-07-25 01:26:54 +01:00
571beb24b0
Automatic changelog compile [ci skip]
2020-07-25 00:11:03 +00:00
2a3f45f7af
fixes
2020-07-25 01:10:12 +01:00
3ca098fe98
bugfixes
2020-07-25 00:22:24 +01:00
315e7e1f99
bugfixes
2020-07-24 23:49:15 +01:00
59f949018c
Merge branch 'master' into wounds-part-2
2020-07-24 23:45:20 +01:00
8360bb1a7f
section 2
2020-07-24 23:44:57 +01:00
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
a88fa29682
Automatic changelog generation for PR #12879 [ci skip]
2020-07-23 20:12:01 -05:00
6117b7d81e
Merge pull request #12879 from timothyteakettle/let-bots-wear-hats
...
beepsky replaces THREAT_LEVEL with the actual threat
2020-07-23 20:11:57 -05:00
adc4c76be7
fix
2020-07-24 02:00:22 +01:00
3fe1690f44
Automatic changelog generation for PR #12880 [ci skip]
2020-07-23 19:46:42 -05:00
5a2a2d69ae
Merge pull request #12880 from CameronWoof/aloe-icon
...
Gives aloe an item icon
2020-07-23 19:46:39 -05:00
68d46e5f0d
gives aloe an item icon
2020-07-23 17:41:08 -07:00
332dae9ee1
beepsky now replaces THREAT_LEVEL with the threat
2020-07-24 01:31:07 +01:00
5683013907
Automatic changelog compile [ci skip]
2020-07-24 00:10:34 +00:00
e0915621a8
Automatic changelog generation for PR #12878 [ci skip]
2020-07-23 18:20:09 -05:00
5182f8e49a
Merge pull request #12878 from Citadel-Station-13/Linzolle-patch-1
...
maybe you should be able to see wound descriptions
2020-07-23 16:20:05 -07:00
30a6ddd963
Automatic changelog generation for PR #12857 [ci skip]
2020-07-23 18:18:20 -05:00
d946998fb9
Merge pull request #12857 from timothyteakettle/let-bots-wear-hats
...
adds deep beepsky lore to the game in the form of hats
2020-07-23 16:18:17 -07:00
a655502d9a
tabs!
2020-07-23 22:58:00 +00:00
8a25582c1c
Merge pull request #12850 from silicons/drag
...
fixes dragging stuff into space, enforces no sleeping on Life() and sets Move() to forced async
2020-07-23 17:13:48 -05:00
8be94f2ef0
Merge pull request #12873 from silicons/FUCK
...
FUCK - rewrites sanitize_hexcolor to support converting from RGB to RRGGBB
2020-07-23 16:22:39 -05:00
03f0d76a8e
yeah ok
2020-07-23 13:23:45 -07:00
6db18f2a53
Merge remote-tracking branch 'citadel/master' into FUCK
2020-07-23 12:59:30 -07:00
cbe0cad1a4
fix
2020-07-23 12:41:33 -07:00
758d746e96
compile
2020-07-23 12:25:02 -07:00
59bd63471e
sigh
2020-07-23 12:23:13 -07:00
5d7dfd327c
FUCK
2020-07-23 12:22:55 -07:00
e14f5ff576
Merge pull request #12832 from Citadel-Station-13/overlays-experimental
...
do we want (probably) free memory savings trick question yes we do
2020-07-23 13:41:36 -05:00
464402ec6d
Automatic changelog generation for PR #12821 [ci skip]
2020-07-23 13:41:20 -05:00
1f7488aad2
Merge pull request #12821 from Citadel-Station-13/silicons-patch-36
...
Increases projectile speed across the board by around 40-45%
2020-07-23 13:41:17 -05:00
e4f0a84404
cut overlay
2020-07-23 19:33:26 +01:00
fbfd6286b5
Merge pull request #12849 from Citadel-Station-13/silicons-patch-43
...
raises max keybind command length to 32 so controller users don't get kicked
2020-07-23 13:30:31 -05:00
d112e00c11
Merge pull request #12837 from silicons/apcs
...
see unoptimized code doesn't matter much until iceboxstation rolls and now said unoptimized code is looping across probably a few tens of thousands of objects and now we have a problem
2020-07-23 13:30:00 -05:00
02add89513
Merge pull request #12846 from Citadel-Station-13/silicons-patch-42
...
it would be real lovely if the server didn't nuke 40 people's characters because the configuration couldn't be loaded because i really hate dll memes
2020-07-23 13:29:18 -05:00
2c4ed01b75
Automatic changelog generation for PR #12848 [ci skip]
2020-07-23 13:28:54 -05:00
6fca9af0ed
Merge pull request #12848 from silicons/morecolors
...
species customization now allows 16 million colors instead of 4 thousand
2020-07-23 13:28:50 -05:00
ddc10e625e
Merge pull request #12806 from Citadel-Station-13/silicons-patch-33
...
adds some more virtual data returns for gas mixture vv (temp, volume, pressure, heat capacity, energy)
2020-07-23 13:20:29 -05:00
7352e21877
Merge pull request #12844 from Citadel-Station-13/silicons-patch-41
...
fixes traitor jobban link
2020-07-23 13:19:25 -05:00
69c3d4f24a
Merge pull request #12864 from Citadel-Station-13/silicons-patch-45
...
regarding changelings
2020-07-23 13:18:55 -05:00
cdd509479e
Merge pull request #12868 from Citadel-Station-13/silicons-patch-46
...
regarding manifest injections
2020-07-23 13:18:35 -05:00
Timothy Teakettle