1672 Commits

Author	SHA1	Message	Date
Kyep	f8910a881a	Buffs Service Borgs	2017-10-24 02:37:43 -07:00
Aurorablade	73b0f32927	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff	2017-10-07 22:46:57 -04:00
Fox McCloud	cb70e28e65	Merge pull request #8146 from Landerlow/Lesspain ... Adds hydrocodone to medical borg hypospray	2017-09-30 03:52:33 -04:00
Landerlow	addbe41a5d	Switch back from morphine to hydrocodone on maintainer recommendation	2017-09-30 01:08:32 +02:00
Landerlow	7abe2a968d	Changed reagent from hydrocodone to morphine	2017-09-29 12:10:36 +02:00
tigercat2000	0e44384945	Merge pull request #7465 from Fox-McCloud/peacekeeper-borgs ... Adds Peacekeeper borgs; Retains Secborgs	2017-09-27 17:23:16 -07:00
Fox-McCloud	9c3d0a9f8a	bleh	2017-09-27 20:06:19 -04:00
Fox-McCloud	70d79e38f1	fixes	2017-09-27 16:01:48 -04:00
Mars	271b7cfb6c	Whoops	2017-09-27 02:00:38 +02:00
Mars	08fe1a796f	Nanotrasen, not Trasen	2017-09-27 01:48:08 +02:00
Landerlow	c4243bb597	Adds hydrocodone to medical borg hypospray	2017-09-27 00:27:27 +02:00
Mars	f1dc1e0fd8	Makes the nuke beerkeg it's own subtype.	2017-09-26 15:35:31 +02:00
Birdtalon	9c8de7976d	Update alcohol.dm	2017-09-11 15:50:25 +01:00
Birdtalon	2b40202ed2	spelling mistake	2017-09-11 00:35:54 +01:00
Aurorablade	df3d13ad7d	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff	2017-09-02 22:49:05 -04:00
Crazy Lemon	32e665aa97	Merge pull request #7909 from Citinited/nothing-could-go-wrong ... Adds flaming shots and Flaming Moes	2017-09-02 18:53:11 -07:00
Landerlow	c5e6a4ec24	Changes mix message and adds green vomit recipe	2017-08-30 15:17:16 +02:00
Landerlow	1981de5156	Changed plantmatter ingredient requirement to vomit	2017-08-30 14:39:12 +02:00
Landerlow	c3da1b5c96	adds a recipe to create enzymes	2017-08-29 21:59:45 +02:00
Birdtalon	0daed1cfe2	adds pineapple and derivatives	2017-08-26 22:07:51 +01:00
Aurorablade	9956a4a90a	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff	2017-08-23 17:37:22 -04:00
Fox-McCloud	94167d77e0	ooooopsss	2017-08-16 22:16:08 -04:00
Fox-McCloud	e1200d6a1e	Merge remote-tracking branch 'upstream/master' into peacekeeper-borgs	2017-08-16 22:08:07 -04:00
Fox-McCloud	cf4735a069	Merge remote-tracking branch 'upstream/master' into HUNKE	2017-08-16 18:36:30 -04:00
tigercat2000	ebabda1223	Merge pull request #7366 from KasparoVy/mob_rgb_to_hex ... Converts Mob Colours to Hexadecimal	2017-08-16 12:52:13 -07:00
Citinited	52ce095479	A bunch of code-based tweaks	2017-08-02 04:02:26 +01:00
Fox-McCloud	ca49a28f02	Updates Hydroponics, Nerfs it, Adds Onions	2017-08-01 17:58:23 -04:00
Aurorablade	8e5f3102ff	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff	2017-07-31 17:20:30 -04:00
Citinited	750dceb938	Flaming moe is now made with saline-glucose solution	2017-07-30 16:22:00 +01:00
Citinited	1489bf7a33	It's a flaming moe, not a flaming homer	2017-07-30 13:10:14 +01:00
Citinited	576adfb4e9	Adds the ability for people to light alcoholic shots; adds the flaming moe!	2017-07-30 09:52:13 +01:00
Fox-McCloud	99ad3db8ba	Fixes Dead Hearts Allowing you to live.	2017-07-29 19:28:38 -04:00
Crazy Lemon	e5a6d4a96c	Merge pull request #7849 from Fox-McCloud/remove-comments ... Removes All Comments about auto-correction and Finddeclaration.exe	2017-07-25 10:41:02 -07:00
Fox-McCloud	5d2429e15f	Merge remote-tracking branch 'upstream/master' into reagenttssss	2017-07-25 06:31:11 -04:00
Crazy Lemon	d9a64e23bf	Merge pull request #7333 from FlattestGuitar/taste-test ... Adds a taste system!	2017-07-24 11:53:35 -07:00
KasparoVy	a6bb591b46	Converts Mob Colours to Hexadecimal ... No front-end changes. This just means that mob colours now take up less columns in the database, incur less processing (reduced rgb() calls) and reduces the amount of code dedicated to them.	2017-07-22 19:59:58 -04:00
FlattestGuitar	97c2c10b13	o7	2017-07-22 23:53:46 +02:00
Fox-McCloud	4419683890	Reagents Cleanup	2017-07-22 05:18:13 -04:00
Fox-McCloud	027e7619f5	Removes All Comments about auto-correction and Finddeclaration.exe	2017-07-22 02:54:45 -04:00
Crazy Lemon	6a4e69f741	Merge pull request #7845 from Fox-McCloud/organsss ... Fixes IPC and Diona Knockdown Immunity	2017-07-21 23:05:00 -07:00
Fox McCloud	b37c1cf4e7	Merge pull request #7814 from Crazylemon64/many_fixes ... Runtime killer v2	2017-07-22 00:39:10 -04:00
Fox-McCloud	1ecd7f13fc	instant updates	2017-07-21 02:19:12 -04:00
Fox-McCloud	5bba6c70f7	Limits BLood Volume to 560	2017-07-18 00:10:43 -04:00
Crazylemon64	3a00e0f083	Fixes for numerous runtimes	2017-07-16 14:42:11 -07:00
Fox-McCloud	5a93390291	Fixes Blood Math	2017-07-15 05:10:33 -04:00
tigercat2000	403417a5b5	Merge pull request #7798 from Fox-McCloud/blood-runtime-fix ... Fixes Blood Runtime	2017-07-14 19:14:54 -07:00
Fox-McCloud	3c54268801	Fixes Blood Runtime	2017-07-14 01:04:19 -04:00
Fox-McCloud	b07eb1a0b5	Refactors Species Flags into Species Traits List	2017-07-13 18:55:45 -04:00
Fox-McCloud	0401e4fe6e	faster blood metabolization	2017-07-12 18:38:04 -04:00
FlattestGuitar	6499f31df4	Merge me a river 🎶	2017-07-12 21:13:20 +02:00