fae76166c2
Dual wielding!
2019-07-18 00:05:35 -04:00
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
c30d6171ff
resupport old hotkey mode
2019-07-15 20:08:49 -04:00
04e3110f8d
Merge pull request #11829 from Couls/diagonal-movement-misc-fixes
...
Diagonal Movement tweaks
2019-07-13 12:24:11 +08:00
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
96cd20430b
Merge pull request #11687 from Kyep/you_have_time
...
Public Time & Security
2019-07-12 18:20:34 +08:00
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
52ae3bb933
Merge pull request #11674 from DoctorDrugs/Additional-Miners
...
Adds additional roundstart miner slots
2019-07-12 18:16:32 +08:00
318e115280
Merge pull request #11653 from Couls/bone-rework
...
Bones nerf
2019-07-12 18:15:17 +08:00
de5defa936
Diagonal tweaks
2019-07-12 06:00:19 -04:00
36736277a1
Merge pull request #11358 from Couls/diagonal-movement
...
[Ready for Testmerge] Implement Diagonal Movement
2019-07-12 17:12:57 +08:00
b11a80b4fe
Update misc.dm
2019-07-12 03:17:55 -04:00
dd1a48e947
this stupid space who even made appealmessage have a space in it
2019-07-11 19:03:01 -04:00
eb3f70684d
reword the reword
2019-07-11 18:42:03 -04:00
73a7bff8b3
Permaban
2019-07-11 16:58:02 -04:00
147f740c49
Improve diagonal pulling
2019-07-11 14:56:48 -04:00
7886366d87
Update disease_outbreak.dm
2019-07-11 02:36:30 -04:00
7b102e2f4d
Remove unused winsets
2019-07-11 01:01:22 -04:00
197192789e
Derp
2019-07-09 18:59:23 -04:00
f6f61bf91b
grammar
2019-07-09 18:53:05 -04:00
7c98437892
send message to the right person
2019-07-09 18:09:21 -04:00
880bddecb6
Add a notice as to why monkeys don't give blood
2019-07-09 17:57:12 -04:00
3caa97e4f9
add comments for future contributors
2019-07-09 17:48:23 -04:00
217d0503f7
Can suck humanized monkeys again
2019-07-09 17:41:23 -04:00
fc287c49f5
Can now suck people with ckeys again, unhumanized monkeys give blood
2019-07-09 17:40:04 -04:00
2d7f2bb3c2
Code cleanup, spacing fixes
2019-07-09 08:11:43 -04:00
e16b495170
More testmerge fixes and improvements
...
Shift middle click locks your direction again
Spacepods now move again(literally one letter fixed this)
Holster hotkey is back!(H to holster and unholster)
Hotkey Toggle button has been removed from the bottom bar and verbs
2019-07-09 07:59:12 -04:00
8d57a2f736
Merge pull request #11605 from Couls/disease-rework
...
rework disease outbreak event
2019-07-09 18:24:38 +08:00
74a7b7ad55
Merge pull request #11566 from Arkatos1/locked
...
Action Buttons - Lockdown
2019-07-09 18:22:40 +08:00
e42e1af87a
Merge pull request #11634 from Markolie/laborstacker
...
Updates the prison labor point system
2019-07-09 18:21:58 +08:00
c89ca19701
Merge pull request #11658 from Markolie/turfspace
...
Adds the ability to remove plating
2019-07-09 18:18:13 +08:00
8dcccf220a
Merge pull request #11125 from Quantum-M/editVampireMuzzle
...
Vampire edits
2019-07-09 18:15:42 +08:00
8d19990013
Merge pull request #11805 from Markolie/fix321
...
Survival pod storage wrench fix
2019-07-09 16:13:48 +08:00
03d86f64eb
Merge pull request #11804 from Markolie/fix123
...
Water turf runtime fix
2019-07-09 16:13:22 +08:00
510181dc10
Update preferences.dm
2019-07-09 02:43:46 -04:00
6c8fc34cae
bitflag hotfix
2019-07-09 02:40:02 -04:00
9d9bf046e3
Fix autocomplete input mishandling single quotes
2019-07-08 14:22:52 -07:00
22693b4a70
Survival pod storage wrench fix
2019-07-08 22:08:59 +02:00
cdb447b89b
Water turf runtime fix
2019-07-08 22:03:32 +02:00
4a832c4f61
Fix testmerge issues
2019-07-08 11:20:25 -04:00
cee64d5c37
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-07-08 10:13:15 -04:00
c1960f9fcf
Merge pull request #11731 from Couls/patch-2
...
fix typo in msg reagent
2019-07-08 20:26:38 +08:00
756e48388a
Merge pull request #11683 from Couls/lantern
...
in-hand sprites for lantern
2019-07-08 20:25:49 +08:00
49059b5317
Merge pull request #11619 from Tayyyyyyy/scrolling_messages
...
Add scrolling to messages window, bug fix
2019-07-08 20:23:37 +08:00
49eb143c4e
Merge pull request #11613 from Arkatos1/smartfridge_ascension
...
Smartfridge gets smarter Mk.3
2019-07-08 20:23:11 +08:00
58a5ec105a
Merge pull request #11608 from Markolie/ghostpda
...
Re-adds ghost PDA messages
2019-07-08 20:22:42 +08:00
3fdf53b180
Merge pull request #11593 from AzuleUtama/CyberBundleFix
...
Makes Cybernetic Bundles a Nukie-only item again
2019-07-08 20:21:47 +08:00
fb15166fda
Merge pull request #11570 from Tayyyyyyy/autocomplete
...
Autocomplete input
2019-07-08 20:21:22 +08:00
d84d2a0b55
Merge pull request #11562 from Tayyyyyyy/markdown
...
Support markdown in papers
2019-07-08 20:20:46 +08:00
742bc62c8b
Merge pull request #11544 from Arkatos1/recharger
...
Rechargers now show their contents and charge status on examine
2019-07-08 20:18:36 +08:00
Couls