31668 Commits

Author	SHA1	Message	Date
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	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	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
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	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
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
Casey	d788983c20	Merge pull request #12265 from KillianKirilenko/kk-glasses ... AR Glasses Shading Tweak	2022-02-18 18:55:26 +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
Razgriz	b0282d8d1b	Merge pull request #3693 from CHOMPStation2/upstream-merge-12256 ... [MIRROR] Sizegun Revamp 2022	2022-02-17 17:38:01 -07:00
Razgriz	9966377da6	Merge pull request #3684 from CHOMPStation2/upstream-merge-12242 ... [MIRROR] Now's your chance to be a [BIG SHOT]	2022-02-17 17:34:00 -07:00
Razgriz	9c4fcb067d	Merge pull request #3682 from CHOMPStation2/upstream-merge-12235 ... [MIRROR] Adds vendor refill cartridges to cargo	2022-02-17 17:33:53 -07:00
Razgriz	c71e45a099	powder that makes you say yes	2022-02-17 17:32:50 -07:00
Razgriz	bdfd580f5f	powder that makes you say yes	2022-02-17 17:31:15 -07:00
Casey	9b6517106b	Merge pull request #12256 from GhostActual/sizegun-revamp-2022 ... Sizegun Revamp 2022	2022-02-17 20:32:45 +00:00
Casey	37e43bf832	revolver eloise fluff item	2022-02-17 13:16:50 +00:00
Casey	1ffb955516	Misc Tweaks	2022-02-17 13:02:10 +00:00
Novacat	6e7f83fb8b	Merge pull request #12245 from Heroman3003/xenobio-fixes ... Fixes a bunch of xenobio bugs	2022-02-17 01:02:09 +00:00
Razgriz	cbb5500e25	Create miscellaneous_ch.dm ... I think there are one or more YW changes that we use?	2022-02-16 14:53:58 -07:00
Razgriz	5a12b00326	Restore vorestation code	2022-02-16 14:50:34 -07:00
Razgriz	91015fe949	Merge pull request #3677 from CHOMPStation2/upstream-merge-12225 ... [MIRROR] Item bank tweak!	2022-02-16 14:42:10 -07:00
Razgriz	de4cc762f1	powder that makes you say yes	2022-02-16 14:40:09 -07:00
Razgriz	7f29b95ebe	Merge pull request #3683 from CHOMPStation2/upstream-merge-12241 ... [MIRROR] Adds lollipops to Nanomed	2022-02-16 14:38:37 -07:00
Razgriz	290206dee6	powder that makes you say yes	2022-02-16 14:37:44 -07:00
Razgriz	238be3f2e3	Merge pull request #3678 from BlackMajor/patch-12 ... Fixes Merc Suppressors being unable to take damage from bullets	2022-02-16 14:29:33 -07:00
Razgriz	309a110ca4	powder that makes you say yes	2022-02-16 14:29:01 -07:00
Razgriz	d41f1c7a49	Merge pull request #3674 from CHOMPStation2/upstream-merge-11897 ... [MIRROR] [MIRROR] Initialize engine_loader landmark immediately	2022-02-16 14:27:14 -07:00
Razgriz	fcde43eaae	Merge pull request #3672 from CHOMPStation2/upstream-merge-12218 ... [MIRROR] No Quantum Pads on Shuttles	2022-02-16 14:26:38 -07:00
Razgriz	41832fdc16	Merge pull request #3670 from CHOMPStation2/upstream-merge-12210 ... [MIRROR] [MIRROR] Cybernetic Augments and Sick Tats	2022-02-16 14:26:02 -07:00
Razgriz	15d182432a	Merge pull request #3668 from CHOMPStation2/upstream-merge-12212 ... [MIRROR] Admin resize adjustments	2022-02-16 14:25:11 -07:00
Razgriz	66711ab5b4	Merge pull request #3667 from CHOMPStation2/upstream-merge-12211 ... [MIRROR] Fixes Ghost Sight being missing from Preference verbs	2022-02-16 14:10:19 -07:00
Razgriz	21597607bc	Merge pull request #3666 from Holdelta/bestdrink ... Pilk	2022-02-16 14:10:02 -07:00
Casey	c3a0eaaf5b	Merge pull request #12242 from GhostActual/bigshot_glasses ... Now's your chance to be a [BIG SHOT]	2022-02-16 07:21:13 +00:00
Casey	b7aa2aa83e	Merge pull request #12241 from Heroman3003/lollipops ... Adds lollipops to Nanomed	2022-02-16 07:21:04 +00:00
Casey	fdfa958555	Adds vendor refill cartridges to cargo	2022-02-14 21:36:39 +00:00
Casey	e723ed2118	Heavy-duty Engineer's Gloves	2022-02-14 21:32:19 +00:00
Casey	07ab730aa7	Merge pull request #12227 from Very-Soft/absorblangs ... Absorb Languages	2022-02-14 05:28:33 +00:00
BlackMajor	ef9e2919db	forgot about the importance of inheritance	2022-02-14 17:09:51 +13:00
BlackMajor	27fe631dd3	Update mercs_ch.dm	2022-02-14 15:01:07 +13:00