358 Commits

Author	SHA1	Message	Date
Kyep	4e44253af3	fixes merge conflict, updates to master	2020-09-15 00:31:56 -07:00
mochi	e07306f20d	Merge branch 'master' into instrument-tgui-n-optimization	2020-09-14 20:04:48 +02:00
mochi	fa9eb84c8b	Address AA	2020-09-14 19:58:18 +02:00
AffectedArc07	a2c5fc39a8	Merge pull request #13751 from Fox-McCloud/alarm-overhaul ... Overhauls and Refactors Alarm System	2020-09-14 13:54:06 +01:00
Fox McCloud	e6bd4b6638	fix ups	2020-09-13 18:33:21 -04:00
Kyep	9e45a00bdd	UI cleanup, demote reasons shown in log	2020-09-10 17:10:18 -07:00
SteelSlayer	287e412fae	kills off the chat subsystem	2020-09-06 10:55:32 -05:00
Kyep	7f61c71b57	WIP, about 30% of the way there	2020-09-05 10:09:43 -07:00
Certhic	f7af928ce6	shuttle defines refactor	2020-09-04 11:19:50 +02:00
mochi	d060e8bc43	Fix offspring candidacy icon, pref checks and add chat message	2020-08-23 13:26:44 +02:00
AffectedArc07	801bfea049	Merge pull request #14115 from Deelite34/Night-mode-tweak ... Dark chat tweaks	2020-08-22 19:33:38 +01:00
Deelite34	8655b62125	Span instead of copypaste	2020-08-19 22:28:51 +02:00
Deelite34	45ce7b378c	Tweaks the night mode chat	2020-08-19 20:34:31 +02:00
AffectedArc07	233c60058d	Merge pull request #13710 from dearmochi/overhaul-event-mob-selection ... Overhaul event mob selection	2020-08-18 10:55:24 +01:00
mochi	c1d3d164fa	Kyet stuff	2020-08-18 10:28:47 +02:00
AffectedArc07	7f6d077994	Merge pull request #14080 from Kyep/refactor_exp_update ... Playtime DB update call refactor	2020-08-16 13:49:37 +01:00
AffectedArc07	07301da5d2	Merge pull request #13338 from Kyep/id_computer_demote_terminate_freejob ... ID Computer Demotion/Termination Upgrades	2020-08-16 13:14:42 +01:00
AffectedArc07	57decdd4fb	Merge pull request #13560 from farie82/convert-tickets ... Makes staff able to convert m/ahelp tickets to the other type	2020-08-16 12:46:23 +01:00
Kyep	7dad849cfe	squash	2020-08-14 13:33:15 -07:00
Kyep	c406f0f851	EXP system minor refactor	2020-08-14 13:23:22 -07:00
mochi	96bf4396a0	Merge branch 'master' into overhaul-event-mob-selection	2020-08-12 01:22:52 +02:00
joep van der velden	4554340b7c	Add warning no staff online for converted ticket	2020-08-11 17:01:09 +02:00
Kyep	7c9019d74b	Merge remote-tracking branch 'ParadiseSS13/master' into id_computer_demote_terminate_freejob	2020-08-01 17:39:30 -07:00
Kyep	86d41ec5f4	Update code/controllers/subsystem/tickets/tickets.dm ... testing suggestion Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>	2020-07-31 07:59:12 +00:00
farie82	1a66695e59	Merge branch 'master' into convert-tickets	2020-07-30 18:26:09 +02:00
Kyep	b4e6e2a77d	disclaimer for current round info	2020-07-30 03:25:52 -07:00
Kyep	69cdf0b40c	Ahelp autoreply for github issues	2020-07-30 03:07:22 -07:00
AffectedArc07	73f756f1de	Adds missing offline implications	2020-07-26 20:53:58 +01:00
AffectedArc07	40a91624ee	Minor subsystem tweaks	2020-07-25 12:01:37 +01:00
mochi	79ed9b8b57	Merge branch 'master' into instrument-tgui-n-optimization	2020-07-21 23:55:11 +02:00
farie82	cdc762975c	Makes for loops use GLOB.human_list. Should improve performance a bit. Fixes blood contract affecting dead crew (#13691) ... * Replaces all human in X to GLOB.human_list * crew monitor * no playerlist converts * forgot to stage there...	2020-07-21 16:43:24 -04:00
mochi	a8371f301a	Stuff	2020-07-20 16:11:55 +02:00
mochi	25fa3f23cf	Merge branch 'master' into overhaul-event-mob-selection	2020-07-20 07:01:11 +02:00
mochi	dd5c88eb74	Address comments	2020-07-20 06:59:40 +02:00
mochi	24e8cd66ac	Port Baystruments PR from tgstation	2020-07-17 15:18:17 +02:00
AffectedArc07	2555c365c3	Removes duplicate helper	2020-07-15 15:55:19 +01:00
farie82	76724a959b	Merge branch 'master' into convert-tickets	2020-07-13 22:35:02 +02:00
Fox McCloud	de0c606969	Merge pull request #13502 from AffectedArc07/hook-kill-v10-final-ultimate-final ... HOOKS ARE DEAD	2020-07-13 13:55:04 -04:00
AffectedArc07	390e41e91d	The elephant: Ruin + Whiteship rework (#13632) ... * The elephant: Ruin + Whiteship rework * ROUND TWO: FIGHT * Forgot this * Kyet Fixes * [NEEDS TESTING] Tweaks from new knowledge * Adds to Meta, Removes from Delta * This isnt needed anymore * Adds in one empty space level * Area tweaks	2020-07-12 13:44:58 -06:00
AffectedArc07	014dbd95d9	Merge branch 'master' into hook-kill-v10-final-ultimate-final	2020-07-12 09:27:33 +01:00
Fox McCloud	cc96e93bf3	fixes	2020-07-11 15:48:47 -04:00
Fox McCloud	2fb2fe99f8	centralized alarms	2020-07-11 13:56:11 -04:00
AffectedArc07	650c638d41	Removes semicolons	2020-07-11 18:51:45 +01:00
Fox McCloud	85abb6505b	Merge remote-tracking branch 'upstream/master' into alarm-overhaul	2020-07-10 15:05:37 -04:00
mochi	977a022d40	Convert remaining pollCandidates, remove original proc	2020-07-10 11:07:11 +02:00
Fox McCloud	dfef1a5053	Merge pull request #13767 from AffectedArc07/ui-assets-verb ... Allows clients to reload their UI assets	2020-07-10 03:59:43 -04:00
Fox McCloud	523b4c681b	Fixes Cable GC Issues (#13793)	2020-07-09 18:52:37 -06:00
mochi	2c118db129	Merge branch 'master' into overhaul-event-mob-selection	2020-07-06 23:22:35 +02:00
AffectedArc07	1283bc9022	Message Tweaks	2020-07-05 08:35:45 +01:00
AffectedArc07	748b8e88e1	Merge branch 'master' into hook-kill-v10-final-ultimate-final	2020-07-02 11:17:30 +01:00