17951 Commits

Author	SHA1	Message	Date
kevinz000	dbd2cb6195	Merge pull request #10467 from Seris02/boxfix ... stops lightspeed spessmen in boxes	2020-01-08 13:31:55 -08:00
kevinz000	68a0eddeaf	Merge pull request #10285 from Ghommie/Ghommie-cit491 ... [s] Fixes singularity pulls duping rods out of engine floors.	2020-01-08 13:31:31 -08:00
kevinz000	b68f81f4e6	Merge pull request #10452 from Ghommie/Ghommie-cit499 ... Fixes lattice's examine.	2020-01-08 13:30:37 -08:00
kevinz000	1e6d05dc59	Merge pull request #10470 from deathride58/deletesminers ... [s] adds a cooldown to area creation attempts	2020-01-08 13:29:36 -08:00
Ghom	f263a3ea31	Merge pull request #10474 from Putnam3145/fix-traitor-again ... [s] Fixes traitors	2020-01-08 13:48:12 +01:00
Putnam	a97fa8f81a	also made objectives deletable	2020-01-07 18:01:24 -08:00
Putnam	26064e0992	crap	2020-01-07 17:37:57 -08:00
Putnam3145	b09ef97ae3	Merge pull request #10305 from BlackMajor/Yeehaw ... Various Mining borg changes. And some extras.	2020-01-07 16:50:21 -08:00
BlackMajor	05a644cc41	Revert "Merge branch 'master' into Yeehaw" ... This reverts commit 972c03f79f, reversing changes made to 8ebd698763.	2020-01-08 12:26:45 +13:00
BlackMajor	972c03f79f	Merge branch 'master' into Yeehaw	2020-01-08 12:25:50 +13:00
BlackMajor	b41c9cd844	Sync with master	2020-01-08 12:25:22 +13:00
Lin	c162e9bb5d	Merge pull request #10453 from Ghommie/Ghommie-cit500 ... Fixing an edge case runtime with ore bags.	2020-01-07 19:37:49 +00:00
deathride58	6f2cf0b636	[s] adds a cooldown to area creation attempts	2020-01-07 10:04:09 -05:00
Seris02	5fae814e42	did it thanks	2020-01-07 17:52:46 +08:00
kevinz000	4599abde4a	Merge pull request #10420 from MrJWhit/radiation-plasma-usage ... Increase radiation plasma usage in radiation collector	2020-01-06 19:46:42 -08:00
kevinz000	f6b9396096	Merge pull request #10439 from LetterN/tachelon-logs ... doppler logs	2020-01-06 19:45:28 -08:00
BlackMajor	5a97259ba9	Fix a couple of bugs, add wrapping paper and destination tagger	2020-01-07 15:33:16 +13:00
Lin	2ce3b7fbf5	Merge pull request #10455 from Ghommie/Ghommie-cit501 ... Porting some runtime fixes.	2020-01-07 01:00:25 +00:00
Lin	da43d336c3	Merge pull request #10047 from Ghommie/Ghommie-cit425 ... Turns dog/cat petting into an element datum.	2020-01-07 00:55:19 +00:00
Lin	718d4a080d	Merge pull request #9878 from Ghommie/Ghommie-cit382 ... Unmodularize several machinery and structures	2020-01-07 00:31:24 +00:00
Lin	46420a693d	Merge branch 'master' into Ghommie-cit425	2020-01-07 00:28:37 +00:00
Ghom	d07d436ba2	Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo ... cargo tweaks, new shit, why do digitigrade sprites exist	2020-01-06 21:47:15 +01:00
Putnam3145	3b6cf8c952	Merge pull request #10401 from r4d6/SM ... Add three more Supermatter Engine variation for Box	2020-01-05 23:08:49 -08:00
Lin	7ad6021472	Merge pull request #10437 from Ghommie/Ghommie-cit497 ... Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!	2020-01-06 03:49:52 +00:00
Ghommie	dcb2ae77fa	Porting some runtime fixes.	2020-01-06 02:14:25 +01:00
Ghommie	4cc0833b28	Fixing an edge case runtime with ore bags.	2020-01-06 01:45:53 +01:00
Letter N	de14073956	limit	2020-01-06 08:34:48 +08:00
Ghommie	1afd3d76cb	Fixes lattice's examine.	2020-01-06 01:18:11 +01:00
Ghom	869ed7a4aa	Merge pull request #10427 from Hatterhat/beakers-but-quirky ... beaker tweaks: setting transfer values verb on altclick, value tweaks	2020-01-05 23:08:23 +01:00
Ghom	e18244671f	Merge pull request #10350 from Putnam3145/dojo-ghostrole ... Ghost cafe quality-of-life, plus making ghost role eligibility an element	2020-01-05 23:05:13 +01:00
Ghom	a8741a8462	As you command.	2020-01-05 23:01:35 +01:00
kevinz000	6e50bb9c03	Revert "Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag"	2020-01-05 12:47:24 -08:00
Ghom	14ec7d963a	Merge pull request #10224 from Seris02/traitblacklisting ... Makes trait blacklisting remove random positives instead of removing every quirk (new and improved)	2020-01-05 21:29:51 +01:00
kevinz000	a8a5ff819d	Update IsBanned.dm	2020-01-05 10:06:09 -08:00
kevinz000	4589c7c0c6	Update IsBanned.dm	2020-01-05 08:52:00 -08:00
Ghommie	8c7b648a4f	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit425	2020-01-05 17:42:54 +01:00
Ghom	59279a7cd4	Merge pull request #10433 from Citadel-Station-13/kevinz000-patch-7 ... nerfs pogscarabs	2020-01-05 16:23:37 +01:00
Ghom	516ec585d2	Merge pull request #10435 from Hatterhat/tg-40394 ... biogenerator can print flour sacks and enzyme now, also some boxes idk	2020-01-05 16:22:44 +01:00
Ghom	5720afb169	Merge pull request #10430 from Citadel-Station-13/VIBE-CHECK ... VIBE CHECK	2020-01-05 15:51:32 +01:00
Ghom	8bf75be8ff	Yea no, go away zoomer kevinz	2020-01-05 15:38:23 +01:00
Ghom	4655815c12	Merge pull request #10396 from Hatterhat/revert-8056-tegnerf ... reverts that one TEG nerf that forced it to require an arbitrary burnmix	2020-01-05 15:36:02 +01:00
Ghom	0646a8557b	Merge pull request #10428 from Putnam3145/bomb_fix ... Made dev bombs kill through bomb armor again	2020-01-05 15:33:54 +01:00
Ghom	fdff70b702	Merge pull request #10256 from Putnam3145/alcohol-intolerance ... Adds an alcohol intolerance trait (NOT light drinker)	2020-01-05 15:19:48 +01:00
Ghom	0e74c94d8c	Merge pull request #10278 from Trilbyspaceclone/patch-248 ... Fixes Fermi plushie reaction. Removes carbonation of caramel	2020-01-05 15:17:14 +01:00
Ghom	eeb9ec5f35	Merge pull request #10380 from Hatterhat/tg-43000-powerfists ... powerfists throw people faster but also leak their gas into the air	2020-01-05 15:12:06 +01:00
Ghom	2cbf2a2574	Merge pull request #10429 from Trilbyspaceclone/patch-262 ... Corrects MASON Rig's missing flags	2020-01-05 15:09:05 +01:00
Letter N	ba7f0dab62	doppler logs!	2020-01-05 19:16:37 +08:00
Trilbyspaceclone	609f120c28	Update hardsuit.dm	2020-01-04 22:29:42 -05:00
Hatterhat	f166586ca0	a comma	2020-01-04 21:05:55 -06:00
Hatterhat	5b0d20cf37	this one fucking tab	2020-01-04 19:52:01 -06:00