Commit Graph

19184 Commits

Author SHA1 Message Date
Sishen
42b6944761 Update internal_affairs.dm 2020-07-25 01:54:58 -06:00
Sishen
1939d44478 removes a lot of shit from IAA 2020-07-25 01:05:38 -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
e18bfb41b7 woopsy 2020-07-25 02:16:39 +01:00
timothyteakettle
e273d327bd yeah 2020-07-25 01:11:04 +01:00
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle
315e7e1f99 bugfixes 2020-07-24 23:49:15 +01:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Keate Senior
18bdf83136 God I hate travis, will this appease you? 2020-07-24 14:47:53 -04:00
Keate Senior
8473a0291d Revert "/probably/ gets Travis to stop shouting about guardians"
This reverts commit be9723678e.
2020-07-24 12:05:50 -04:00
Keate Senior
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
Timothy Teakettle
a057ceaa2a i too like my secoffs to not have blood deficiency 2020-07-24 15:31:02 +01:00
Timothy Teakettle
c6de85bae4 yes i too like sec being blind 2020-07-24 15:24:02 +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
Letter N
8e177bf01e another batch - MAJOR: teleportaiton, displaycase (ico port needed), 2020-07-24 19:58:48 +08:00
silicons
1c4249c99d Update medbeam.dm 2020-07-24 00:57:30 -07:00
Letter N
3ea09e7d97 what if it actualy compiled? just kidding, this only fixes dme 2020-07-24 14:50:07 +08:00
Iatots
a9c51fc624 Update other_reagents.dm 2020-07-24 08:40:48 +02:00
Keate Senior
be9723678e /probably/ gets Travis to stop shouting about guardians 2020-07-23 23:46:10 -04:00
Keate Senior
14ff477fa1 Revert "Makes Ratvar spawn above the Ark"
This reverts commit e4ae613434.
2020-07-23 22:38:04 -04:00
Keate Senior
edd68c5174 makes Travis not yell at marauders I don't know they worked fine /shrug 2020-07-23 22:35:48 -04: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
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
Keate Senior
e4ae613434 Makes Ratvar spawn above the Ark 2020-07-23 17:49:14 -04:00
Timothy Teakettle
ed8723e74e Merge branch 'master' into species-are-dumb 2020-07-23 22:15:10 +01:00