19184 Commits

Author	SHA1	Message	Date
Putnam	c45dab8ebd	uhh?	2020-02-07 20:37:22 -08:00
Putnam	84a9f2f058	make the fallback majority judgement	2020-02-07 19:54:15 -08:00
Putnam	27efd54274	why was that else there. why	2020-02-07 04:38:39 -08:00
Putnam	7f0a369870	Also added options for custom votes	2020-02-07 04:29:53 -08:00
Putnam	0ebd2a814f	fixed spurious divide-by-zero	2020-02-06 16:11:14 -08:00
Putnam	edcdb531cc	kwargs	2020-02-06 15:57:42 -08:00
Putnam	e6d353dd01	that's not how switch works...	2020-02-06 15:56:58 -08:00
Putnam	d05c2426a8	Added a config for map voting types.	2020-02-06 15:47:04 -08:00
kevinz000	62b0e62952	Merge pull request #10623 from Putnam3145/antag-overhaul ... Better antag objectives: for real this time	2020-02-06 16:25:22 -07:00
Ghom	ce6b37da1e	Merge pull request #10920 from Arturlang/debbuging ... Adds vscode debbuging	2020-02-06 20:33:21 +01:00
Ghom	cd14f13d0d	Merge pull request #10917 from Arturlang/Hyposprays_QOL ... Removes the hypospray verb for toggling spray/inject mode and makes it into an Alt click proc.	2020-02-06 20:31:46 +01:00
Arturlang	0353f1602d	Fixes ore boxes	2020-02-06 20:10:02 +01:00
kevinz000	7898dd089e	Merge pull request #10888 from Ghommie/Ghommie-cit554 ... Ports "Cleans up plante gene mutability."	2020-02-06 00:49:09 -07:00
kevinz000	fe2007d687	Merge pull request #10870 from Citadel-Station-13/Ghommie-patch-5 ... Fixed wheelchair-goers appearing as shoeless	2020-02-06 00:43:45 -07:00
kevinz000	75d3a8b35d	Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4 ... Holofans visual tweak.	2020-02-06 00:42:39 -07:00
kevinz000	542cae89d4	Merge pull request #10906 from Hatterhat/tg-48717-48726 ... husking is stupid - 5u rezadone/100u synthflesh heals husking, husking takes more burn	2020-02-06 00:42:05 -07:00
kevinz000	18910a23a2	Merge pull request #10881 from Ghommie/Ghommie-cit552 ... Refactoring mob holders into an element.	2020-02-06 00:41:28 -07:00
kevinz000	73aa761c69	Merge pull request #10700 from Ghommie/Ghommie-cit526 ... Anomalous honking crystal pet peeve & co.	2020-02-06 00:38:31 -07:00
kevinz000	1288a463cf	Merge pull request #10772 from Ghommie/Ghommie-cit537 ... Removing unused vore files and commented out code.	2020-02-06 00:37:52 -07:00
kevinz000	ead2be5116	Merge pull request #10919 from Ghommie/Ghommie-cit556 ... Fixing accidental nerfs to the magpistol.	2020-02-06 00:36:59 -07:00
kevinz000	3c5a3cb4d4	Merge pull request #10883 from ancientpower/ghost-newscasters ... Allows ghosts to read newscasters and books	2020-02-05 23:46:04 -07:00
kevinz000	e0dd12ecbd	Merge pull request #10902 from Citadel-Station-13/Ghommie-patch-1 ... Fixes some mounted defibrillator issue.	2020-02-05 23:45:45 -07:00
kevinz000	cda01e10f6	Merge pull request #10885 from Ghommie/Ghommie-cit553 ... Removing a couple troublesome NSFW useless and unused preferences.	2020-02-05 23:45:30 -07:00
kevinz000	50cabc3c64	Merge pull request #10889 from Ghommie/Ghommie-cit555 ... runtime drifting	2020-02-05 23:44:52 -07:00
kevinz000	d0cd33a5ea	Merge pull request #10899 from Trilbyspaceclone/vender-hate ... Almost all venders now can be restocked	2020-02-05 23:44:30 -07:00
kevinz000	27d3fcf5fd	Merge pull request #10900 from Putnam3145/port-atmos-fix ... Ports atmos priority reaction mix from TG	2020-02-05 23:44:08 -07:00
kevinz000	5059c0fa8c	Merge pull request #10905 from Hatterhat/engishit ... consoleless interfaces default, standard RCD ammo added to industrial engi	2020-02-05 23:43:54 -07:00
kevinz000	51bc7a5dec	Merge pull request #10909 from Citadel-Station-13/Ghommie-patch-3 ... Fixes the panic bunker persistence.	2020-02-05 23:43:05 -07:00
Ghom	181944bb36	Update admin_ranks.dm	2020-02-06 03:07:42 +01:00
Hatterhat	f100b6c5e4	multitools in basic tools, dumb headers	2020-02-05 19:47:20 -06:00
Arturlang	23834ce3f5	Parent call ... Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>	2020-02-05 22:54:01 +02:00
Artur	78339881de	Wierd ass formatting causing tabs to betray me	2020-02-05 21:37:36 +01:00
Artur	c2b68d0ba3	Adds debbuging	2020-02-05 20:35:24 +01:00
Artur	5602289013	Parent call ... Failed to get in the previous commit for some reason.	2020-02-05 20:25:04 +01:00
Artur	9951f291fd	Reviewer suggestions	2020-02-05 20:14:35 +01:00
Ghom	6d78d01612	Merge pull request #10903 from Hatterhat/tg-47770 ... fuck organ decay - tgstation#47770	2020-02-05 19:26:40 +01:00
Ghom	69c4cde323	Merge pull request #10915 from Citadel-Station-13/kevinz000-patch-5 ... jackboot magpistols are a thing again	2020-02-05 19:22:36 +01:00
Ghom	deb1686ce2	Merge pull request #10911 from Tupinambis/StunbatonFUCK ... Addendum to PR #10812. REGEN STAMINA WHATEVER FUCK COMBAT REWORK IS CONFUSING	2020-02-05 19:19:41 +01:00
Ghommie	7e2ad2b71f	Fixing accidental nerfs to the magpistol.	2020-02-05 18:45:15 +01:00
Ghom	7e8bc10b8e	Merge pull request #10894 from Trilbyspaceclone/carps ... Buffs carps again	2020-02-05 18:32:18 +01:00
Artur	8b5e3e6004	Removes the shitty verb	2020-02-05 14:55:47 +01:00
kevinz000	a45038d214	Update pockets.dm	2020-02-05 03:31:55 -07:00
kevinz000	f05d37b7fd	Merge pull request #10855 from Trilbyspaceclone/patch-274 ... The Syndicats are run by aliens - Fixes Alien cargo crate to be correction emag	2020-02-05 01:10:21 -07:00
Ghom	02d1761c0a	Merge pull request #10747 from Citadel-Station-13/kevinz000-patch-11 ... shoving someone into a wall on the second shove now also disarms their weapon	2020-02-05 07:38:14 +01:00
Ghom	4cdade4b2d	Merge pull request #10788 from Seris02/crushboots ... crushing magboots for tators	2020-02-05 07:36:14 +01:00
Tupinambis	3539fa7603	Stunbaton PR had bad math didn't properly reduce effectiveness oops.	2020-02-05 00:31:54 -06:00
Ghom	402283e86a	Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks ... [READY] Further tweaks to bloodsuckers	2020-02-05 07:23:36 +01:00
Ghom	4b1e3d216f	Merge pull request #10583 from Putnam3145/arousal-tweaks ... Consent logging	2020-02-05 07:19:37 +01:00
Ghom	68cbc3487a	Update species.dm	2020-02-05 07:09:55 +01:00
Ghom	77eb7b8a96	Merge pull request #10812 from Tupinambis/StunbatonFUNCTIONAL ... Stunbaton Balance Adjustments 2.0 (Unfucked Edition)	2020-02-05 07:02:11 +01:00