22227 Commits

Author	SHA1	Message	Date
RedWolfie	f86a64a3a1	made emagged drones obey their death timer (#14287) ... * made emagged drones obey their death timer	2020-09-16 09:56:34 -04:00
denghis1	845e7a8b75	Added the warning cone as a headpiece for Ian (#14216) ... * Added the warning cone as a headpiece for Ian	2020-09-16 09:52:40 -04:00
Lumi	08e92ee6a7	Adds pancakes. (#14130) ... * Pancakes Adds pancakes, berry pancakes and choc-chip pancakes.	2020-09-16 09:41:42 -04:00
joep van der velden	0bfe9d994e	Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co	2020-09-16 15:26:19 +02:00
AffectedArc07	0a79d49b56	Merge pull request #14301 from SabreML/Fluffy-change ... Pineapple Salad fluff sprite change	2020-09-16 13:54:19 +01:00
mochi	84982acdf2	Add missing tab??	2020-09-16 13:25:54 +02:00
mochi	4a364fcbfb	Clear null chords from music to fix runtime	2020-09-16 13:12:17 +02:00
mochi	ceb427fd64	Fix synthesized music's last note cutting short	2020-09-16 13:11:41 +02:00
mochi	8e4784579e	Fix music transcending Z-levels	2020-09-16 13:09:54 +02:00
variableundefined	1d5358f79b	Merge pull request #14215 from AffectedArc07/removes-omni-atmos ... Removes omni gas devices	2020-09-15 22:27:42 -04:00
variableundefined	ac1d7478fd	Merge pull request #14211 from Qwertytoforty/ACKCHYUALLY ... Corrects the description of Stimulants and Stimulative Agent	2020-09-15 21:01:01 -04:00
variableundefined	2ca98f2267	Merge pull request #14217 from Kyep/crabwalking ... Crabwalking now causes slowdown similar to walk speed	2020-09-15 21:00:11 -04:00
variableundefined	19eba6b06d	Merge pull request #14178 from SabreML/Borg-tweaks-1 ... A couple of Cyborg tweaks	2020-09-15 19:53:51 -04:00
variableundefined	db06596ffa	Merge pull request #14283 from SabreML/Fire-Lighting ... Makes cigarettes catch fire if their holder is also on fire	2020-09-15 19:41:02 -04:00
variableundefined	b2cd812d04	Merge pull request #14289 from Dovixx/SSD-portal ... Makes the list SSDs and AFKs panel spawn the NT SSD teleportation portal	2020-09-15 19:37:24 -04:00
variableundefined	1276fb4402	Merge pull request #14285 from Sinestia/master ... Turn off xenobiology camera acceleration	2020-09-15 19:36:51 -04:00
AffectedArc07	e02917f69f	Merge remote-tracking branch 'ParadiseSS13/master' into pr/RedWolfie/14258	2020-09-15 22:04:01 +01:00
AffectedArc07	00c09f7f34	Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14225	2020-09-15 21:13:03 +01:00
AffectedArc07	d587b05d02	Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14200	2020-09-15 21:00:07 +01:00
AffectedArc07	2e29a1ddcb	Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14190	2020-09-15 20:46:10 +01:00
AffectedArc07	848bfee01b	Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14176	2020-09-15 20:36:24 +01:00
AffectedArc07	0c33f1a511	Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14166	2020-09-15 20:24:29 +01:00
AffectedArc07	9470e34aed	Merge remote-tracking branch 'ParadiseSS13/master' into pr/TDSSS/14101	2020-09-15 20:01:16 +01:00
Kyep	d65379a47d	fixes merge conflict	2020-09-15 10:49:27 -07:00
TDSSS	edd038999c	Comment on ferry console	2020-09-15 19:16:00 +02:00
AffectedArc07	bc3c5258a0	Merge remote-tracking branch 'ParadiseSS13/master' into pr/TDSSS/14065	2020-09-15 17:33:08 +01:00
Kyep	4ddb9818f3	fixes merge conflict	2020-09-15 08:59:18 -07:00
AffectedArc07	2219c31485	Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14058	2020-09-15 16:57:35 +01:00
Kyep	222d17c01f	fixes merge conflict	2020-09-15 08:56:35 -07:00
Kyep	b9e0ca1359	fixes merge conflict	2020-09-15 08:54:10 -07:00
Kyep	28d915b26f	fixes merge conflict	2020-09-15 08:40:03 -07:00
SabreML	e0396d99f8	Merge branch 'master' into Borg-tweaks-1	2020-09-15 16:25:12 +01:00
AffectedArc07	d5157b3ab6	Merge pull request #13738 from dearmochi/tgui-medical ... [TGUI] Medical Machines	2020-09-15 15:19:39 +01:00
AffectedArc07	76951ca13e	Merge pull request #14268 from Kyep/ts_gib_fix ... Fixes incorrect TS gibbing	2020-09-15 14:52:49 +01:00
mochi	d8f949b434	Merge branch 'master' into tgui-medical	2020-09-15 12:46:30 +02:00
Marginalorb	34cb9276ef	Fix robot.dm typo	2020-09-15 01:14:25 -04:00
variableundefined	2ff1c9845d	Merge pull request #13955 from AffectedArc07/sm-monitoring-console ... [TGUI] Supermatter Monitoring Console	2020-09-14 20:41:02 -04:00
variableundefined	e9e634bb20	Merge pull request #14239 from AffectedArc07/singulo-warning-tweaks ... Improvements to singulo logging	2020-09-14 20:40:46 -04:00
AffectedArc07	5367a8c9a9	Merge remote-tracking branch 'ParadiseSS13/master' into sm-monitoring-console	2020-09-14 22:34:09 +01:00
AffectedArc07	455bf0b5e8	Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/13888	2020-09-14 22:13:46 +01:00
variableundefined	87bb789ab1	Merge pull request #13096 from FreeStylaLT/cat_b_gone ... Removes cat ears from the autodrobe vendor and loadout	2020-09-14 16:53:31 -04:00
variableundefined	3a3ff1400a	Merge pull request #13447 from EMPlight/BulldogXLmag ... Adds Bulldog extended drum mags and bundle for nuke ops.	2020-09-14 16:45:04 -04:00
mochi	b05eded1d8	Merge branch 'master' into instrument-tgui-n-optimization	2020-09-14 22:13:04 +02:00
SabreML	38a790bb91	Merge branch 'master' into Borg-tweaks-1	2020-09-14 21:10:13 +01:00
AffectedArc07	73acdcb221	Merge pull request #12628 from SteelSlayer/IPC-buffs ... IPC balance changes	2020-09-14 20:59:13 +01:00
SabreML	701056dc11	Added the 'Fancy Hiking Pack'	2020-09-14 19:52:45 +01:00
SabreML	e278b30dad	Changes 'Bluespace Rabbit Ears' to 'Bluespace Horns'	2020-09-14 19:52:33 +01:00
SabreML	c1168bda16	Removes 'Dan Jello's Pink Guitar' ... I've kept the sprites in, just in case they find another use. *shrug	2020-09-14 19:52:06 +01:00
mochi	5459e515ad	Merge branch 'master' into mining-vendor-refactor	2020-09-14 20:50:42 +02:00
mochi	e07306f20d	Merge branch 'master' into instrument-tgui-n-optimization	2020-09-14 20:04:48 +02:00