cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-14 03:14:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,835 Commits 8 Branches 0 Tags
690dc5cbecdafb59df8753bfae72176e3d2f8e54
Commit Graph

9869 Commits

Author SHA1 Message Date
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
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
1aa2f39c0f Merge pull request #4815 from Novacat/nova-aifixes 
Fixes Newspapers
 2019-03-28 21:29:07 -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
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
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
Anewbe
38c4b88ded BTW I USE (FIXED) ARC 2019-03-28 20:53:50 -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
e0fb53e385 Conflict Resolution 2019-03-28 20:37:08 -04:00
Neerti
bf6d7bf58b Fixes blast door issue, and slimesky being considered unjustified. 2019-03-28 20:35:17 -04:00
Novacat
5ea6489cea Merge pull request #4770 from VOREStation/upstream-merge-5933 
[MIRROR] AI sprite tweaks.
 2019-03-28 20:23:14 -04:00
Novacat
8eddf7c5a8 Merge pull request #4762 from VOREStation/upstream-merge-5951 
[MIRROR] Bugspeak is whitelisted
 2019-03-28 20:22:45 -04:00
Novacat
3f659d909c Merge pull request #4758 from VOREStation/upstream-merge-5947 
[MIRROR] Rewrites Atmospherics
 2019-03-28 20:22:30 -04:00
Anewbe
e98f578ea5 Fixes the 'cannot push thing being pulled' bug and other weirdness. 2019-03-28 20:15:30 -04:00
Unknown
326a4c96fc Unwhitelists 2019-03-28 19:53:00 -04:00
Neerti
8e86e8383e Bugspeak is whitelisted 2019-03-28 19:51:07 -04:00
Anewbe
8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -04:00
Mechoid
023815e2d2 Flash rebalance. 2019-03-28 18:23:33 -04:00
Novacat
65cd059497 Merge pull request #4751 from VOREStation/upstream-merge-5869 
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
 2019-03-28 18:17:11 -04:00
Novacat
7e90225e81 Merge pull request #4736 from VOREStation/upstream-merge-5918 
[MIRROR] [READY] Fixes pixel projectiles critical bugs
 2019-03-28 17:44:22 -04:00
Unknown
ad181e797a Conflict Resolution 
Also fixes a compiling error with previous PR
 2019-03-28 17:24:03 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Novacat
615f413354 Merge pull request #4727 from VOREStation/upstream-merge-5798 
[MIRROR] Adds Alien Reality pods, aka AR pods, for use in events or PoIs.
 2019-03-28 16:30:53 -04:00
Unknown
75ede8c745 Fixes Merge Conflicts 2019-03-28 16:03:52 -04:00
Neerti
279ffc5dc9 [READY] Fixes pixel projectiles critical bugs 2019-03-28 15:56:47 -04:00
Unknown
efdb175d52 Conflict Resolution 2019-03-28 15:02:22 -04:00
Novacat
a4919caba2 Merge pull request #4719 from VOREStation/upstream-merge-5636 
[MIRROR] [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
 2019-03-28 14:52:51 -04:00
Mechoid
c604e38036 Adds Alien Reality pods, aka AR pods, for use in events or PoIs. 2019-03-28 14:51:50 -04:00
Novacat
3a0dbf687b Merge pull request #4720 from VOREStation/upstream-merge-5896 
[MIRROR] Changeling & Straight Jacket modifications.
 2019-03-28 14:35:51 -04:00
Unknown
a4373601f0 Fixes Merge Errors 2019-03-28 13:53:03 -04:00
Unknown
cf39c61c2d Conflict Resolution 
This one made a lynx cry.
 2019-03-28 13:19:19 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Novacat
d2cd4ff7b5 Merge pull request #4718 from VOREStation/upstream-merge-5893 
[MIRROR] Additional Hair
 2019-03-27 21:19:42 -04:00
Novacat
e0597368d5 Merge pull request #4712 from VOREStation/upstream-merge-5895 
[MIRROR] Fixes some AI bugs.
 2019-03-27 21:08:01 -04:00
Neerti
519890613f Fixes some AI bugs. 2019-03-27 20:54:31 -04:00
Atermonera
cbf66a9b0b Merge pull request #5894 from Neerti/pun_pun_fix 
Fixes Some Mob Init Bugs
 2019-03-27 20:42:50 -04:00
Novacat
893976536e Merge pull request #4706 from VOREStation/upstream-merge-5889 
[MIRROR] Allows borgs to move up and down with jetpacks
 2019-03-27 20:39:35 -04:00
Novacat
b3ded9752c Merge pull request #4708 from king5327/vplf 
Fixes protean languages for real this time.
 2019-03-27 20:39:03 -04:00
Novacat
f15ac5a224 Merge pull request #4697 from VOREStation/upstream-merge-5849 
[MIRROR] Fixes a few mob AI bugs
 2019-03-27 20:29:08 -04:00
Novacat
62820d333a Merge pull request #4690 from VOREStation/upstream-merge-5841 
[MIRROR] Voice changer tweaks and fixes
 2019-03-27 20:27:42 -04:00
Novacat
2609d9fc2b Merge branch 'master' into upstream-merge-5889 2019-03-27 20:15:17 -04:00
Novacat
8ff24f1c30 Merge pull request #4702 from VOREStation/upstream-merge-5885 
[MIRROR] Bots don't speak gibberish
 2019-03-27 19:25:50 -04:00
Novacat
3c7327ae54 Merge pull request #4699 from VOREStation/upstream-merge-5870 
[MIRROR] Borgs can use audible emotes again
 2019-03-27 19:15:04 -04:00
Neerti
04280c8372 Fixes a few mob AI bugs 2019-03-27 19:05:59 -04:00
Novacat
4c18bff57b Merge pull request #4696 from VOREStation/upstream-merge-5859 
[MIRROR] Audible emotes can be used again
 2019-03-27 19:01:55 -04:00
Atermonera
20604f2952 Merge pull request #5841 from Anewbe/voice_changer 
Voice changer tweaks and fixes
 2019-03-27 18:57:49 -04:00
Novacat
713e33054e Merge pull request #4688 from VOREStation/upstream-merge-5843 
[MIRROR] Adds Gibberish
 2019-03-27 18:01:56 -04:00