20493 Commits

Author	SHA1	Message	Date
Fox McCloud	e602e4fa30	Updates Food and Candy Sprites	2019-08-23 17:37:38 -04:00
variableundefined	4cebe6a08a	Merge pull request #11719 from Terilia/headcrabs ... Headcrabs	2019-08-23 15:16:30 -04:00
variableundefined	1dc8e66cbc	Merge pull request #11772 from Couls/constructable-rechargers ... [READY] Constructable Rechargers and machinery tweaks	2019-08-23 09:16:37 -04:00
variableundefined	a42226c112	Merge pull request #11691 from TDSSS/lavaland-fax ... Gives lavaland syndie base a fax (+some small other changes)	2019-08-23 08:33:04 -04:00
variableundefined	e18777959e	Merge pull request #11818 from Couls/baseball-deflects ... Baseball!	2019-08-23 08:05:41 -04:00
Couls	6d7ee9c934	use hit_reaction instead	2019-08-23 00:40:44 -04:00
Fox McCloud	89f273414e	Merge pull request #12057 from TDSSS/mining-hardsuit-fix ... Mining hardsuit fix	2019-08-22 23:30:03 -04:00
TDSSS	79c6f1f078	I'm a dummy and can't copy-paste right	2019-08-23 03:32:04 +02:00
TDSSS	c4b944ad13	spacing	2019-08-23 03:28:36 +02:00
TDSSS	3540ab2bfc	Makes mining hardsuits come with helmets again	2019-08-23 03:26:43 +02:00
Fox McCloud	f8c447dbba	Merge pull request #12023 from SteelSlayer/ghost-health-analyzer ... Health and Cyborg analyzer for ghosts	2019-08-22 19:54:48 -04:00
Fox McCloud	ecec14e939	Merge pull request #12041 from Ionward/sprite-touchup-august19 ... Species Sprite Touchup and Minor Additions	2019-08-22 19:33:33 -04:00
Fox McCloud	7b2cc1e12b	Merge pull request #11808 from Couls/fat-mice ... Mice now have a chance of chewing through wires	2019-08-22 19:21:47 -04:00
variableundefined	07e9cf10a3	Merge pull request #12024 from Fox-McCloud/crusher-trophies ... Ports Crusher Trophies	2019-08-22 18:55:54 -04:00
variableundefined	5046c8649d	Merge pull request #12033 from Fox-McCloud/fultons ... Ports TG's Fultons	2019-08-22 18:07:56 -04:00
Fox McCloud	39d0b0b3f5	Merge remote-tracking branch 'upstream/master' into crusher-trophies	2019-08-22 16:28:06 -04:00
variableundefined	806c00ba68	Merge pull request #12039 from Fox-McCloud/more-lavaland-updates ... More Lavaland Updates: Primal and Bayonets	2019-08-21 22:38:25 -04:00
variableundefined	aba2f20d2a	Merge pull request #12043 from Fox-McCloud/survival-pen-tweak ... Tweaks/Buffs Survival Pen	2019-08-21 21:54:59 -04:00
Fox McCloud	dc6fa07731	Merge pull request #11924 from TDSSS/larva-growth-boost ... gives event-spawned xeno larva a growth boost	2019-08-21 02:03:51 -04:00
Fox McCloud	bb0fcaa73f	Merge pull request #11986 from Aurorablade/honk ... Upgrades Honktumor, Adds Honkbladder	2019-08-21 01:51:23 -04:00
Fox McCloud	e4ca25be3d	Merge pull request #11998 from Tayyyyyyy/pm_window_links ... Add links to ping and open conversation in window for PMs	2019-08-21 01:49:03 -04:00
Fox McCloud	c6372ec138	Merge pull request #12044 from DoctorDrugs/Colossus-vocal-cords-fix ... Removes the ability to consume the divine vocal cords	2019-08-20 21:12:31 -04:00
DoctorDrugs	e293f5b012	Removes the ability to consume the divine vocal cords	2019-08-20 16:23:53 -04:00
Fox McCloud	52f263ba01	Tweaks/Buffs Survival Pen	2019-08-20 15:02:15 -04:00
Tayyyyyyy	4fa093fb2c	Improve shuttle parallax stopping	2019-08-19 21:29:13 -07:00
Ionward	33f20e16cc	deconflicted some stuff I forgot	2019-08-19 18:50:42 -07:00
Ionward	e347ae8dfe	a little more than a touchup, includes: grey fit backpacks + uniforms and fixes associated, drask glasses and masks, and a version of the god eyes for drask grey and vox	2019-08-19 18:34:37 -07:00
Fox McCloud	c805cda038	Merge pull request #11615 from Tayyyyyyy/aa/parallax-no-sql ... Parallax	2019-08-19 21:13:33 -04:00
Tayyyyyyy	c73f0aafd2	Shuttle parallax!	2019-08-19 18:01:45 -07:00
Fox McCloud	3667557b60	More Lavaland Updates: Primal and Bayonets	2019-08-19 20:02:53 -04:00
Fox McCloud	01a68b8895	Ports TG's Fultons	2019-08-18 18:22:07 -04:00
Fox McCloud	9699beee82	Ports Crusher Trophies	2019-08-17 21:57:40 -04:00
SteelSlayer	3e7156e263	Ghost health/cyborg analyzer	2019-08-17 10:00:05 -04:00
Crazy Lemon	3313efed23	Merge pull request #11981 from Fox-McCloud/lavaland-update ... Major Lavaland Update	2019-08-16 22:22:49 -06:00
Fox McCloud	e2f7f6f055	science radio	2019-08-16 23:58:27 -04:00
variableundefined	11e9ecadbf	Merge pull request #11894 from TheSardele/blender ... Makes All-In-One Grinders constructable	2019-08-16 20:41:18 +08:00
variableundefined	adc33ef3a0	Merge pull request #11783 from Couls/on-hit-effects ... [READY] Add on-hit effects for lasers and bullet holes for walls from TG	2019-08-16 07:50:49 +08:00
Terilia	a134228787	removes unneeded spawn and nerfs headcrabs a little.	2019-08-15 12:24:28 +01:00
variableundefined	34bb102a37	Merge pull request #11767 from Arkatos1/pillbottle ... New Medical Directive - Colored Pillbottles!	2019-08-15 11:17:46 +08:00
variableundefined	a5e94c6e72	Merge pull request #11776 from Arkatos1/SlimeHUD ... SlimeHUD	2019-08-15 10:37:12 +08:00
Fox McCloud	5d9fc8e9ea	Merge pull request #11985 from Tayyyyyyy/admin_pencode ... Add admin pencode: style, class, and img	2019-08-14 22:22:34 -04:00
AffectedArc07	bdc4bba6ac	Add back parallax SQL changes	2019-08-14 17:53:15 -07:00
Couls	3b35952ff1	mice no longer whisper to the cables before chewing them	2019-08-14 20:17:18 -04:00
Fox McCloud	b3423eac2f	Merge pull request #11984 from Markolie/ruinsport ... Netherworld portal fix and butler pick time increase	2019-08-14 20:02:29 -04:00
Fox McCloud	a0203a60ac	Merge pull request #11965 from TDSSS/talisman-icons ... Give cult talisman different icons	2019-08-14 19:48:54 -04:00
variableundefined	353f0e0b3b	Merge pull request #11844 from JKnutson101/cyborgSuccumbBranch ... Gave Cyborgs with 0 battery left the ability to succumb.	2019-08-14 23:25:16 +08:00
variableundefined	3f990b50ea	Merge pull request #11980 from TheSardele/drunk-sleep ... Fixes sleeping drunk making you more drunk	2019-08-14 14:22:30 +08:00
tayyyyyyy	760009a0cb	Fix style	2019-08-13 16:32:31 -07:00
tayyyyyyy	77731d87d2	Fix setting high parallax setting insane instead	2019-08-13 16:32:31 -07:00
AffectedArc07	03af0be168	Ghost parallax	2019-08-13 16:32:31 -07:00