8076 Commits

Author	SHA1	Message	Date
Swag McYolosteinen	555840fc1b	Merge pull request #7498 from Incoming5643/Fell_Pull_Commit_of_Orc_Slaying_+2 ... Magic Mania 1.85: RPG loot event	2015-02-22 11:59:09 +01:00
Swag McYolosteinen	96e7a5c473	Merge pull request #7864 from Jordie0608/yoursisthelistthatwillcrashtheserver ... Warning check before sorting long lists in vv	2015-02-22 11:57:01 +01:00
Swag McYolosteinen	3675f2e997	Merge pull request #7899 from Jordie0608/eyesarewindowstothesoulbeardsarewindowstothechin ... Fixes #7898	2015-02-22 11:55:13 +01:00
Jordie0608	edcfae62d3	spellfix	2015-02-22 21:32:39 +11:00
hornygranny	44e3c104e3	Merge pull request #7857 from Delimusca/heatermaths ... fixes heater rounding, lowered heater coefficient	2015-02-21 23:37:33 -08:00
Swag McYolosteinen	079f47c47c	Merge pull request #7768 from GunHog/AdminLoggingForExperimentor ... Admin logging for Experimentor and Relics	2015-02-21 19:19:48 +01:00
Jordie0608	5a3d9d883f	Warning check before sorting long lists in vv	2015-02-21 21:46:42 +11:00
Delimusca	0f8fc471d3	fixes heater rounding, coeff. lowered to .10	2015-02-21 01:03:30 -07:00
Razharas	51b4bbf71e	Revert "Allows portable machines to be mounted on any turf that can have cables."	2015-02-21 02:29:29 +03:00
GunHog	cd00e07f4f	Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor ... Conflicts: code/modules/research/experimentor.dm	2015-02-20 15:23:07 -06:00
GunHog	1cd892a0fd	Experimentor Invesigate Take 1 ... - Logs lots of the things to experimentor investigate.	2015-02-20 15:09:59 -06:00
Cheridan	fe3764dae8	Merge pull request #7765 from Thunder12345/glovening ... [REFACTOR] Reworks maintenance fake insulated gloves	2015-02-20 14:24:54 -06:00
Cheridan	ac00052da6	Merge pull request #7780 from xxalpha/catwalkmachines ... Allows portable machines to be mounted on any turf that can have cables.	2015-02-20 13:32:44 -06:00
Cheridan	6d78f9b77d	Merge pull request #7828 from Incoming5643/let_us_never_speak_of_this_again ... Removes the unintended ability to have sex with cats	2015-02-20 13:18:46 -06:00
Cheridan	23677f4df1	Merge pull request #7808 from phil235/CookingTweaks ... Cooking Tweaks	2015-02-20 12:02:04 -06:00
Swag McYolosteinen	b67569869b	Merge pull request #7843 from Mandurrrh/fixforbooze ... Fixes issue #7841	2015-02-20 18:51:29 +01:00
phil235	7af2e457c8	Merge pull request #7705 from GunHog/NVG_Mesons ... Adds NVG Mesons	2015-02-20 17:44:38 +01:00
Mandurrrh	3e43beab29	Fixes issue #7841	2015-02-20 09:15:20 -05:00
Razharas	e4fa3369f2	Merge pull request #7743 from GunHog/YetAnotherExperimentorFix ... Fixes E.X.P.E.R.I-MENTOR blood sacrifice!	2015-02-20 09:51:55 +03:00
Razharas	452aa3d961	Merge pull request #7791 from Mandurrrh/Booze ... Adds fountain machines for bar.	2015-02-20 09:19:42 +03:00
hornygranny	383e4e7111	Merge pull request #7792 from Menshin/regen_statis_tweaks ... Regenerative statis tweaks	2015-02-19 13:07:24 -08:00
hornygranny	ea12d68e60	Merge pull request #7817 from paprka/whatthefucktg ... Syndicate shotguns spawn with buckshot by default	2015-02-19 13:07:08 -08:00
Razharas	5365dd1438	Merge pull request #7799 from paprka/magshit ... removes bloat from magazines icons	2015-02-19 21:01:46 +03:00
phil235	66720a5ce9	Merge pull request #7834 from Menshin/telexploit_fix ... Deactivates the Hidden Syndicate Teleportation Device	2015-02-19 16:39:49 +01:00
Menshin	0d0ef9e02a	Deactivates the Hidden Syndicate Teleportation Device	2015-02-19 16:34:49 +01:00
phil235	83db82e62d	Fixed a typo	2015-02-19 11:52:40 +01:00
hornygranny	0cd74ff882	Merge pull request #7717 from phil235/sechailerAdjustFix ... Fixes the cyborg sechailer being adjustable.	2015-02-18 21:50:12 -08:00
hornygranny	9b91896897	Merge pull request #7769 from phil235/rapidDupeProcFix ... Fixes bugs with experimentor relics with rapidDupe proc.	2015-02-18 21:49:48 -08:00
hornygranny	c99ee72b55	Merge pull request #7788 from phil235/NeurotoxinReactionFix ... Fixes neurotoxin reaction's required temperature.	2015-02-18 21:49:01 -08:00
hornygranny	dbee9709d1	Merge pull request #7790 from phil235/CryoStingExploitFix ... Fixes cryosting detection exploit	2015-02-18 21:48:45 -08:00
hornygranny	90e0a00298	Merge pull request #7786 from phil235/SiliconGrabFix ... No more silicon grabbing.	2015-02-18 21:48:30 -08:00
hornygranny	da4f8e74d8	Merge pull request #7733 from Cheridan/reagent_foam ... Reagent Foam	2015-02-18 21:43:50 -08:00
Incoming	e94e94a5e2	fixes #7827	2015-02-19 00:23:56 -05:00
MrStonedOne	dda1bd3b2d	Merge branch 'lib-sucks-no-homo' of https://github.com/MrStonedOne/-tg-station into lib-sucks-no-homo ... Conflicts: code/modules/library/lib_machines.dm	2015-02-18 18:26:39 -08:00
MrStonedOne	c0af9cc320	Merge remote-tracking branch 'upstream/master' into lib-sucks-no-homo ... Conflicts: code/modules/library/lib_machines.dm	2015-02-18 18:23:05 -08:00
MrStonedOne	5addddb1d4	Merge remote-tracking branch 'upstream/master' into lib-sucks-no-homo ... Conflicts: code/modules/library/lib_machines.dm	2015-02-18 18:20:16 -08:00
MrStonedOne	6a9ea4c9ec	Ports tkdrg's library computer caching system. ... This helps mitigate lag caused by the computer grabbing meta information about almost **two thousand books** over sql on EVERY load of the library computer interface	2015-02-18 18:03:39 -08:00
GunHog	f9047c7a1c	Admin logging for experimentor itself ... - Admin logging for the chemleak event (Mutation, Xenogas, Borging gas) - Fix for empty pick() runtime	2015-02-18 16:50:11 -06:00
paprka	efbb4f5116	makes syndicate shotguns spawn with buckshot by default	2015-02-18 14:10:46 -08:00
phil235	30eb4e342a	Merge pull request #7652 from Incoming5643/Circumstantial_Dickpixel ... Tactical dickpixel™ removal	2015-02-18 21:07:08 +01:00
phil235	abd604f785	derp	2015-02-18 20:59:42 +01:00
phil235	c0d7015fe6	Adds renaming custom food with a pen. ... Adds a changelog.	2015-02-18 19:55:42 +01:00
TheVekter	fa00cee00c	Fixes that damn typo FOR REAL THIS TIME	2015-02-18 11:53:20 -06:00
phil235	262e7e5b5f	Tweaking cake nutriment amounts	2015-02-18 14:27:41 +01:00
phil235	024559f801	Buffs nutriment amounts in doughs and their cooked counterparts, as well as meats. ... Fixed a recipe.	2015-02-18 14:02:18 +01:00
Cheridan	1ac0c26655	Merge pull request #7770 from phil235/AnimationsFix ... Floating animation and life() fixes.	2015-02-18 02:27:28 -06:00
paprka	15e2b88a0f	removes bloat from magazines icons	2015-02-17 19:43:20 -08:00
Mandurrrh	6d23db48d4	This is a combination of 7 commits. ... Adds fountain machines for bar. Changed soda to drink updated code/mappaths	2015-02-17 19:14:41 -05:00
phil235	dcf99380b6	Merge pull request #7653 from GunHog/IonCarbinesFor-k-ommandos ... Introducing the Ion Carbine!	2015-02-18 00:16:33 +01:00
Menshin	89df7f351d	* Getting into regenerative statis now put the changeling into unconscious state ... * Fixed reviving not working	2015-02-17 22:04:58 +01:00