42189 Commits

Author	SHA1	Message	Date
cadyn	3d253d6908	uwu	2020-11-14 18:17:55 -08:00
cadyn	33018c20ff	kachow	2020-11-14 18:14:30 -08:00
cadyn	bdf0340260	Update for Nadyr's comments	2020-11-14 18:07:44 -08:00
cadyn	c6c1d7f3ba	Update for Nadyr's comments	2020-11-14 18:06:25 -08:00
cadyn	fe5b1a7bf5	Making inline with Nadyr's comment	2020-11-14 18:01:38 -08:00
Razgriz	02d51b5756	Merge branch 'master' into metroid	2020-11-14 15:25:04 -07:00
Novacat	1efc4bcd9f	Merge pull request #9304 from Novacat/nova-basicfixes ... Balance fixes and bugfixes	2020-11-14 17:54:59 +00:00
Razgriz	7b5fc6d721	Add files via upload	2020-11-14 04:29:40 -07:00
Razgriz	f70d48cfce	Update Metroid Progress	2020-11-14 04:17:46 -07:00
Razgriz	cd71309e32	Add files via upload	2020-11-14 04:12:57 -07:00
Chompstation Bot	faa287d91b	[MIRROR] Adds AlliCo Grab-A-Gift	2020-11-14 07:32:50 +00:00
cadyn	62a7ced4dd	Update science_vr.dm	2020-11-13 23:25:18 -08:00
cadyn	e8546bb154	More conflicts	2020-11-13 23:23:31 -08:00
cadyn	e6386c802a	Fix more conflicts with your bullshit :v	2020-11-13 23:22:45 -08:00
cadyn	48f22efaab	Merge branch 'master' into upstream-merge-8900	2020-11-13 23:03:30 -08:00
cadyn	b4a9632e16	Add logging for adrenaline rush being activated.	2020-11-13 22:54:02 -08:00
Novacat	49ef2d2ee9	Merge pull request #8848 from Cyantime/spaceweirdness ... Remove gravity from debris field and rogue mining zones	2020-11-14 06:49:05 +00:00
cadyn	33a411e662	Feedbaaack	2020-11-13 22:46:58 -08:00
Chompstation Bot	a9ca363f7f	Adds a ton of potential fluff alt-titles	2020-11-14 06:46:55 +00:00
Cadyn	9efa4251ca	Spicy Engineering :o	2020-11-13 04:35:15 -08:00
Razgriz	76e059625c	Merge pull request #835 from CHOMPStation2/cadyn-patch-1 ... Actually give CMO teleport access.	2020-11-13 03:37:09 -07:00
cadyn	d270b072d5	Actually give CMO teleport access.	2020-11-13 02:09:30 -08:00
Razgriz	a9b48f90b2	Change OOC Escape message ... Because old message is crap and OOC Escape is great for escaping stupid mobs because vore mechanics in combat is a meme, and with other people consent is important. You should never feel threatened or intimidated to press this button.	2020-11-13 02:59:24 -07:00
Razgriz	8e8ae7229e	Merge pull request #826 from r4d6/patch-1 ... Allow Phase Weaponry to be printed again.	2020-11-13 00:35:34 -07:00
Razgriz	8fce3fe4b6	Merge pull request #825 from Darlantanis/StarcasterFix ... Converts Starcaster to tgui	2020-11-13 00:26:46 -07:00
cadyn	6c01fa902d	swapped some numbers by mistake :p	2020-11-12 00:39:28 -08:00
Razgriz	e4e0b08da6	Merge pull request #788 from cadyn/ballistics-v2 ... Ballistics v2	2020-11-11 19:32:40 -07:00
Razgriz	2e94257252	Merge pull request #777 from cadyn/gunoverhaul ... Cadyn's ballistics overhauls part 1	2020-11-11 19:32:20 -07:00
Razgriz	0e07c9a739	Merge pull request #824 from r4d6/cigar ... Add cigar cases to the loadout	2020-11-11 19:30:25 -07:00
Razgriz	c0ebd7d70a	Merge pull request #821 from CHOMPStationBot/upstream-merge-9293 ... [MIRROR] Couple little borgo belly tweaks.	2020-11-11 19:30:07 -07:00
Razgriz	65bea48122	Merge pull request #820 from CHOMPStationBot/upstream-merge-9288 ... [MIRROR] [MIRROR] Adds the Frostbelle	2020-11-11 19:16:05 -07:00
Razgriz	6123e3872d	Merge pull request #819 from CHOMPStationBot/upstream-merge-9286 ... [MIRROR] Event vendors and entertainer's vendor	2020-11-11 19:15:43 -07:00
Razgriz	4545f66e7c	Update dog_sleeper_vr.dm	2020-11-11 19:12:11 -07:00
Razgriz	308a8ac9d4	Update grass.dm	2020-11-11 19:01:02 -07:00
Razgriz	9a1f979eee	Update vending_machines_vr.dm	2020-11-11 18:58:16 -07:00
Cadyn	613033221d	trying to appease travis some more	2020-11-11 16:52:47 -08:00
Cadyn	e0c685e59a	travis is a bitch	2020-11-11 16:01:57 -08:00
Cadyn	9f54f4fb3d	stupid runtime reee	2020-11-11 15:34:13 -08:00
Cadyn	cfc8f579a2	Added spicy tools	2020-11-11 15:07:16 -08:00
Cadyn	6d5c74aa3c	forgot the </span> oops	2020-11-11 13:55:57 -08:00
Cadyn	6d35d3f025	4.0 slowdown instead of 2.0	2020-11-11 13:46:09 -08:00
Cadyn	953b47764c	Cadyn's traits v2	2020-11-11 12:34:31 -08:00
cadyn	29645e04e1	adding #ifndef for gaussian_random	2020-11-10 15:15:16 -08:00
r4d6	e4f101a670	Uncomment Phase Weaponry ... Phase Weaponry can be printed again.	2020-11-10 12:34:52 -05:00
Darlantan	61f46ab35f	Converts starcaster to tgui	2020-11-10 06:40:19 -05:00
r4d6	18673505f6	Another move.	2020-11-10 00:06:36 -05:00
r4d6	60215f5b7e	Merge branch 'cigar' of https://github.com/r4d6/CHOMPStation2 into cigar	2020-11-10 00:05:47 -05:00
r4d6	d628ce8ff4	Move the cigar cases to a new _ch file	2020-11-10 00:04:17 -05:00
r4d6	e00454fad0	Add chomp edits	2020-11-09 23:49:05 -05:00
r4d6	8b91ad3a37	Add chomp edits	2020-11-09 23:48:19 -05:00