Commit Graph

15682 Commits

Author SHA1 Message Date
Lin
04b6d854f8 Merge pull request #12914 from Citadel-Station-13/silicons-patch-56
forensic scanners no longer pick up color in blood dna
2020-07-26 17:24:33 -05:00
Lin
4b56dc65af Merge pull request #12897 from Citadel-Station-13/silicons-patch-51
fixes clothes repairs
2020-07-26 17:24:21 -05:00
Lin
b3722d0a43 Merge pull request #12913 from Citadel-Station-13/silicons-patch-55
atmos microoptimizations
2020-07-26 17:22:03 -05:00
Ludox
fee4dd6d14 ZOMBIES. ACT LIKE ONE.
This is why we can't have nice things in life.
2020-07-27 00:16:31 +02:00
silicons
49070d732b ohhhhhhh boy 2020-07-26 15:10:08 -07:00
silicons
7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
SiliconMain
63bb9fe0f3 the dangers of copypaste 2020-07-26 16:35:50 -05:00
SiliconMain
abdafe15fa fuck 2020-07-26 15:21:24 -05:00
Hatterhat
af08e8a37f altclick for fucked up parries! also bugfixes 2020-07-26 13:02:56 -05:00
The0bserver
129297dfa5 this commit intentionally left blank 2 2020-07-26 10:06:35 -04:00
The0bserver
556fedacd0 this commit intentionally left blank 2020-07-26 09:56:46 -04:00
The0bserver
dd16a509f2 Initial Commit: MIGHT add tags 2020-07-26 09:18:32 -04:00
silicons
389a54590e fix 2020-07-26 00:32:14 -07:00
silicons
829403a2ac Update say.dm 2020-07-25 23:52:15 -07:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
e2a7064c10 Update say.dm 2020-07-25 23:40:39 -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
ad5f47ea8f Update scanner.dm 2020-07-25 15:29:44 -07:00
silicons
75213ceef2 Update LINDA_turf_tile.dm 2020-07-25 13:58:38 -07:00
Sishen
04feb3c4a5 borg 2020-07-25 03:22:48 -06:00
CameronWoof
df7a1f2b8d adds spaceman's trumpet seeds to the exotic seeds crate 2020-07-24 23:08:36 -07:00
silicons
23465355d0 Update stun.dm 2020-07-24 22:16:06 -07:00
silicons
44d3a0aa27 fixes 2020-07-24 20:37:02 -07:00
silicons
33d5ba788b aight 2020-07-24 20:19:18 -07:00
silicons
4d83060ba1 Update clothing.dm 2020-07-24 19:29:29 -07:00
Hatterhat
14fba6a056 funny parry sticks 2020-07-24 21:19:01 -05:00
timothyteakettle
e273d327bd yeah 2020-07-25 01:11:04 +01: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
silicons
1c4249c99d Update medbeam.dm 2020-07-24 00:57:30 -07:00
Iatots
a9c51fc624 Update other_reagents.dm 2020-07-24 08:40:48 +02:00
timothyteakettle
060b3dcd04 im sorry moths 2020-07-24 03:27:44 +01:00
silicons
aabe3c3b32 Update emitter.dm 2020-07-23 18:52:39 -07:00
silicons
bb32f183ff Update weaponized.dm 2020-07-23 18:52:35 -07:00
silicons
f47a7449e3 Update gun.dm 2020-07-23 18:52:23 -07:00
silicons
0b4185e26f Update beam_rifle.dm 2020-07-23 18:52:18 -07:00
silicons
ce18584fb1 Update beam_rifle.dm 2020-07-23 18:47:22 -07:00
Timothy Teakettle
fa489efa79 spellcheck 2020-07-24 02:39:41 +01:00
silicons
99737b6e11 Update projectile.dm 2020-07-23 18:35:32 -07: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
1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -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