31644 Commits

Author	SHA1	Message	Date
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
Casey	9b6517106b	Merge pull request #12256 from GhostActual/sizegun-revamp-2022 ... Sizegun Revamp 2022	2022-02-17 20:32:45 +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	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
Casey	6af0ccde8f	Item bank tweak!	2022-02-14 01:03:57 +00:00
Casey	3471313ef0	Merge pull request #11897 from VOREStation/upstream-merge-8354 ... [MIRROR] Initialize engine_loader landmark immediately	2022-02-13 21:58:57 +00:00
Casey	fc604df1c1	Merge pull request #12218 from Very-Soft/noqpadsonshuttls ... No Quantum Pads on Shuttles	2022-02-13 21:50:23 +00:00
Casey	d4c693378d	Merge pull request #12210 from VOREStation/upstream-merge-8200 ... [MIRROR] Cybernetic Augments and Sick Tats	2022-02-13 21:48:53 +00:00
Casey	42df3abc43	Merge pull request #12212 from Very-Soft/resizetime ... Admin resize adjustments	2022-02-13 12:22:20 +00:00
Casey	1c87f56fc5	Merge pull request #12211 from Heroman3003/sightfix ... Fixes Ghost Sight being missing from Preference verbs	2022-02-13 12:07:44 +00:00
Razgriz	23bff588e7	Merge pull request #3663 from CHOMPStation2/upstream-merge-12208 ... [MIRROR] Tether passage blockades	2022-02-13 01:46:04 -07:00
Razgriz	856af2785f	Merge pull request #3659 from CHOMPStation2/upstream-merge-12200 ... [MIRROR] Adds Slicker hair and Tall Bunny ears	2022-02-13 01:45:54 -07:00
Test Turtle	270f307b7c	Pilk ... What it says on the tin.	2022-02-13 00:42:21 -08:00
Razgriz	ea5b01ad69	Merge pull request #3653 from CHOMPStation2/upstream-merge-12191 ... [MIRROR] strapless bag	2022-02-13 01:31:20 -07:00
Razgriz	f9f1a680e0	Merge pull request #3661 from CHOMPStation2/upstream-merge-12205 ... [MIRROR] fixes a couple typos	2022-02-13 01:22:53 -07:00
Razgriz	568269f2c6	Merge branch 'master' into upstream-merge-12200	2022-02-13 01:22:42 -07:00
Razgriz	8eb3523fb8	powder that makes you say yes	2022-02-13 01:22:28 -07:00
Razgriz	6450edb58b	Merge pull request #3658 from CHOMPStation2/upstream-merge-12199 ... [MIRROR] Kitty ear right only 20	2022-02-13 01:22:00 -07:00
Razgriz	c7d22ba876	Merge pull request #3656 from CHOMPStation2/upstream-merge-12196 ... [MIRROR] Don't build ladders on shuttles	2022-02-13 01:21:25 -07:00
Razgriz	ad2e88fdf6	Merge branch 'master' into upstream-merge-12191	2022-02-13 01:18:29 -07:00
Razgriz	e58053d211	powder that makes you say yes	2022-02-13 01:17:59 -07:00
Razgriz	239cf5dc7f	Merge pull request #3652 from CHOMPStation2/upstream-merge-12190 ... [MIRROR] Adding text variables to vore-belly descriptions	2022-02-13 01:17:24 -07:00
Razgriz	3a23ec5ba2	Merge pull request #3650 from CHOMPStation2/upstream-merge-12188 ... [MIRROR] Size Standardization Bracelet	2022-02-13 01:16:22 -07:00
Razgriz	bbe7dc82e1	Merge pull request #3649 from CHOMPStation2/upstream-merge-12187 ... [MIRROR] Makes xenochimera able to eat raw fish	2022-02-13 01:15:44 -07:00
Razgriz	f686e22fb2	Merge pull request #3622 from Rykka-Stormheart/shep-dev-trait-tweaks ... [WIP] Trait Tweaks - Heavyweight Changes + Stubborn trait, etc	2022-02-13 01:09:54 -07:00
BlackMajor	c0d41ff10e	missed debug message	2022-02-13 20:35:24 +13:00
BlackMajor	b950be88fa	Removes baymiss	2022-02-13 20:29:26 +13:00