68960 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ocelot	d4f24ccc2a	Guns 3: The un-oofening ... see https://github.com/CHOMPStation2/CHOMPStation2/issues/3068 for a general idea of what i fixed	2022-04-06 10:10:11 -04:00
Razgriz	6b35446f12	Merge pull request #4012 from CHOMPStation2/upstream-merge-12624 ... [MIRROR] [MIRROR] Colors hud alerts according to their master object's color.	2022-04-05 21:20:00 -07:00
Razgriz	48eb790573	Merge pull request #4017 from CHOMPStation2/upstream-merge-12660 ... [MIRROR] Groundbase Tweaks	2022-04-05 21:16:08 -07:00
Razgriz	70a73a493d	Merge pull request #4016 from CHOMPStation2/upstream-merge-12659 ... [MIRROR] Adjusts trees and vendor spawners	2022-04-05 21:15:55 -07:00
Razgriz	f3b788c679	Merge pull request #4015 from CHOMPStation2/upstream-merge-12656 ... [MIRROR] [MIRROR] Fixes runtime with turrets and viscerators	2022-04-05 21:15:35 -07:00
Razgriz	c1d41840ba	Merge pull request #4013 from CHOMPStation2/upstream-merge-12650 ... [MIRROR] RPEDs for RTEGs and Rotory Generators	2022-04-05 21:14:41 -07:00
Casey	1e602b88ad	Groundbase Tweaks	2022-04-06 01:44:56 +00:00
CHOMPStation2	42876e88d8	Adjusts trees and vendor spawners	2022-04-06 00:56:29 +00:00
Casey	97eccd40fa	Merge pull request #12659 from Very-Soft/tweaks ... Adjusts trees and vendor spawners	2022-04-06 00:56:29 +00:00
CHOMPStation2	677cbe8b35	[MIRROR] Fixes runtime with turrets and viscerators	2022-04-06 00:18:19 +00:00
Casey	39af7d18a2	Merge pull request #12656 from VOREStation/upstream-merge-8494 ... [MIRROR] Fixes runtime with turrets and viscerators	2022-04-06 00:18:19 +00:00
CHOMPStation2	4517b3e74a	RPEDs for RTEGs and Rotory Generators	2022-04-06 00:16:04 +00:00
Casey	535316338b	Merge pull request #12650 from FartMaster69420/rteg-rped ... RPEDs for RTEGs and Rotory Generators	2022-04-06 00:16:04 +00:00
CHOMPStation2	25c59f3786	[MIRROR] Colors hud alerts according to their master object's color.	2022-04-06 00:16:00 +00:00
Casey	d748d32e7b	Merge pull request #12624 from VOREStation/upstream-merge-8507 ... [MIRROR] Colors hud alerts according to their master object's color.	2022-04-06 00:16:00 +00:00
Nadyr	0dd44e94bf	Merge pull request #4009 from CHOMPStation2/upstream-merge-12643 ... [MIRROR] Adds lots of cameras and holopads	2022-04-04 21:12:30 -04:00
Nadyr	42ace7eb63	Merge branch 'master' into upstream-merge-12643	2022-04-04 20:29:08 -04:00
Nadyr	fb519a275c	Merge pull request #4006 from CHOMPStation2/upstream-merge-12640 ... [MIRROR] Dorms flags	2022-04-04 20:28:11 -04:00
Nadyr	55e27633fc	Merge pull request #4003 from CHOMPStation2/upstream-merge-12637 ... [MIRROR] Catslugs & Access; a tale of securing sensitive items.	2022-04-04 20:27:55 -04:00
Casey	c2f3c9b756	Adds lots of cameras and holopads	2022-04-05 00:17:20 +00:00
Nadyr	077d04b405	Merge branch 'master' into upstream-merge-12637	2022-04-04 19:59:29 -04:00
Nadyr	0a824e4938	Merge pull request #4002 from CHOMPStation2/upstream-merge-12635 ... [MIRROR] Various fixes and more GB tweaks	2022-04-04 19:53:55 -04:00
Nadyr	58fe6f06cb	powder that makes you say yes	2022-04-04 19:40:21 -04:00
Nadyr	0d276898c6	Merge branch 'master' into upstream-merge-12635	2022-04-04 19:36:48 -04:00
Nadyr	93f23b966a	Merge pull request #4001 from CHOMPStation2/upstream-merge-12633 ... [MIRROR] GB Update	2022-04-04 19:31:26 -04:00
Nadyr	668750e503	Merge branch 'master' into upstream-merge-12633	2022-04-04 19:12:58 -04:00
Nadyr	0e2cff20a2	Merge pull request #3998 from CHOMPStation2/upstream-merge-12630 ... [MIRROR] Yet more map tweaks	2022-04-04 19:08:58 -04:00
Nadyr	9afb3927ff	powder that makes you say yes	2022-04-04 18:54:42 -04:00
Nadyr	e021f6d72a	Merge pull request #4004 from CHOMPStation2/upstream-merge-12636 ... [MIRROR] Hypospray Revamp	2022-04-04 18:48:22 -04:00
Nadyr	368b87d336	Merge branch 'master' into upstream-merge-12630	2022-04-04 18:47:50 -04:00
Nadyr	0ac860d8a7	Merge pull request #3997 from CHOMPStation2/upstream-merge-12627 ... [MIRROR] More maptweaks!	2022-04-04 18:35:56 -04:00
Nadyr	57bf9f2b23	powder that makes you say yes	2022-04-04 18:31:14 -04:00
Casey	a6e052cc9b	Hypospray Revamp	2022-04-04 18:29:52 -04:00
Nadyr	35ec6a2bbb	Merge pull request #3999 from CHOMPStation2/upstream-merge-12631 ... [MIRROR] Mini Aurora Port	2022-04-04 18:26:31 -04:00
Nadyr	f2e4a4b2b8	Merge branch 'master' into upstream-merge-12627	2022-04-04 18:23:03 -04:00
Nadyr	ade79d0688	Merge pull request #3994 from CHOMPStation2/upstream-merge-12621 ... [MIRROR] More GB Tweaks	2022-04-04 18:15:54 -04:00
Nadyr	47c669e4ae	powder that makes you say yes	2022-04-04 18:10:54 -04:00
Nadyr	077241bf60	powder that makes you say yes	2022-04-04 18:10:54 -04:00
Nadyr	c40c287455	powder that makes you say yes	2022-04-04 18:10:22 -04:00
Nadyr	543ca3c42c	powder that makes you say yes	2022-04-04 18:07:58 -04:00
Casey	061b177978	Mini Aurora Port	2022-04-04 18:07:58 -04:00
Nadyr	267cf31e12	Merge pull request #3993 from CHOMPStation2/upstream-merge-12622 ... [MIRROR] Catslugs looking kinda sus?!	2022-04-04 17:53:14 -04:00
Nadyr	a121954e24	Merge pull request #3992 from CHOMPStation2/upstream-merge-12592 ... [MIRROR] The Grand /TG Port - Part 6	2022-04-04 17:52:53 -04:00
Nadyr	ae024e612b	Merge branch 'master' into upstream-merge-12621	2022-04-04 17:48:52 -04:00
Nadyr	82c85defdf	powder that makes you say yes	2022-04-04 17:40:01 -04:00
Nadyr	6fe5e8c1e1	Merge pull request #3991 from CHOMPStation2/upstream-merge-12579 ... [MIRROR] The Grand /TG Port - Part 5	2022-04-04 17:37:57 -04:00
Nadyr	9470ade7e9	Merge pull request #3974 from CHOMPStation2/upstream-merge-12573 ... [MIRROR] Allows Xenochimera to take Autohiss	2022-04-04 17:37:09 -04:00
Nadyr	d34ba3d49f	Merge pull request #3990 from CHOMPStation2/upstream-merge-12578 ... [MIRROR] The Grand /TG Port - Part 4	2022-04-04 17:36:23 -04:00
Nadyr	1d62127841	Merge pull request #3989 from CHOMPStation2/upstream-merge-12577 ... [MIRROR] The Grand /TG Port - Part 3	2022-04-04 17:32:51 -04:00
Nadyr	6060fb7cad	Merge pull request #3988 from CHOMPStation2/upstream-merge-12576 ... [MIRROR] The Grand /TG Port - Part 2	2022-04-04 17:32:03 -04:00