Commit Graph

15587 Commits

Author SHA1 Message Date
silicons
5bf4afcade sigh 2020-07-27 14:09:37 -07:00
silicons
67b518bf42 experimental 2020-07-27 13:09:54 -07:00
silicons
22efdbffcd woops 2020-07-26 23:08:41 -07:00
silicons
bf4b2dfbf5 ok 2020-07-26 15:59:56 -07:00
silicons
49070d732b ohhhhhhh boy 2020-07-26 15:10:08 -07:00
silicons
7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
silicons
389a54590e fix 2020-07-26 00:32:14 -07:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
2a29f73ac8 ok 2020-07-25 17:34:12 -07:00
silicons
91081ef24c Merge pull request #12872 from Iatots/hairball
Adds depth to the lick wounds mechanic.
2020-07-25 15:40:15 -07:00
silicons
44d3a0aa27 fixes 2020-07-24 20:37:02 -07:00
silicons
33d5ba788b aight 2020-07-24 20:19:18 -07:00
Iatots
a31e160227 this return stone keeps the null tigers away 2020-07-24 16:06:35 +02:00
Iatots
83c6dc65ba Update code/modules/reagents/chemistry/reagents/other_reagents.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
2020-07-24 15:22:56 +02:00
Iatots
2eade6c149 Update code/modules/reagents/chemistry/reagents/other_reagents.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
2020-07-24 15:22:38 +02:00
Iatots
a9c51fc624 Update other_reagents.dm 2020-07-24 08:40:48 +02:00
nik707
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
timothyteakettle
adc4c76be7 fix 2020-07-24 02:00:22 +01:00
timothyteakettle
332dae9ee1 beepsky now replaces THREAT_LEVEL with the threat 2020-07-24 01:31:07 +01:00
silicons
64de8f16a9 fixes 2020-07-23 16:59:27 -07:00
silicons
b20e3bc2b6 monkey attacks 2020-07-23 16:30:27 -07:00
silicons
53b3c6099b ok 2020-07-23 16:27:41 -07:00
silicons
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
silicons
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
Lin
a655502d9a tabs! 2020-07-23 22:58:00 +00:00
Lin
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
silicons
03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
silicons
29a8c2eee6 flushed 2020-07-23 12:47:21 -07:00
Iatots
4da365851f up to regulations now. 2020-07-23 21:27:00 +02:00
Iatots
21ef5fb1b7 Update other_reagents.dm 2020-07-23 21:14:46 +02:00
Lin
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
silicons
aaa536b8fc ok 2020-07-23 11:38:15 -07:00
Timothy Teakettle
e4f0a84404 cut overlay 2020-07-23 19:33:26 +01:00
Lin
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
Lin
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
Lin
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
Lin
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
Lin
7352e21877 Merge pull request #12844 from Citadel-Station-13/silicons-patch-41
fixes traitor jobban link
2020-07-23 13:19:25 -05:00
Lin
69c3d4f24a Merge pull request #12864 from Citadel-Station-13/silicons-patch-45
regarding changelings
2020-07-23 13:18:55 -05:00
Timothy Teakettle
5463673831 fuck 2020-07-23 19:02:50 +01:00
silicons
21143ade21 eyeroll 2020-07-23 11:01:33 -07:00
Iatots
967dfb7bc4 Update other_reagents.dm 2020-07-23 19:59:08 +02:00
Timothy Teakettle
673188bc7e please show the hat 2020-07-23 18:57:24 +01:00
Timothy Teakettle
b18356c95d requested changes 2020-07-23 18:47:34 +01:00
silicons
da4e208f94 ok 2020-07-23 10:40:12 -07:00
silicons
db24df58a0 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:36:46 -07:00
silicons
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
silicons
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
silicons
55754023ba Update gas_mixture.dm 2020-07-23 10:32:21 -07:00
silicons
dad3d38933 Merge pull request #12869 from timothyteakettle/zombies-rework
the very much needed zombie buffs
2020-07-23 10:29:43 -07:00