68127 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nadyr	5baec6eb8a	Merge pull request #3703 from CHOMPStation2/upstream-merge-12274 ... [MIRROR] Add's Brad's Air Jordans	2022-02-19 19:01:08 -05:00
Nadyr	eb5a81c783	Merge pull request #3702 from CHOMPStation2/upstream-merge-12272 ... [MIRROR] Morph tf color fomx	2022-02-19 19:00:49 -05:00
Nadyr	6c385e6dd4	Merge pull request #3709 from CHOMPStation2/upstream-merge-12262 ... [MIRROR] primative-shields	2022-02-19 18:53:34 -05:00
Nadyr	f22e8b066c	powder that makes you say yes	2022-02-19 18:51:17 -05:00
Nadyr	37ed5f34bd	Merge pull request #3697 from CHOMPStation2/upstream-merge-12266 ... [MIRROR] more kitsune tails + slight tail list tweak	2022-02-19 18:47:46 -05:00
Nadyr	008d247b7b	powder that makes you say yes	2022-02-19 18:47:33 -05:00
Nadyr	55b5e99d17	Merge branch 'master' into upstream-merge-12272	2022-02-19 18:42:46 -05:00
Nadyr	24cf8db198	powder that makes you say yes	2022-02-19 18:42:18 -05:00
Nadyr	c43cd9ea3a	Merge pull request #3699 from CHOMPStation2/upstream-merge-12267 ... [MIRROR] reworks 'sword' crate	2022-02-19 18:38:41 -05:00
Nadyr	f1c5f657bd	powder that makes you say yes	2022-02-19 18:20:32 -05:00
Nadyr	b513f79c69	Merge pull request #3698 from CHOMPStation2/upstream-merge-12268 ... [MIRROR] ar-b glasses are now actually ar	2022-02-19 18:18:59 -05:00
Nadyr	e79893a13a	powder that makes you say yes	2022-02-19 18:17:50 -05:00
Nadyr	29f4968fc4	Merge pull request #3696 from CHOMPStation2/upstream-merge-12263 ... [MIRROR] Doom Barrels	2022-02-19 18:16:11 -05:00
Nadyr	97cf4ce634	Merge pull request #3681 from CHOMPStation2/upstream-merge-12233 ... [MIRROR] Heavy-duty Engineer's Gloves	2022-02-19 18:15:45 -05:00
Nadyr	79d0e88c14	powder that makes you say yes	2022-02-19 17:57:39 -05:00
Nadyr	96769bf048	powder that makes you say yes	2022-02-19 17:56:28 -05:00
Nadyr	9a39692f1b	Merge pull request #3695 from CHOMPStation2/upstream-merge-12265 ... [MIRROR] AR Glasses Shading Tweak	2022-02-19 17:55:02 -05:00
Nadyr	ab14efcf41	powder that makes you say yes	2022-02-19 17:54:22 -05:00
Nadyr	8654f5004c	Merge pull request #3646 from CHOMPStation2/upstream-merge-12185 ... [MIRROR] Don't persist spitwads and gum	2022-02-19 17:53:24 -05:00
Razgriz	ddf594534e	Merge pull request #3710 from CHOMPStation2/upstream-merge-12281 ... [MIRROR] Unbuckle mobs when morphs take control	2022-02-18 22:36:24 -07:00
Razgriz	fd89757890	Merge pull request #3705 from CHOMPStation2/upstream-merge-12277 ... [MIRROR] correct morph's dead iconstate	2022-02-18 22:35:54 -07:00
Razgriz	907428cab3	Merge pull request #3707 from CHOMPStation2/upstream-merge-12278 ... [MIRROR] Fix a runtime with capture crystals	2022-02-18 22:35:18 -07:00
CHOMPStation2	997f83ac1e	Unbuckle mobs when morphs take control	2022-02-19 04:27:41 +00:00
Casey	656ca18a38	Merge pull request #12281 from Very-Soft/norphbuckleswoah ... Unbuckle mobs when morphs take control	2022-02-19 04:27:41 +00:00
CHOMPStation2	3612a3ec08	primative-shields	2022-02-19 04:02:45 +00:00
Casey	7ad39bffcb	Merge pull request #12262 from TheDavestDave/primative-shield-2 ... primative-shields	2022-02-19 04:02:45 +00:00
CHOMPStation2	ed37369cd0	Fix a runtime with capture crystals	2022-02-18 23:46:08 +00:00
Casey	7a786393f4	Merge pull request #12278 from Very-Soft/capcrysfix ... Fix a runtime with capture crystals	2022-02-18 23:46:08 +00:00
CHOMPStation2	16c9e2f9c2	correct morph's dead iconstate	2022-02-18 23:38:36 +00:00
Casey	236b7e15f5	Merge pull request #12277 from Very-Soft/morphiconfix ... correct morph's dead iconstate	2022-02-18 23:38:35 +00:00
CHOMPStation2	a1f480932b	Merge pull request #3694 from CHOMPStation2/upstream-merge-12264 ... [MIRROR] Buffs Morphs	2022-02-18 15:45:04 -07:00
CHOMPStation2	54b66fe9f9	Merge pull request #3692 from CHOMPStation2/upstream-merge-12244 ... [MIRROR] revolver eloise fluff item	2022-02-18 15:43:08 -07:00
CHOMPStation2	2189c56301	Merge pull request #3691 from CHOMPStation2/upstream-merge-12260 ... [MIRROR] Misc Tweaks	2022-02-18 15:42:47 -07:00
CHOMPStation2	c05eeb6e9e	Merge pull request #3704 from CHOMPStation2/nanomaps_generation ... Automatic NanoMap Update	2022-02-18 15:33:26 -07:00
NanoMap Generation	2bfe3a6698	NanoMap Auto-Update (Fri Feb 18 22:33:02 UTC 2022)	2022-02-18 22:33:02 +00:00
CHOMPStation2	93c04a1d5e	Merge pull request #2965 from Enzo-Leon/updates ... New Teleporter Pad System. Removing Shuttle 1 and 2	2022-02-18 15:30:00 -07:00
Casey	ee009945d5	Add's Brad's Air Jordans	2022-02-18 20:21:25 +00:00
CHOMPStation2	c4d9bb36b5	Morph tf color fomx	2022-02-18 19:40:58 +00:00
Casey	2d101757ae	Merge pull request #12272 from Very-Soft/anodamorph ... Morph tf color fomx	2022-02-18 19:40:57 +00:00
Casey	9c74404d02	reworks 'sword' crate	2022-02-18 18:58:07 +00:00
CHOMPStation2	6681f76b4d	ar-b glasses are now actually ar	2022-02-18 18:57:58 +00:00
Casey	dba2c5b8f6	Merge pull request #12268 from PastelPrinceDan/ar-b ... ar-b glasses are now actually ar	2022-02-18 18:57:58 +00:00
Casey	187bf8458a	more kitsune tails + slight tail list tweak	2022-02-18 18:56:47 +00:00
Casey	e669aaeb62	Doom Barrels	2022-02-18 18:55:35 +00:00
CHOMPStation2	76ba5034f3	AR Glasses Shading Tweak	2022-02-18 18:55:26 +00:00
Casey	d788983c20	Merge pull request #12265 from KillianKirilenko/kk-glasses ... AR Glasses Shading Tweak	2022-02-18 18:55:26 +00:00
CHOMPStation2	0893d75b45	Buffs Morphs	2022-02-18 18:54:14 +00:00
Casey	5fca9b7a21	Merge pull request #12264 from Very-Soft/buffsmorphs ... Buffs Morphs	2022-02-18 18:54:13 +00:00
Razgriz	0b0af368d7	Merge pull request #3665 from BlackMajor/BAYMISSN'T ... Removes Baymiss	2022-02-17 21:56:51 -07:00
Razgriz	75c8016d9d	update out of date metroid comment ... Because all I did was control-H for slime and replaced it with metroid. The usual slime taming mechanics obviously do not work anymore :P	2022-02-17 18:03:24 -07:00