1787 Commits

Author	SHA1	Message	Date
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
Letter N	3d2bd4a98e	Revert "removes dildo"	2020-10-25 12:55:04 +08: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
Tupinambis	f1bc1ccafb	Merge branch 'master' into spooder ... # Conflicts: # code/modules/surgery/organs/eyes.dm I have no idea if this will work	2020-10-01 17:10:42 -05:00
silicons	095a6ae008	Merge pull request #13429 from Putnam3145/fix-initial-atmos ... Fixed a dumb typo that may or may not be causing atmos jank.	2020-10-01 03:03:24 -07:00
silicons	b7650f3dea	Merge pull request #13398 from timothyteakettle/wound-config ... wound config values, wound bonus for how damaged a limb is	2020-10-01 03:02:35 -07:00
Letter N	5418fb5b01	fixes minimaps and cinematic, also adds some dmdoc things	2020-10-01 17:36:56 +08:00
Tupinambis	a3a5fe4c2d	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into spooder	2020-09-30 16:07:21 -05:00
Tupinambis	113b84ab50	Ports arachnids from WaspStation	2020-09-30 15:10:17 -05:00
Zandario	9104e2c041	Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA"	2020-09-29 15:40:12 -05:00
silicons	822f1c9bf3	fix	2020-09-27 03:07:51 -07:00
Putnam	24c48c2bec	Adds an "unstuck" step to LINDA	2020-09-25 09:40:32 -07:00
silicons	57c4a3416a	Merge remote-tracking branch 'citadel/master' into combat_rework_experimental	2020-09-25 01:03:15 -07:00
Putnam	650d76ba69	Fixed a dumb typo.	2020-09-23 22:36:12 -07:00
silicons	7ca1b1dc79	Merge pull request #13380 from Putnam3145/cache-locality-experiments ... (TESTMERGE THIS FIRST WOW) Made monstermos faster and more convenient	2020-09-23 14:39:56 -07:00
Artur	d493886875	Speedmerge fix	2020-09-23 19:14:50 +03:00
silicons	2dddb2253e	tweak	2020-09-21 21:03:28 -07:00
silicons	4ab064a50d	fix	2020-09-21 20:58:33 -07:00
silicons	31791df2bd	fixes	2020-09-21 20:38:43 -07:00
silicons	2c4dc4d1a9	ok	2020-09-21 19:08:21 -07:00
silicons	ddc7f10de7	fixes	2020-09-21 18:35:42 -07:00
silicons	7249fe058f	config based	2020-09-21 17:36:30 -07:00