cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,349 Commits 7 Branches 0 Tags
fa51e6f28f1ba2bbfcbafff99ecf2fabebb7a27d
Commit Graph

22426 Commits

Author SHA1 Message Date
Novacat
d3979a820f Merge pull request #4875 from Sebbe9123/Mobspeedtweak 
Tweaks pet and passive mob movement speed.
 2019-03-29 09:36:04 -04:00
Novacat
eada143541 Merge pull request #4877 from Novacat/nova-pathfinder 
Lynx Fixes Runtimes
 2019-03-29 09:02:14 -04:00
Neerti
fdeb9e3ac9 Merge pull request #6020 from Hatterhat/patch-1 
protolathes actually ACTUALLY update properly
 2019-03-29 08:43:21 -04:00
Unknown
8621295ba3 Runtimes plz 2019-03-29 08:42:06 -04:00
Unknown
d76d30c990 Fixes Potential Runtimes 2019-03-29 08:33:22 -04:00
Unknown
59b2681800 Fixes Character Setup 2019-03-29 08:22:10 -04:00
Sebbe
9c92d5cf2e lazy copypaste 2019-03-29 09:01:30 +01:00
Unknown
baffac60fc Lynx Fixes Runtimes 
There are still a couple of remaining runtimes...
 2019-03-28 23:50:37 -04:00
Novacat
ca660879fd Merge pull request #4862 from Novacat/nova-pathfinder 
Ports veils from Baystation
 2019-03-28 22:12:53 -04:00
Novacat
6729bfb147 Merge pull request #4858 from Heroman3003/uncontamine 
Added ability to toggle and configure contamination and item digestion
 2019-03-28 22:12:38 -04:00
Novacat
356b5df8e7 Merge pull request #4872 from VOREStation/upstream-merge-6018 
[MIRROR] Fixes elevators deleting AI eyes
 2019-03-28 22:10:05 -04:00
Novacat
270d22a73f Merge pull request #4857 from VOREStation/upstream-merge-5995 
[MIRROR] Tweak & Fix Promethean Stuff
 2019-03-28 22:06:32 -04:00
Novacat
21ed3ea467 Merge pull request #4861 from VOREStation/upstream-merge-6006 
[MIRROR] Adds 3 new crashed escape pod PoIs
 2019-03-28 22:03:31 -04:00
Novacat
4801fe8c8e Merge pull request #4860 from Heroman3003/id-restorer 
Added ID restoration terminal
 2019-03-28 22:03:17 -04:00
Novacat
2f251c3a0f Merge pull request #4874 from VOREStation/upstream-merge-6009 
[MIRROR] Makes Ambient Heartbeat sound in space controlled by Ambiance settings
 2019-03-28 22:02:48 -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
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
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
396199934e Update turbolift.dm 2019-03-28 21:59:10 -04:00
Novacat
4f7280924a Update prometheans.dm 2019-03-28 21:58:15 -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
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
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
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
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
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