20703 Commits

Author	SHA1	Message	Date
Razgriz	4361f83fb2	Merge pull request #6380 from CHOMPStation2/upstream-merge-15029 ... [MIRROR] feature: Adds admin logging to disposals incidents	2023-06-16 11:38:36 -07:00
Selis	014e851218	CHOMPedit Comment	2023-06-16 18:24:54 +02:00
Selis	d8773879c6	Adds tracy integration	2023-06-16 18:20:56 +02:00
Heroman3003	5a2b7dd32c	Merge pull request #15029 from Runa-Dacino/disposals ... feature: Adds admin logging to disposals incidents	2023-06-16 06:30:29 +00:00
FoxglovePurpur	0d98a543f4	Update gps.dm ... Fixed the comment(s) <3	2023-06-13 14:12:46 -07:00
FoxglovePurpur	0425181669	Update bodybag.dm ... Fixed the comment <3	2023-06-13 14:12:10 -07:00
FoxglovePurpur	f945b95790	Update blueprints_vr.dm ... Fixed the comment <3	2023-06-13 14:11:40 -07:00
FoxglovePurpur	d6dff02608	Update gps.dm ... Added missing comment(s).	2023-06-13 14:06:00 -07:00
FoxglovePurpur	984423633e	Update bodybag.dm ... Added missing comment.	2023-06-13 14:04:03 -07:00
FoxglovePurpur	6d067b6e70	Update blueprints_vr.dm ... Added missing comments.	2023-06-13 14:02:41 -07:00
Digi Purpur	da120bab14	GPS Text and Spelling Fixes ... The GPS on/off text was reversed and this fixes it. Along with a couple others. The largest "change" is the change of posessed to possessed (since it requires an actual file-name change.)	2023-06-13 13:35:53 -07:00
Nadyr	81b3ccb3a0	Merge pull request #6304 from CHOMPStation2/upstream-merge-14936 ... [MIRROR] Little Weakref Refactor	2023-06-09 22:27:56 -04:00
Nadyr	87a6616138	Merge pull request #6313 from CHOMPStation2/upstream-merge-14948 ... [MIRROR] New Prosthetic Fab (Brain hurty, no funny name)	2023-06-09 22:25:44 -04:00
Nadyr	8280d28d5f	Merge pull request #6311 from CHOMPStation2/upstream-merge-14821 ... [MIRROR] 2023 EnerGen Power Cells	2023-06-09 22:23:14 -04:00
Nadyr	a1de745fca	powder that makes you say yes	2023-06-09 22:12:46 -04:00
Nadyr	89feb48c81	powder that makes you say yes	2023-06-09 22:02:41 -04:00
Nadyr	4b77ac894e	powder that makes you say yes	2023-06-09 21:55:09 -04:00
Nadyr	088d87cb57	Merge pull request #6293 from CHOMPStation2/upstream-merge-14931 ... [MIRROR] Items for the Plant People (not the literal plant people)	2023-06-09 21:45:16 -04:00
Nadyr	14d919f6ce	powder that makes you say yes	2023-06-09 21:29:08 -04:00
Nadyr	8ab286b258	Merge pull request #6290 from CHOMPStation2/upstream-merge-14925 ... [MIRROR] mecha medigun required_type fix	2023-06-09 21:28:14 -04:00
Nadyr	d987605022	Merge pull request #6288 from CHOMPStation2/upstream-merge-14916 ... [MIRROR] Medical Mayhem	2023-06-09 21:26:00 -04:00
Nadyr	fddcbf1fcc	Merge pull request #6285 from CHOMPStation2/upstream-merge-14912 ... [MIRROR] It's all bout that Money Money Money	2023-06-09 21:21:13 -04:00
Kassc	271c76a9c8	Merge pull request #6234 from Darlantanis/VRunjank ... VR tweaks and mob transformation	2023-06-04 14:26:38 -04:00
Heroman3003	f0a5570580	Merge pull request #14948 from Youtubeboy139/New-Proto-Fab ... New Prosthetic Fab (Brain hurty, no funny name)	2023-06-03 19:10:55 +00:00
Heroman3003	e24b0b016c	Merge pull request #14821 from Youtubeboy139/2023-EnerGen-Power-Cells ... 2023 EnerGen Power Cells	2023-06-03 19:09:44 +00:00
Heroman3003	3d53d2bb62	Little Weakref Refactor	2023-06-03 09:22:18 +00:00
Heroman3003	d41519dcb8	Items for the Plant People (not the literal plant people)	2023-06-02 01:22:32 +00:00
Heroman3003	00bd990f58	Merge pull request #14925 from MisterGrimm/miscfixesandchanges ... mecha medigun required_type fix	2023-06-01 20:41:27 +00:00
Heroman3003	365013a089	Merge pull request #14916 from Youtubeboy139/medical_mayhem ... Medical Mayhem	2023-06-01 20:38:12 +00:00
Heroman3003	b37a023823	Merge pull request #14912 from Youtubeboy139/Thaler-Change ... It's all bout that Money Money Money	2023-06-01 20:36:54 +00:00
Heroman3003	efeace49d3	Merge pull request #14911 from Runa-Dacino/PicnicBlanket ... Adds a new object: Picnic blankets! They can be folded & unfolded	2023-05-31 00:40:45 +00:00
Nadyr	1337968ff2	Merge pull request #6264 from CHOMPStation2/upstream-merge-14908 ... [MIRROR] Remove two maw posters and butt from default spawning	2023-05-29 19:38:05 -04:00
Nadyr	c7de7b865e	Merge pull request #6244 from CHOMPStation2/upstream-merge-14893 ... [MIRROR] TG Clothing Pack Polish	2023-05-29 19:23:04 -04:00
Nadyr	e1b4177afd	Merge pull request #6260 from CHOMPStation2/upstream-merge-14904 ... [MIRROR] Better Bags	2023-05-29 19:22:52 -04:00
Nadyr	0de160aae6	powder that makes you say yes	2023-05-29 19:21:31 -04:00
Nadyr	c189294aaf	powder that makes you say yes	2023-05-29 19:18:33 -04:00
Nadyr	883f2430ce	Merge branch 'master' into upstream-merge-14893	2023-05-29 19:09:57 -04:00
Nadyr	7424e1de6e	powder that makes you say yes	2023-05-29 19:04:23 -04:00
Nadyr	de16cc52e8	Merge pull request #6258 from CHOMPStation2/upstream-merge-14905 ... [MIRROR] Caps Downside of Biofuel Processor Traits	2023-05-29 19:00:06 -04:00
Nadyr	92dce0ceb5	Merge pull request #6253 from CHOMPStation2/upstream-merge-14900 ... [MIRROR] Better Candy Bars	2023-05-29 18:55:14 -04:00
Nadyr	33f456ba40	Merge pull request #6250 from CHOMPStation2/upstream-merge-14897 ... [MIRROR] Fixes #14896	2023-05-29 18:50:54 -04:00
Nadyr	b30356ebd4	Merge pull request #6245 from CHOMPStation2/upstream-merge-14894 ... [MIRROR] Adds Aria's medal	2023-05-29 18:41:55 -04:00
Nadyr	182873418f	Merge branch 'master' into upstream-merge-14893	2023-05-29 18:41:05 -04:00
Nadyr	b8778e21ff	Merge pull request #6242 from CHOMPStation2/upstream-merge-14880 ... [MIRROR] Take me out to the Ball Game	2023-05-29 18:38:32 -04:00
Nadyr	cc0fcc06e4	Merge pull request #6241 from CHOMPStation2/upstream-merge-14889 ... [MIRROR] Baton Safety Tape	2023-05-29 18:37:50 -04:00
Heroman3003	f9aaa6e264	Remove two maw posters and butt from default spawning	2023-05-28 22:27:09 +00:00
Heroman3003	b935061a1c	Better Bags	2023-05-28 02:59:23 +00:00
Heroman3003	242c300c6e	Merge pull request #14905 from VictorZisthus/fixes-biopros-perk ... Caps Downside of Biofuel Processor Traits	2023-05-27 23:11:11 +00:00
Heroman3003	fafbe1aed0	Merge pull request #14900 from Youtubeboy139/better_candy_bars ... Better Candy Bars	2023-05-27 05:21:20 +00:00
Heroman3003	6a06a3836f	Merge pull request #14897 from Youtubeboy139/fixes_egg ... Fixes #14896	2023-05-26 20:56:39 +00:00