Commit Graph

24553 Commits

Author SHA1 Message Date
Iatots ec2bd9b876 Update plushes.dm 2020-07-24 08:40:25 +02:00
Letter N 22d5aebaa5 second batch - MAJOR: mech_fab, turrets 2020-07-24 14:38:04 +08:00
Iatots 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
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 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
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
Timothy Teakettle f4933c4177 let them scar 2020-07-23 22:14:41 +01:00
Timothy Teakettle 8f8aaee36c fixes up drinks 2020-07-23 22:09:14 +01:00
Timothy Teakettle 450509347a tidy species more 2020-07-23 21:57:32 +01: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
silicons 6db18f2a53 Merge remote-tracking branch 'citadel/master' into FUCK 2020-07-23 12:59:30 -07:00
silicons 29a8c2eee6 flushed 2020-07-23 12:47:21 -07:00
silicons cbe0cad1a4 fix 2020-07-23 12:41:33 -07:00
Iatots 4da365851f up to regulations now. 2020-07-23 21:27:00 +02:00
silicons 758d746e96 compile 2020-07-23 12:25:02 -07:00
silicons 59bd63471e sigh 2020-07-23 12:23:13 -07:00
silicons 5d7dfd327c FUCK 2020-07-23 12:22:55 -07:00
Iatots 21ef5fb1b7 Update other_reagents.dm 2020-07-23 21:14:46 +02:00
Iatots b2a0d00eee Update plushes.dm 2020-07-23 21:13:41 +02:00
Iatots 554e764be8 Update cuts.dm
dang speededit
2020-07-23 21:00:26 +02:00
silicons 80233e52af ok 2020-07-23 11:56:08 -07:00
Iatots a2381755e1 Update cuts.dm
nomenclature error
2020-07-23 20:52:29 +02:00
silicons db3f9b4549 woops 2020-07-23 11:48:46 -07:00