Novacat
|
690dc5cbec
|
Merge pull request #4864 from VOREStation/upstream-merge-6010
[MIRROR] Removes spammy keyboard noise from arcade machines
|
2019-03-28 22:02:21 -04:00 |
|
Novacat
|
e3b2a69517
|
Merge pull request #4852 from Haery70/master
Fixes a Spriting Issue in Mobvore
|
2019-03-28 22:01:57 -04:00 |
|
Novacat
|
94039e85bc
|
Merge pull request #4850 from Heroman3003/queen-spider
Returns giant Spider Queen mob lost in refactor
|
2019-03-28 22:01:46 -04:00 |
|
Novacat
|
1519496d9f
|
Merge pull request #4849 from VOREStation/upstream-merge-5978
[MIRROR] Unpicks some mining spaghetti
|
2019-03-28 22:01:36 -04:00 |
|
Novacat
|
d53ef70473
|
Merge pull request #4848 from VOREStation/upstream-merge-5996
[MIRROR] Fixed construction of fulltile electrochromic windows
|
2019-03-28 22:01:16 -04:00 |
|
Novacat
|
a7ee250193
|
Merge pull request #4844 from VOREStation/upstream-merge-5991
[MIRROR] Fixes drinks and adds new one.
|
2019-03-28 22:01:05 -04:00 |
|
Novacat
|
1415c6cd0a
|
Merge pull request #4843 from VOREStation/upstream-merge-5993
[MIRROR] Fixes the greatest bug to affect our time.
|
2019-03-28 22:00:55 -04:00 |
|
Novacat
|
db710b61f1
|
Merge pull request #4842 from VOREStation/upstream-merge-5988
[MIRROR] Copy character slots
|
2019-03-28 22:00:38 -04:00 |
|
Novacat
|
e2afa12e38
|
Merge pull request #4841 from VOREStation/upstream-merge-5992
[MIRROR] Departmental Turtlenecks
|
2019-03-28 22:00:31 -04:00 |
|
Novacat
|
76f9c16153
|
Merge pull request #4837 from Heroman3003/borg-sleever-interaction
Allows putting bodies into resleeving pod via drag-and-drop
|
2019-03-28 22:00:14 -04:00 |
|
Novacat
|
5256452ea5
|
Merge pull request #4836 from VOREStation/upstream-merge-5989
[MIRROR] golegnahC setadpU
|
2019-03-28 21:59:56 -04:00 |
|
Novacat
|
26660c5f70
|
Merge pull request #4832 from VOREStation/upstream-merge-5985
[MIRROR] Subspace Jammer now blocks signalers, suit sensors, lasts longer
|
2019-03-28 21:59:48 -04:00 |
|
Novacat
|
12f9d4aacd
|
Merge pull request #4831 from VOREStation/upstream-merge-5987
[MIRROR] Items are now assumed to be conductive, rather than the opposite
|
2019-03-28 21:59:41 -04:00 |
|
Unknown
|
e2b62f857d
|
Conflict Resolution
|
2019-03-28 21:49:05 -04:00 |
|
Novacat
|
e47a99824c
|
Update jammer.dm
|
2019-03-28 21:46:37 -04:00 |
|
Unknown
|
3aa0fdfda5
|
Removes conductive flags from VR stuff
|
2019-03-28 21:45:38 -04:00 |
|
Neerti
|
30b967e28a
|
Items are now assumed to be conductive, rather than the opposite
|
2019-03-28 21:45:38 -04:00 |
|
Novacat
|
21f4479636
|
Merge branch 'master' into upstream-merge-5991
|
2019-03-28 21:35:54 -04:00 |
|
Novacat
|
3129c2a85b
|
Update preferences.dm
|
2019-03-28 21:34:11 -04:00 |
|
Novacat
|
956809d681
|
Merge branch 'master' into upstream-merge-5985
|
2019-03-28 21:32:18 -04:00 |
|
Novacat
|
5ca397fb43
|
Merge pull request #4830 from VOREStation/upstream-merge-5960
[MIRROR] Reverts some real spacebrain gas
|
2019-03-28 21:29:55 -04:00 |
|
Novacat
|
3bc9a2e903
|
Merge pull request #4824 from VOREStation/upstream-merge-5986
[MIRROR] Rings no longer cover ones hands
|
2019-03-28 21:29:47 -04:00 |
|
Novacat
|
ee5065c436
|
Merge pull request #4823 from Heroman3003/omnis-b-gone
Replaced Omni filters in the SM engine setup with regular ones
|
2019-03-28 21:29:32 -04:00 |
|
Novacat
|
5aca83f6eb
|
Merge pull request #4822 from Novacat/nova-aicompile
Fixes #4821
|
2019-03-28 21:29:17 -04:00 |
|
Novacat
|
1aa2f39c0f
|
Merge pull request #4815 from Novacat/nova-aifixes
Fixes Newspapers
|
2019-03-28 21:29:07 -04:00 |
|
Novacat
|
44e3511842
|
Merge pull request #4812 from TheFurryFeline/patch-1
Add Resh's HOS Coat
|
2019-03-28 21:28:50 -04:00 |
|
Novacat
|
4c7370fb5d
|
Merge pull request #4811 from VOREStation/upstream-merge-5981
[MIRROR] Handtele no longer relies on teleporter being mapped in in very specific way
|
2019-03-28 21:28:30 -04:00 |
|
Novacat
|
a279d12b83
|
Merge pull request #4808 from saysage/master
The spiked collar on-mob sprite fix
|
2019-03-28 21:28:09 -04:00 |
|
Novacat
|
178ce9caa9
|
Merge pull request #4802 from VOREStation/upstream-merge-5970
[MIRROR] Moves crashed medical shuttle PoI to deep caves
|
2019-03-28 21:27:48 -04:00 |
|
Novacat
|
39792dd123
|
Merge pull request #4800 from Mewchild/MC-Mlem
Antiseptic Mlems take 3
|
2019-03-28 21:27:40 -04:00 |
|
Novacat
|
77bf066a98
|
Merge pull request #4791 from VOREStation/upstream-merge-5977
[MIRROR] BTW I USE (FIXED) ARC
|
2019-03-28 21:27:26 -04:00 |
|
Novacat
|
785a36d4e0
|
Merge pull request #4783 from VOREStation/upstream-merge-5942
[MIRROR] Headgibbing is a config thing
|
2019-03-28 21:27:19 -04:00 |
|
Novacat
|
354a6b501b
|
Update turf_changing.dm
|
2019-03-28 21:13:59 -04:00 |
|
Novacat
|
dfa4aac200
|
Merge branch 'master' into upstream-merge-5970
|
2019-03-28 21:12:59 -04:00 |
|
Novacat
|
7768216c64
|
Merge pull request #4801 from VOREStation/upstream-merge-5974
[MIRROR] Fixes departmental teshari cloaks and coats
|
2019-03-28 21:09:51 -04:00 |
|
Novacat
|
cc75cc7228
|
Merge pull request #4789 from VOREStation/upstream-merge-5967
[MIRROR] Fixes submap footprint miscalculations
|
2019-03-28 21:08:01 -04:00 |
|
Novacat
|
0ea5634e93
|
Merge pull request #4788 from VOREStation/upstream-merge-5972
[MIRROR] fixes zaddat mask problem
|
2019-03-28 21:07:40 -04:00 |
|
Novacat
|
f62c6f2194
|
Merge pull request #4785 from VOREStation/upstream-merge-5962
[MIRROR] Prevents people from joining with the same character
|
2019-03-28 21:07:32 -04:00 |
|
Novacat
|
e7e59730ea
|
Merge pull request #4784 from VOREStation/upstream-merge-5956
[MIRROR] Nock masks, cowls & robes
|
2019-03-28 21:07:21 -04:00 |
|
Novacat
|
4a05c9e7e1
|
Merge pull request #4782 from VOREStation/upstream-merge-5966
[MIRROR] Fixes blast door issue, and slimesky being considered unjustified.
|
2019-03-28 21:07:14 -04:00 |
|
Unknown
|
2dbf8499f4
|
Conflict Resolution
|
2019-03-28 21:04:21 -04:00 |
|
Novacat
|
7701db8aae
|
Update game_options.txt
|
2019-03-28 21:02:43 -04:00 |
|
Anewbe
|
38c4b88ded
|
BTW I USE (FIXED) ARC
|
2019-03-28 20:53:50 -04:00 |
|
Novacat
|
9079cdd276
|
Merge branch 'master' into upstream-merge-5972
|
2019-03-28 20:50:10 -04:00 |
|
Novacat
|
e5fdafd56e
|
Merge pull request #4781 from VOREStation/upstream-merge-5969
[MIRROR] Fixes Diona and Promethean prosthetics.
|
2019-03-28 20:46:05 -04:00 |
|
Novacat
|
d674e51405
|
Merge pull request #4780 from VOREStation/upstream-merge-5965
[MIRROR] Fix Organs not removing their verbs properly.
|
2019-03-28 20:45:57 -04:00 |
|
Novacat
|
a52d831113
|
Merge pull request #4779 from VOREStation/upstream-merge-5959
[MIRROR] Adds a new Shroud design
|
2019-03-28 20:45:50 -04:00 |
|
Novacat
|
c3f3419165
|
Merge pull request #4778 from VOREStation/upstream-merge-5949
[MIRROR] Tweaks Daxons
|
2019-03-28 20:45:42 -04:00 |
|
Novacat
|
809cb419e5
|
Merge pull request #4766 from VOREStation/upstream-merge-5953
[MIRROR] Fixes the 'cannot push thing being pulled' bug and other weirdness.
|
2019-03-28 20:45:35 -04:00 |
|
Unknown
|
4792fc1693
|
Conflict Resolution
|
2019-03-28 20:44:59 -04:00 |
|