Commit Graph

23658 Commits

Author SHA1 Message Date
silicons
b0f03eac12 ok 2020-07-27 21:06:03 -07:00
silicons
ffcfd21613 fix 2020-07-27 14:24:10 -07:00
silicons
5bf4afcade sigh 2020-07-27 14:09:37 -07:00
silicons
dc278d7b02 woops 2020-07-27 13:11:26 -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
8f9abfd63a no return 2020-07-26 17:30:20 -07:00
silicons
791bfabc9b walls 2020-07-26 16:03:57 -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
94e218ccc0 ok 2020-07-26 01:04:55 -07:00
silicons
55dc0a1650 Fix 2020-07-26 00:36:52 -07:00
silicons
389a54590e fix 2020-07-26 00:32:14 -07:00
silicons
d3e808f0e1 fix 2020-07-26 00:18:42 -07:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
8dda9b88b4 code 2020-07-25 23:23:45 -07:00
silicons
61a4d5eb06 fix 2020-07-25 23:22:01 -07:00
silicons
e3b8c212f1 ok 2020-07-25 23:14:38 -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
DeltaFire
db823ac16c fixes the organ bitfields 2020-07-25 19:13:08 +02:00
silicons
ac00d05a3f fix 2020-07-24 23:41:21 -07:00
silicons
48fa617aeb let's do this 2020-07-24 23:40:24 -07:00
silicons
0e1574bf77 sigh 2020-07-24 23:34:47 -07:00
silicons
849919d76c fixes 2020-07-24 20:53:46 -07:00
silicons
44d3a0aa27 fixes 2020-07-24 20:37:02 -07:00
silicons
46fc0b6ae5 epic 2020-07-24 20:22:44 -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
b6437a4ada Update code/game/objects/items/plushes.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
2020-07-24 15:23:11 +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
Iatots
ec2bd9b876 Update plushes.dm 2020-07-24 08:40:25 +02:00
Iatots
f53f7c5e92 Update cuts.dm 2020-07-24 07:46:09 +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
9c9014acdb crate fix 2020-07-23 16:19:07 -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
d30acd5b09 smooth 2020-07-23 13:49:17 -07:00
silicons
c3ca4be149 ok 2020-07-23 13:47:07 -07:00
silicons
03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00