Commit Graph

239 Commits

Author SHA1 Message Date
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage
Universal Object Damage
2019-10-06 23:22:48 -04:00
farie82
d8a88a14b4 Tickets can now be unassigned (#12484) 2019-10-04 14:47:57 -04:00
Fox McCloud
238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00
Fox McCloud
bd4bd1a366 The Ending of an Era. The Turning of the Page (#12342) 2019-09-20 17:58:50 -07:00
Ty-Omaha
c557f0c7c9 Autoreply confirmation alert logic fix (#12350)
* Autoreply confirmation alert logic fix
2019-09-18 19:28:42 -07:00
Ty-Omaha
6cef95ff7b Fixes mentorhelp issue with autoresolve (#12340) 2019-09-17 19:57:28 -07:00
Ty-Omaha
3ad906cbff last response (#12335) 2019-09-17 16:06:26 -07:00
Couls
fd3e6f5729 thrown objects now phase through the thrower instead of hitting them (#12323) 2019-09-17 13:52:02 -07:00
Ty-Omaha
99631afc42 addition (#12330) 2019-09-17 12:18:30 -04:00
Fox McCloud
6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
variableundefined
845acf13ca Merge pull request #12298 from Ty-Omaha/adminHELP
Adminhelp update
2019-09-16 20:16:26 -04:00
Ty-Omaha
203715374a redundant 2019-09-16 19:44:56 -04:00
Ty-Omaha
e568429136 spelling 2019-09-16 17:42:02 -04:00
Ty-Omaha
9794740de5 Alphabetical sort and cancel 2019-09-16 11:47:04 -04:00
Ty-Omaha
53a2c1bcf9 reject 2019-09-16 11:19:08 -04:00
Ty-Omaha
f3c4850a49 Updates 2019-09-16 10:04:53 -04:00
Ty-Omaha
62841a58b7 updates comments 2019-09-15 00:50:51 -04:00
Ty-Omaha
90018ca073 detailed autoreply 2019-09-14 23:08:54 -04:00
Ty-Omaha
16b65120ba adminhelp update 2019-09-14 22:41:21 -04:00
Coul
00c3b6ad41 limit the amount of monkeys spawned from monkey cubes 2019-09-14 21:18:45 -04:00
Fox McCloud
1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
variableundefined
8077e61d08 Merge pull request #12241 from SteelSlayer/admin-verb-removals
Admin verb mega update
2019-09-10 19:38:00 -04:00
Fox McCloud
177ac43f23 next-we-melt-the-memories-that-are 2019-09-09 16:20:04 -04:00
Fox McCloud
d19961378d first-we-burn-away-the-world-that-was 2019-09-09 14:48:29 -04:00
Fox McCloud
5d50935f31 Lavaland Update Part 3: Mob Spawning, Rivers, and Turfs 2019-09-09 01:34:02 -04:00
SteelSlayer
275266a73a Admin verb mega update
changes/removes all sorts of admin verbs, requested by Kyet
2019-09-09 01:26:50 -04:00
Fox McCloud
8587f63982 Refactors Spawners/Tendrils 2019-09-07 20:02:53 -04:00
Fox McCloud
10d3c7e463 Merge pull request #12117 from variableundefined/ResolvingProblem
Add a quick resolve button to mentor and adminhelp ticket
2019-09-05 20:06:16 -04:00
SteelSlayer
da534b2df1 Round start delay works properly again 2019-08-28 19:20:44 -04:00
variableundefined
d25970e13a Add a quick resolve button to mentor and adminhelp ticket 2019-08-28 12:59:38 -04:00
variableundefined
52b7d04d02 Merge pull request #11921 from Couls/TG-chat-subsystem
Port TG's chat subsystem
2019-08-25 22:26:33 -04:00
tayyyyyyy
760009a0cb Fix style 2019-08-13 16:32:31 -07:00
AffectedArc07
cd57a4605e P A R A L L A X 2019-08-13 16:32:31 -07:00
variableundefined
0b469ce563 Merge pull request #11577 from farie82/mhelp-take
Ticket take now asks for a confirmation if it's already assigned + ticket/PM code refactor
2019-08-12 17:44:26 +08:00
variableundefined
092fb980df Merge pull request #11564 from TDSSS/z-level
Lets you teleport to z levels 9-12
2019-08-12 16:42:49 +08:00
variableundefined
2b53fb0ab3 Merge pull request #11392 from Citinited/airlock-spawners
Airlock spawners 2: Electric Boogaloo
2019-08-12 13:30:26 +08:00
variableundefined
0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize
Sanitize all inputs
2019-08-11 22:09:10 +08:00
Couls
2c85e79224 Port TG's chat subsystem 2019-07-25 17:50:47 -04:00
Couls
1680aa2c21 Fix typing indicators not showing 2019-07-25 04:37:24 -04:00
variableundefined
ab3e2ca1a8 Merge pull request #11732 from farie82/AFK-subsystem
Adds the AFK auto cryo removal system (preference setting for players)
2019-07-20 21:28:52 +08:00
Crazy Lemon
b8d739653b Merge pull request #11852 from Couls/diagonal-movement-runtime-fix
Input subsystem now checks client list for nulls before running keyloop
2019-07-19 19:03:11 -06:00
Couls
e8b820eae6 Revert "Code improvement"
This reverts commit 0ee716ef38.
2019-07-15 21:13:29 -04:00
Couls
0ee716ef38 Code improvement 2019-07-15 20:21:54 -04:00
tayyyyyyy
57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
joep van der velden
23ac0714d0 merge with master 2019-07-14 13:08:13 +02:00
joep van der velden
6eb6c8ddba SQL version change, coding semantic 2019-07-14 13:05:59 +02:00
Couls
5d2ce584b3 Update input.dm 2019-07-14 01:32:02 -04:00
Couls
e8352f576b QoL adjustments
F2 F3 F4 buttons have been restored
when numpad targetting is off you can use numpad 1-4 to change intents
pressing shift before any of the intent buttons doesn't change intents(for people with shift+1-4 macros)
backspace now sets the focus to the chat bar
2019-07-12 18:09:37 -04:00
farie82
4cfe0c8152 Merge branch 'master' into AFK-subsystem 2019-07-12 16:42:02 +02:00
Couls
a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00