7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
18bdf83136
God I hate travis, will this appease you?
2020-07-24 14:47:53 -04:00
8473a0291d
Revert "/probably/ gets Travis to stop shouting about guardians"
...
This reverts commit be9723678e
2020-07-24 12:05:50 -04:00
e6d7327387
Revert "makes Travis not yell at marauders I don't know they worked fine /shrug"
...
This reverts commit edd68c5174
2020-07-24 12:05:36 -04:00
a057ceaa2a
i too like my secoffs to not have blood deficiency
2020-07-24 15:31:02 +01:00
c6de85bae4
yes i too like sec being blind
2020-07-24 15:24:02 +01:00
a31e160227
this return stone keeps the null tigers away
2020-07-24 16:06:35 +02:00
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
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
8e177bf01e
another batch - MAJOR: teleportaiton, displaycase (ico port needed),
2020-07-24 19:58:48 +08:00
1c4249c99d
Update medbeam.dm
2020-07-24 00:57:30 -07:00
3ea09e7d97
what if it actualy compiled? just kidding, this only fixes dme
2020-07-24 14:50:07 +08:00
a9c51fc624
Update other_reagents.dm
2020-07-24 08:40:48 +02:00
be9723678e
/probably/ gets Travis to stop shouting about guardians
2020-07-23 23:46:10 -04:00
14ff477fa1
Revert "Makes Ratvar spawn above the Ark"
...
This reverts commit e4ae613434
2020-07-23 22:38:04 -04:00
edd68c5174
makes Travis not yell at marauders I don't know they worked fine /shrug
2020-07-23 22:35:48 -04:00
060b3dcd04
im sorry moths
2020-07-24 03:27:44 +01:00
aabe3c3b32
Update emitter.dm
2020-07-23 18:52:39 -07:00
bb32f183ff
Update weaponized.dm
2020-07-23 18:52:35 -07:00
f47a7449e3
Update gun.dm
2020-07-23 18:52:23 -07:00
0b4185e26f
Update beam_rifle.dm
2020-07-23 18:52:18 -07:00
ce18584fb1
Update beam_rifle.dm
2020-07-23 18:47:22 -07:00
fa489efa79
spellcheck
2020-07-24 02:39:41 +01:00
99737b6e11
Update projectile.dm
2020-07-23 18:35:32 -07: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
332dae9ee1
beepsky now replaces THREAT_LEVEL with the threat
2020-07-24 01:31:07 +01:00
64de8f16a9
fixes
2020-07-23 16:59:27 -07:00
b20e3bc2b6
monkey attacks
2020-07-23 16:30:27 -07:00
53b3c6099b
ok
2020-07-23 16:27:41 -07:00
1f25c7f06d
Merge remote-tracking branch 'citadel/master' into shoelaces
2020-07-23 16:23:34 -07: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
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
e4ae613434
Makes Ratvar spawn above the Ark
2020-07-23 17:49:14 -04:00
ed8723e74e
Merge branch 'master' into species-are-dumb
2020-07-23 22:15:10 +01:00
f4933c4177
let them scar
2020-07-23 22:14:41 +01:00
8f8aaee36c
fixes up drinks
2020-07-23 22:09:14 +01:00
450509347a
tidy species more
2020-07-23 21:57:32 +01:00
03f0d76a8e
yeah ok
2020-07-23 13:23:45 -07:00
29a8c2eee6
flushed
2020-07-23 12:47:21 -07:00
4da365851f
up to regulations now.
2020-07-23 21:27:00 +02:00
21ef5fb1b7
Update other_reagents.dm
2020-07-23 21:14:46 +02: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
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
Timothy Teakettle