1906 Commits

Author	SHA1	Message	Date
Putnam	cdcba275d7	Makes dynamic no longer show none in the vote.	2020-11-24 01:13:41 -08:00
Timothy Teakettle	285208ece3	Merge branch 'master' into communication-hotkeys	2020-11-22 21:30:43 +00:00
timothyteakettle	60077f028e	port	2020-11-17 01:41:19 +00:00
silicons	803bff4e5f	funny	2020-11-12 23:34:42 -07:00
silicons	0001a2edca	Merge pull request #13669 from Arturlang/sacrifice_tweaks ... Makes cult sacrifice not permakill people anymore.	2020-11-11 11:16:15 -07:00
Artur	503d0156c6	Does the thing	2020-11-08 23:24:58 +02:00
LetterJay	10c90e06c1	Merge pull request #13661 from timothyteakettle/age-verification ... adds in-game age verification as an alternative to access requests	2020-11-08 11:07:05 -06:00
silicons	aab0b000c8	Merge pull request #13659 from timothyteakettle/gateway-fix ... admins loading gateways will no longer crash the server	2020-11-07 00:30:06 -07:00
silicons	77a1bdba0c	Merge pull request #13630 from timothyteakettle/short-tall-quirks ... character size scaling	2020-11-07 00:19:29 -07:00
Timothy Teakettle	1993364ce0	Revert "deletes one word" ... This reverts commit 8b7fd151af.	2020-11-06 21:45:52 +00:00
Timothy Teakettle	fdd7cc9843	Revert "fix" ... This reverts commit 58e884d18e.	2020-11-06 21:45:47 +00:00
Timothy Teakettle	e2ca7164b9	age verification	2020-11-06 21:00:14 +00:00
Timothy Teakettle	58e884d18e	fix	2020-11-05 21:49:46 +00:00
Timothy Teakettle	8b7fd151af	deletes one word	2020-11-05 16:59:49 +00:00
silicons	2d842270f5	Merge pull request #13625 from LetterN/revert-12994-patch-37 ... Reverts this circuit frame removal	2020-10-28 07:53:15 -07:00
silicons	e672ee847e	Merge pull request #13592 from Putnam3145/stat-voting-tweaks ... Adds ranked choice ballots to stat voting	2020-10-28 07:41:43 -07:00
silicons	a3228b3366	Merge pull request #13593 from Putnam3145/add-all-vote-types-to-maps ... Stringified the vote #defines for easier config stuff	2020-10-28 07:41:35 -07:00
timothyteakettle	b1379dd49e	still not working	2020-10-27 21:11:42 +00:00
Timothy Teakettle	0fa83322a1	re-add slow stride but it defaults to disabled	2020-10-26 20:40:11 +00:00
Timothy Teakettle	4e6146898c	fixes/config edits	2020-10-26 20:27:58 +00:00
Timothy Teakettle	2b00f2bb2f	config values	2020-10-26 20:27:02 +00:00
timothyteakettle	e35b3e4a33	color editing	2020-10-26 00:47:40 +00:00
Timothy Teakettle	0c2e1997ce	more loadout 2	2020-10-25 22:49:39 +00:00
Letter N	3d2bd4a98e	Revert "removes dildo"	2020-10-25 12:55:04 +08:00
timothyteakettle	a39dea1b4d	json loadout	2020-10-24 00:31:45 +01:00
Putnam	6dfcf12773	Makes the atmos subsystem pause correctly.	2020-10-21 22:05:28 -07:00
Putnam	558d11bc73	Stringified the vote #defines for easier config stuff	2020-10-18 14:49:43 -07:00
Putnam	07a02617c2	Fixed compiler errors, runtimes	2020-10-18 12:51:00 -07:00
Putnam	00b4d207c5	Added ranked choice ballots to stat voting.	2020-10-18 12:32:45 -07:00
Ghommie	c0f3317c01	mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port.	2020-10-16 20:27:09 +02:00
silicons	c3cdeb0507	fixes movespeed configurations (#13555) ... * Update config_entry.dm * Update game_options.dm * Update config_entry.dm * Update code/controllers/configuration/config_entry.dm Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>	2020-10-15 13:53:21 +02:00
Tupinambis	3224533a7c	Merge branch 'master' into spooder	2020-10-11 14:31:23 -05:00
BlackMajor	313970000b	Merge pull request #13522 from silicons/async ... Fixes the intermittent master controller lockups	2020-10-11 18:48:37 +13:00
BlackMajor	bf7d68884b	Merge pull request #13510 from silicons/google ... a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)	2020-10-11 18:39:10 +13:00
silicons	7f611a98e1	Merge remote-tracking branch 'citadel/master' into combat_rework_experimental	2020-10-10 22:23:22 -07:00
silicons	2919dfee2e	Merge pull request #13014 from Hatterhat/tendril-minimum ... [REVIEW PLEASE] Minimum Megas/Tendrils For Lavaland But Cleaner I Swear	2020-10-10 21:58:15 -07:00
silicons	19f1e99a8c	mass ports like 15 tg prs + counting (#13386) ... * changes * ok * changes * sigh * fixes * changes * fix * fix * alright * fixes git pus * fix * fix * fix * test * ok * Update code/modules/paperwork/ticketmachine.dm Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com> * ok * compile and other stuff * ok * fix * fix * Fix * Update menu.dm * Update view.dm * Update preferences.dm Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com> Co-authored-by: Putnam3145 <putnam3145@gmail.com>	2020-10-10 12:20:33 +02:00
silicons	1b1efce556	Merge remote-tracking branch 'citadel/master' into combat_rework_experimental	2020-10-06 17:11:21 -07:00
silicons	03a47bda6d	Merge pull request #13252 from timothyteakettle/loadout-loading ... qol: looking at loadout equips your loadout items on you instead of job items	2020-10-06 16:50:08 -07:00
silicons	655d505316	Merge pull request #13507 from LetterN/subsystem-updoots ... Ports the better statpannel design, fixes missing icons, and fixes statvoting [ready]	2020-10-06 00:46:13 -07:00
silicons	7c07863179	fix	2020-10-05 13:29:53 -07:00
Letter N	1b30fbf703	Update statpanel.dm	2020-10-05 20:07:04 +08:00
Letter N	ea48dd1e2e	part 2	2020-10-05 20:02:12 +08:00
silicons	20f1e0818e	Merge pull request #13479 from LetterN/another-update-mayhaps ... Fixes minimap, and dmdocs other things	2020-10-03 18:02:29 -07:00
Timothy Teakettle	46ebb72905	Merge branch 'master' into loadout-loading	2020-10-04 01:43:17 +01:00
silicons	21d3d8fcd9	sigh	2020-10-03 14:17:13 -07:00
Letter N	d6beeffad5	reverts this regression	2020-10-03 20:26:32 +08:00
Letter N	47845f2c30	suposed to be SSupdates but noo	2020-10-03 19:54:23 +08:00
Hatterhat	0310e3ebd5	please travis stop crashing on me	2020-10-01 19:10:13 -05:00
Tupinambis	d2860b38c7	normalization	2020-10-01 18:46:31 -05:00