Commit Graph

32782 Commits

Author SHA1 Message Date
variableundefined 59767b5807 Merge pull request #11935 from Ty-Omaha/what-the-heck-is-this-even
Refactors disgusting if statement
2019-07-30 21:41:02 +08:00
TheSardele 9e5fe62155 Fixes earmuffs not protecting from vampire screeches
Fixes a bug where earmuffs wouldn't protect you from vampire screeches if you were wearing earmuffs in your right ear slot while wearing something else in your left ear slot.
2019-07-30 00:36:45 +02:00
Ty-Omaha f019476b3d why??? 2019-07-28 17:53:17 -04:00
Ty-Omaha c67a98a50e fixes notes 2019-07-28 13:10:27 -04:00
Crazy Lemon 1969ce8d13 Merge pull request #11851 from Allfd/panther
Big hostile cats, should be able to see in the dark.
2019-07-25 17:57:34 -06:00
Couls 1680aa2c21 Fix typing indicators not showing 2019-07-25 04:37:24 -04:00
Crazy Lemon 8c531c4ac2 Merge pull request #11856 from Markolie/fix321
Beaker fixes
2019-07-20 18:54:18 -06:00
Mark van Alphen 4d8adb4f44 Fix reverse beaker logs 2019-07-21 02:03:02 +02: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
Crazy Lemon 711cf5c6b4 Merge pull request #11861 from Couls/SQL-fixes
Fix preferences not saving
2019-07-18 22:18:44 -06:00
Crazy Lemon 644b957a88 Merge pull request #11836 from TheSardele/bottle-throwforce
Lowers throwforce of drinking cartons
2019-07-18 22:16:57 -06:00
Crazy Lemon 0019ebc5f2 Merge pull request #11825 from Ty-Omaha/permaban
Replaces "This is a permanent ban" with "This ban does not expire automatically and must be appealed."
2019-07-15 19:18:49 -06:00
Couls e8b820eae6 Revert "Code improvement"
This reverts commit 0ee716ef38.
2019-07-15 21:13:29 -04:00
Couls d83547caf6 remove pointless +1 and use ceiling again 2019-07-15 20:49:41 -04:00
Couls 4eb2af193d use round instead 2019-07-15 20:47:40 -04:00
Couls 10a2915c59 Include crazy's calculation for number of sigfigs 2019-07-15 20:34:26 -04:00
Couls 0ee716ef38 Code improvement 2019-07-15 20:21:54 -04:00
Couls c30d6171ff resupport old hotkey mode 2019-07-15 20:08:49 -04:00
Couls 192949375a Fix preferences not saving 2019-07-15 05:16:19 -04:00
Mark van Alphen 451c68ee0c Beaker drink fix 2019-07-14 21:54:38 +02: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
Alffd b015449865 Big hostile cats, should be able to see in the dark. 2019-07-13 22:46:24 -04:00
variableundefined 04e3110f8d Merge pull request #11829 from Couls/diagonal-movement-misc-fixes
Diagonal Movement tweaks
2019-07-13 12:24:11 +08: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
TheSardele 3fc5db1bca Carton throwforce lowered
Lowers the throwforce of drinking cartons from the bottle default of 15 to 0.
2019-07-12 18:07:23 +02:00
farie82 4cfe0c8152 Merge branch 'master' into AFK-subsystem 2019-07-12 16:42:02 +02:00
variableundefined 96cd20430b Merge pull request #11687 from Kyep/you_have_time
Public Time & Security
2019-07-12 18:20:34 +08:00
variableundefined 5c325d33fe Merge pull request #11684 from IAmBigCoat/medbeamwarnings
Added warnings to the medbeam gun re: stream-crossing
2019-07-12 18:17:07 +08:00
variableundefined 52ae3bb933 Merge pull request #11674 from DoctorDrugs/Additional-Miners
Adds additional roundstart miner slots
2019-07-12 18:16:32 +08:00
variableundefined 318e115280 Merge pull request #11653 from Couls/bone-rework
Bones nerf
2019-07-12 18:15:17 +08:00
Couls de5defa936 Diagonal tweaks 2019-07-12 06:00:19 -04:00
variableundefined 36736277a1 Merge pull request #11358 from Couls/diagonal-movement
[Ready for Testmerge] Implement Diagonal Movement
2019-07-12 17:12:57 +08:00
Couls b11a80b4fe Update misc.dm 2019-07-12 03:17:55 -04:00
Ty-Omaha dd1a48e947 this stupid space who even made appealmessage have a space in it 2019-07-11 19:03:01 -04:00
Ty-Omaha eb3f70684d reword the reword 2019-07-11 18:42:03 -04:00
Ty-Omaha 73a7bff8b3 Permaban 2019-07-11 16:58:02 -04:00
Couls 147f740c49 Improve diagonal pulling 2019-07-11 14:56:48 -04:00
Couls 7886366d87 Update disease_outbreak.dm 2019-07-11 02:36:30 -04:00
Couls 7b102e2f4d Remove unused winsets 2019-07-11 01:01:22 -04:00
Couls 197192789e Derp 2019-07-09 18:59:23 -04:00
Couls f6f61bf91b grammar 2019-07-09 18:53:05 -04:00
Couls 7c98437892 send message to the right person 2019-07-09 18:09:21 -04:00
Couls 880bddecb6 Add a notice as to why monkeys don't give blood 2019-07-09 17:57:12 -04:00
Couls 3caa97e4f9 add comments for future contributors 2019-07-09 17:48:23 -04:00
Couls 217d0503f7 Can suck humanized monkeys again 2019-07-09 17:41:23 -04:00
Couls fc287c49f5 Can now suck people with ckeys again, unhumanized monkeys give blood 2019-07-09 17:40:04 -04:00
Couls 2d7f2bb3c2 Code cleanup, spacing fixes 2019-07-09 08:11:43 -04:00