8f8aaee36c
fixes up drinks
2020-07-23 22:09:14 +01:00
450509347a
tidy species more
2020-07-23 21:57:32 +01:00
d30acd5b09
smooth
2020-07-23 13:49:17 -07:00
c3ca4be149
ok
2020-07-23 13:47:07 -07: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
29a8c2eee6
flushed
2020-07-23 12:47:21 -07:00
cbe0cad1a4
fix
2020-07-23 12:41:33 -07:00
4da365851f
up to regulations now.
2020-07-23 21:27:00 +02: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
21ef5fb1b7
Update other_reagents.dm
2020-07-23 21:14:46 +02:00
b2a0d00eee
Update plushes.dm
2020-07-23 21:13:41 +02:00
554e764be8
Update cuts.dm
...
dang speededit
2020-07-23 21:00:26 +02:00
80233e52af
ok
2020-07-23 11:56:08 -07:00
a2381755e1
Update cuts.dm
...
nomenclature error
2020-07-23 20:52:29 +02:00
db3f9b4549
woops
2020-07-23 11:48:46 -07:00
95cd7c6571
fix
2020-07-23 11:46:46 -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
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
aaa536b8fc
ok
2020-07-23 11:38:15 -07: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
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
e6dd213a2a
Update recipes_misc.dm
2020-07-23 20:26:11 +02: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
cd67be32e0
Update wishgranter.dm
2020-07-23 11:12:09 -07:00
80f2766314
Update plushes.dm
2020-07-23 20:11:29 +02:00
5463673831
fuck
2020-07-23 19:02:50 +01:00
21143ade21
eyeroll
2020-07-23 11:01:33 -07:00
967dfb7bc4
Update other_reagents.dm
2020-07-23 19:59:08 +02:00
673188bc7e
please show the hat
2020-07-23 18:57:24 +01:00
9d89158fda
Update cuts.dm
2020-07-23 19:48:41 +02:00
b18356c95d
requested changes
2020-07-23 18:47:34 +01:00
3dac7e4b43
Update generic_positive_events.dm
2020-07-23 19:44:02 +02:00
da4e208f94
ok
2020-07-23 10:40:12 -07:00
db24df58a0
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:36:46 -07:00
9f66163d4f
Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20
...
Ports several food sprites/foods from Baystation/Citadel RP
2020-07-23 10:35:30 -07:00
ec72015f4f
Merge pull request #12809 from BlackMajor/borgo
...
Gripper brained. The medborg can do chemistry now, oh no.
2020-07-23 10:35:16 -07:00
55754023ba
Update gas_mixture.dm
2020-07-23 10:32:21 -07:00
41cd02152a
tidy up
2020-07-23 18:30:25 +01:00
dad3d38933
Merge pull request #12869 from timothyteakettle/zombies-rework
...
the very much needed zombie buffs
2020-07-23 10:29:43 -07:00
aeb6688bc7
Merge pull request #12860 from Sneakyrat6/burnablePhoto
...
Allows Photos to be Burned
2020-07-23 10:29:10 -07:00
11a4dfd20b
Merge pull request #12861 from Sneakyrat6/dresserFix
...
Fixes dressers not giving you undies
2020-07-23 10:28:54 -07:00
Timothy Teakettle