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
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
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
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
e42e1af87a
Merge pull request #11634 from Markolie/laborstacker
...
Updates the prison labor point system
2019-07-09 18:21:58 +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
22693b4a70
Survival pod storage wrench fix
2019-07-08 22:08:59 +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
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
ac011e37d7
Merge pull request #11519 from Arkatos1/doll
...
Clicking on a health doll icon will now check you for injuries
2019-07-08 17:32:50 +08:00
a7b4e0b9ef
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-07-07 22:17:19 -04:00
fe6ba72462
Merge pull request #11706 from improvedname/explorersuit
...
Explorer suits now will properly hide tails
2019-07-07 22:10:35 +08:00
df199a651d
Merge pull request #11663 from Markolie/maskofnarsie
...
Remove traces of the Mask of Nar'Sie
2019-07-07 22:10:02 +08:00
c2bd18e4fd
Merge pull request #11639 from datlo/antagexploitfix
...
Fix an antag rolling exploit
2019-07-07 20:27:59 +08:00
a4e54cc310
Merge pull request #11770 from Citinited/bloody-hellfire
...
Fixes some bloody bugs in the bloody writing system
2019-07-06 17:51:13 +08:00
ac5ab6b3db
fixes bug with biogenerator
2019-07-04 12:41:39 -07:00
33d35eb625
Merge branch 'master' into diagonal-movement
2019-07-02 05:55:44 -04:00
411a6ecec7
some more tweaks
2019-07-01 03:04:24 -04:00
96a565a773
Dead or incapacitated mobs may no longer write anything in blood; write in blood bugfix
2019-06-30 21:42:51 +01:00
7ffce9acdf
Merge pull request #11504 from Crazylemon64/sdql_verb_interface_remove
...
Removes the verb interface to SDQL2
2019-06-30 14:36:04 +08:00
497601245f
Merge pull request #11496 from Markolie/cultthings
...
Gives the night vision spell to cult constructs
2019-06-30 14:35:32 +08:00
7dad0f001b
Merge pull request #11733 from Ty-Omaha/this-has-psised-me-off-long-enough
...
Adds Auto-Note for Manual Bans
2019-06-29 09:23:59 +08:00
12b20b594d
Merge pull request #11738 from evankhellparadise/portableseed
...
Portable Seed Extractor design
2019-06-29 09:23:22 +08:00
baa8fea378
Merge pull request #11591 from Citinited/fuck-you-disposals
...
Fixes bug that deletes stuff in blocked trunks
2019-06-28 21:04:24 +08:00
41904fff2e
Merge pull request #11522 from Couls/mechfab
...
Fix cybernetics not appearing in mech fabricator
2019-06-28 21:03:20 +08:00
7d8dfeb3d3
Merge pull request #11722 from Aurorablade/JustInTimeForsummer
...
Adds Hawaiian Shirts
2019-06-28 21:01:42 +08:00
b8f255e899
Merge pull request #11724 from Kyep/no_more_deadly_nuzzling
...
Terror Spider Intent Fix
2019-06-28 21:00:54 +08:00
Couls