Commit Graph
23908 Commits
Author SHA1 Message Date
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
CameronWoof df7a1f2b8d adds spaceman's trumpet seeds to the exotic seeds crate 2020-07-24 23:08:36 -07:00
siliconsandGitHub 23465355d0 Update stun.dm 2020-07-24 22:16:06 -07:00
Hatterhat 47d63296d0 slight buff? may be overreaching 2020-07-25 00:09:53 -05: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
siliconsandGitHub 4d83060ba1 Update clothing.dm 2020-07-24 19:29:29 -07:00
timothyteakettle 47998153cd tweaks 2020-07-25 03:25:28 +01: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
Suicidalpickles 229500aa0e reverts extinguishers to altclick emptying
h
2020-07-24 16:00:36 -07: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
IatotsandGitHub a31e160227 this return stone keeps the null tigers away 2020-07-24 16:06:35 +02:00
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
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
siliconsandGitHub 1c4249c99d Update medbeam.dm 2020-07-24 00:57:30 -07:00
IatotsandGitHub a9c51fc624 Update other_reagents.dm 2020-07-24 08:40:48 +02:00
IatotsandGitHub ec2bd9b876 Update plushes.dm 2020-07-24 08:40:25 +02:00
IatotsandGitHub f53f7c5e92 Update cuts.dm 2020-07-24 07:46:09 +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
timothyteakettle 5064c584cc woops typo 2020-07-24 03:01:40 +01:00
timothyteakettle 869474f4ec drop location is not suitable for structures 2020-07-24 03:01:12 +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 08f905f5bc Update portable_turret_construct.dm 2020-07-23 18:52:27 -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
siliconsandGitHub ce18584fb1 Update beam_rifle.dm 2020-07-23 18:47:22 -07:00
Timothy TeakettleandGitHub fa489efa79 spellcheck 2020-07-24 02:39:41 +01:00
siliconsandGitHub 99737b6e11 Update projectile.dm 2020-07-23 18:35:32 -07:00
nik707andGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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