cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-29 09:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,721 Commits 9 Branches 0 Tags
cd0e5fd00a470398cc2edc92e2328581dca457fe
Commit Graph

14000 Commits

Author SHA1 Message Date
Razgriz 9a1ec7367b Merge pull request #5062 from CHOMPStation2/upstream-merge-13822 
[MIRROR] Ghost default swap
 2022-10-02 21:58:56 -07:00
Razgriz a3a5552ed1 powder that makes you say yes 2022-10-02 20:54:50 -07:00
Razgriz 8769c3c131 Merge pull request #5060 from CHOMPStation2/upstream-merge-13819 
[MIRROR] Complicates Pakkuns
 2022-10-02 20:52:40 -07:00
Razgriz 6a7e260775 Merge pull request #5066 from CHOMPStation2/upstream-merge-13824 
[MIRROR] stops absorbed chimeras going feral
 2022-10-02 19:16:18 -07:00
Razgriz d58dd4db3f powder that makes you say yes 2022-10-02 19:13:54 -07:00
Razgriz dd29043380 Merge pull request #5061 from CHOMPStation2/upstream-merge-13817 
[MIRROR] Fixes belly spiral from being cut off.
 2022-10-02 19:11:10 -07:00
Razgriz 40ac24c6a9 Merge branch 'master' into upstream-merge-13819 2022-10-02 19:10:03 -07:00
Casey 8019bc7bc5 Merge pull request #13824 from Screemonster/rumbliesinthetumblies 
stops absorbed chimeras going feral
 2022-10-02 17:58:38 +00:00
Casey 669d498598 Ghost default swap 2022-10-02 17:57:19 +00:00
Casey aa358fbc53 Merge pull request #13817 from VOREStation/Cameron653-patch-1 
Fixes belly spiral from being cut off.
 2022-10-02 17:56:12 +00:00
Casey 5b6b16087a Complicates Pakkuns 2022-10-02 17:56:08 +00:00
Casey f25375fadf Merge pull request #13818 from Screemonster/snapsnapsnappi 
Enhances pakkuns
 2022-09-28 23:49:56 +00:00
Nadyr 9b18f395f9 Merge pull request #5044 from CHOMPStation2/upstream-merge-13802 
[MIRROR] Markings care package
 2022-09-25 17:50:21 -04:00
Nadyr 00addc1b24 powder that makes you say yes 2022-09-25 17:45:39 -04:00
Casey 653720b0c6 Markings care package 2022-09-25 20:48:44 +00:00
Casey 1aed16efa6 Merge pull request #13800 from Heroman3003/enzymefix 
Removes old, janky-ass, unnecesary slowdown from numbing enzyme.
 2022-09-25 20:47:29 +00:00
Nadyr 01e6b493af Merge pull request #4984 from CHOMPStation2/upstream-merge-13762 
[MIRROR] Fixes pakkun stuff
 2022-09-25 16:40:42 -04:00
C.L 579d056d5b Merge pull request #13798 from VOREStation/Cameron653-patch-1 
🐀🐀🐀🐀🐀🐀🐀🐀🐀
 2022-09-24 05:59:29 +00:00
Nadyr 0c7c2d8b93 Merge pull request #5033 from CHOMPStation2/upstream-merge-13795 
[MIRROR] Makes sect abdomen glow colorable
 2022-09-23 21:15:19 -04:00
Nadyr b916852f06 Merge branch 'master' into upstream-merge-13762 2022-09-23 21:14:01 -04:00
Nadyr 18ebebe0f8 Merge pull request #4961 from CHOMPStation2/upstream-merge-13749 
[MIRROR] Adds pakkuns
 2022-09-23 21:10:04 -04:00
Nadyr 30b9fd730a Merge pull request #4947 from CHOMPStation2/upstream-merge-13731 
[MIRROR] Allows Long Predatorial Reach to toggle modes.
 2022-09-23 21:07:19 -04:00
Casey 4fbc3ebc47 Merge pull request #13795 from Heroman3003/sect-colorable-ass 
Makes sect abdomen glow colorable
 2022-09-24 00:23:43 +00:00
Nadyr 0d021124b5 Merge pull request #5026 from CHOMPStation2/Razgriz1032-patch-17 
Change Jellybrig damage values
 2022-09-23 19:10:39 -04:00
Nadyr 74026e6022 powder that makes you say yes 2022-09-23 19:08:30 -04:00
Nadyr b406274f86 Merge branch 'master' into upstream-merge-13731 2022-09-23 19:07:55 -04:00
Nadyr 31f5977c25 Merge pull request #4910 from CHOMPStation2/upstream-merge-13688 
[MIRROR] Long Predatorial Reach
 2022-09-23 18:31:03 -04:00
Nadyr 0bf319ae22 powder that makes you say yes 2022-09-23 17:45:19 -04:00
Nadyr c9acc369b0 powder that makes you say yes 2022-09-23 17:43:20 -04:00
Verkister 35c278ac9c Fixes jellyfish runtime 
Lacked voremob_loaded part
 2022-09-23 15:41:36 +03:00
Razgriz 7f27c60c00 Merge pull request #4868 from CHOMPStation2/upstream-merge-13676 
[MIRROR] Adds in Throw Vore
 2022-09-23 02:47:47 -07:00
Razgriz 6e84d54338 Change Jellybrig damage values 
Jellybrig no longer does any damage. People also do slightly less damage to him with just fists.
 2022-09-23 02:45:36 -07:00
Razgriz 91fd231d78 Merge pull request #4989 from CHOMPStation2/upstream-merge-13769 
[MIRROR] Radiation Rework
 2022-09-22 21:14:38 -07:00
Razgriz 7115a266a8 Merge pull request #4980 from CHOMPStation2/upstream-merge-13696 
[MIRROR] Adds personal shield generators. [READY FOR MERGE]
 2022-09-22 21:14:20 -07:00
Razgriz 33c7b4f1f3 Merge pull request #4988 from CHOMPStation2/upstream-merge-13770 
[MIRROR] Fixes dogborg inbuilt belly deaths not counting as vore deaths
 2022-09-22 20:46:01 -07:00
Razgriz b3c887e8cc Merge pull request #4981 from CHOMPStation2/upstream-merge-13767 
[MIRROR] Fixes a few bugs/runtimes
 2022-09-22 20:38:17 -07:00
Razgriz f4914a83fa Merge pull request #4978 from CHOMPStation2/upstream-merge-13759 
[MIRROR] Fixes two more runtimes hopefully
 2022-09-22 20:33:55 -07:00
Razgriz d72aa58a4e Merge pull request #4974 from CHOMPStation2/revert-439-Lun-Moth 
Revert salt pr "Solar Moth nerfs"
 2022-09-22 20:32:40 -07:00
Razgriz f196946ced Merge pull request #4954 from CHOMPStation2/upstream-merge-13732 
[MIRROR] Adjusts emagged booze
 2022-09-22 20:32:31 -07:00
Razgriz acf63f3b62 Merge pull request #4962 from CHOMPStation2/upstream-merge-13748 
[MIRROR] Fixes runtime with cryopods
 2022-09-22 20:31:57 -07:00
Razgriz 4615044c7d Merge pull request #4977 from CHOMPStation2/upstream-merge-13760 
[MIRROR] Makes mob droppred handles on vore init instead of variable on the mob.
 2022-09-22 20:31:29 -07:00
Razgriz 0f254970c9 Merge pull request #4948 from CHOMPStation2/upstream-merge-13729 
[MIRROR] Allows Xenochimeras to take Cocoon Spinner
 2022-09-22 20:22:22 -07:00
Razgriz 001615c43d Merge pull request #4943 from CHOMPStation2/upstream-merge-13600 
[MIRROR] [MIRROR] A couple ghost fixes
 2022-09-22 20:22:09 -07:00
Razgriz 9bc48ac881 powder that makes you say yes 2022-09-22 20:12:26 -07:00
Razgriz a9b02389d5 powder that makes you say yes 2022-09-22 20:02:51 -07:00
Razgriz 5ea9b1e4e9 powder that makes you say yes 2022-09-22 20:00:30 -07:00
Razgriz 233ba30a29 Early port some stuff from #4919 that way I can yeet it from #4919 2022-09-22 19:49:26 -07:00
Nadyr f001ee8dba powder that makes you say yes 2022-09-22 21:42:03 -04:00
Casey a5ec201436 Adds in Throw Vore 2022-09-22 21:42:03 -04:00
Casey de491df7b7 Radiation Rework 2022-09-23 00:56:28 +00:00