34544 Commits

Author	SHA1	Message	Date
Novacat	a925985b91	Merge pull request #5322 from Heroman3003/fluffening ... Updates fluff item lists and whitelist	2019-06-10 13:18:53 -04:00
Novacat	ea38a066fe	Merge pull request #5329 from VOREStation/Verkister-patch-2 ... Fixes rapala missing base_color	2019-06-10 13:18:31 -04:00
Novacat	65f1d76130	Merge pull request #5323 from Verkister/gripthatshit ... Engie dog fixes and tweaks.	2019-06-10 13:00:51 -04:00
Verkister	ea2c7077c7	Fixes rapala missing base_color ... -Basically fixes adminspawned rapala and the prosthetic limbs coming out blank white. -Also snips out some irrelevant copypasta residue.	2019-06-10 13:16:18 +03:00
Neerti	4512cd7b18	Merge pull request #6200 from Heroman3003/xenoarch-fixes ... Fixes some xenoarch bugs	2019-06-09 11:47:07 -04:00
Verkister	8d01927aa7	Engie dog fixes and tweaks. ... -Gives engie dog basic magnetic and circuit grippers. -Fixes the decompiler halving the amount on ingested sheets. -Doubles the nerfed matter reserve recharge rates and their starting amount.	2019-06-09 11:54:19 +03:00
Heroman	dea577a951	Updates fluff item lists	2019-06-09 15:40:38 +10:00
Novacat	b9eaa4f7ec	Merge pull request #5296 from Ketrai/fisherdomer ... Adds a fish farm.	2019-06-06 15:49:43 -04:00
Novacat	3db0e6d4c2	Merge pull request #5302 from TheFurryFeline/TFF-Infinite-Frame-Fixy ... Infinite Frame Fixy	2019-06-06 15:37:00 -04:00
TheFurryFeline	0aa11a1813	Pre-emptive Conflict Prevention ... Just noticed that my comments were very different and the mirror that's in will conflict if I don't commit this change.	2019-06-06 13:38:31 -04:00
Atermonera	88df3de3e6	Merge pull request #6195 from TheFurryFeline/TFF-Infinite-Frame-Fixy ... Infinite Frame Fixy	2019-06-06 13:11:59 -04:00
Verkister	dea9e242fa	Fixes borgs spinning on pounce	2019-06-05 18:28:44 +03:00
Novacat	78852d29eb	Merge pull request #5311 from VOREStation/upstream-merge-6192 ... [MIRROR] Prevents amber slime feeding from healing slimes	2019-06-04 13:45:37 -04:00
Novacat	c0e508eb15	Merge pull request #5310 from VOREStation/upstream-merge-6190 ... [MIRROR] Allows supplypacks with req_one_access to exist	2019-06-04 13:40:58 -04:00
Novacat	f86b9bd132	Merge pull request #5312 from Novacat/nova-basicfixes ... Adds missing species to Rig whitelist	2019-06-04 13:39:20 -04:00
Novacat	3908487095	Merge pull request #5309 from VOREStation/upstream-merge-6189 ... [MIRROR] Critical ManUpulator Fix	2019-06-04 13:32:03 -04:00
Novacat	a83caa7a69	Merge pull request #5308 from VOREStation/upstream-merge-6185 ... [MIRROR] lowers the minimum treatment bound of medibots.	2019-06-04 13:30:29 -04:00
Novacat	6ff16ce859	Update subtypes.dm	2019-06-04 13:30:01 -04:00
Novacat	ae42be4d56	Update supply.dm	2019-06-04 13:28:12 -04:00
Unknown	5a367aa029	Adds missing species to Rig whitelist ... ...I think I got them all this time.	2019-06-04 13:25:06 -04:00
Atermonera	452af8a682	Prevents amber slime feeding from healing slimes	2019-06-04 13:16:27 -04:00
Atermonera	8e215ec10f	Allows supplypacks with req_one_access to exist	2019-06-04 13:15:14 -04:00
Atermonera	2f434b45c1	Merge pull request #6189 from mistyLuminescence/manup ... Critical ManUpulator Fix	2019-06-04 13:13:57 -04:00
Atermonera	8be2258428	Merge pull request #6185 from chaoko99/medibots ... lowers the minimum treatment bound of medibots.	2019-06-04 13:12:43 -04:00
Atermonera	ddb0b7df2b	Merge pull request #6188 from Mechoid/PuzzleFix ... Fix Puzzledoors not being locked when no lock is found.	2019-06-04 13:12:22 -04:00
Spades	1ddecf112e	Merge pull request #5292 from Ketrai/fishbranch ... Adds lobsters and cuttlefish	2019-06-03 21:06:22 -04:00
TheFurryFeline	b8bbe08b83	Infinite Frame Fixy ... Ports a fix from https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/855 to prevent creation of infinite frames with doorbell chimes. Eliminates the runtime that would result from failed deconstruction.	2019-06-03 20:50:18 -04:00
Heroman	6c65828dd6	Fixes closing laptops with no proper support	2019-06-04 08:19:11 +10:00
Novacat	b88ba6f233	Merge pull request #5279 from Heroman3003/crateaccess ... Access fixes for carogopacks	2019-06-02 14:45:57 -04:00
Novacat	db88e4ce47	Merge pull request #5297 from Heroman3003/mercrename ... Renames Syndicate Commandos to Mercenary Commandos	2019-06-02 13:07:54 -04:00
Ketrai	227c061a7c	Screm	2019-06-02 16:35:21 +02:00
Ketrai	6d2a2a9001	Merge remote-tracking branch 'Ketrai/fisherdomer' into fisherdomer	2019-06-02 16:28:51 +02:00
Ketrai	360688e0dd	Adds bait, scrubber, fixes indoor rain.	2019-06-02 16:27:19 +02:00
Ketrai	45da153c15	Adds water tiles on which it doesn't rain indoors. :v	2019-06-02 15:49:24 +02:00
Heroman	34115d5a48	Renames Syndicate Commandos to mercs	2019-06-02 17:49:37 +10:00
Heroman	3e62bbcca1	Moves restriction to _vr file	2019-06-02 07:13:15 +10:00
Neerti	5a3040a08d	Merge pull request #6183 from Mechoid/FixPrecursotechOversights ... Fixes some Precursotech oversights.	2019-05-31 22:18:00 -04:00
Ketrai	405bbe60c6	Fixes	2019-05-31 19:15:06 +02:00
Ketrai	6d94902ddf	typos	2019-05-31 19:12:00 +02:00
Ketrai	861f3b6086	ohno	2019-05-31 18:45:51 +02:00
Ketrai	ba79dc55d1	trash items	2019-05-31 17:41:23 +02:00
Ketrai	a9e139e152	Merge remote-tracking branch 'Ketrai/fishbranch' into fishbranch	2019-05-31 17:17:59 +02:00
Ketrai	95edaac47c	Adds monkfish ... ITS HOOG	2019-05-31 17:17:29 +02:00
Ketrai	8af709f599	Update snacks_vr.dm	2019-05-30 20:35:48 +02:00
Novacat	ae20565d46	Merge pull request #5286 from VOREStation/upstream-merge-6154 ... [MIRROR] Sif Trees and Icon Scaling	2019-05-30 13:15:12 -04:00
Unknown	c7333d5a30	Conflict Resolution	2019-05-30 13:04:41 -04:00
Ketrai	e9cc1e48ab	Adds lobsters and cuttlefish	2019-05-29 22:37:59 +02:00
Novacat	eb5b57286d	Merge pull request #5288 from VOREStation/upstream-merge-6169 ... [MIRROR] Ports Radial Menus	2019-05-28 15:31:51 -04:00
Neerti	f5f20628fd	Merge pull request #6169 from GeneriedJenelle/patch-1 ... Ports Radial Menus	2019-05-28 14:25:49 -04:00
Neerti	914fc74a7a	Merge pull request #6182 from mistyLuminescence/eventroundstart ... No More Pre-Roundstart Events	2019-05-28 14:24:35 -04:00