954 Commits

Author	SHA1	Message	Date
mwerezak	13c760c5bb	Fixes #9453 and fixes #10614	2015-08-22 11:09:17 -04:00
Kelenius	cf78446463	Fixes #10730	2015-08-18 16:10:25 +03:00
PsiOmegaDelta	311dbcb0f0	Merge pull request #10658 from mwerezak/chem-fix ... Fixes overdose not working for ingested reagents	2015-08-16 10:18:16 +02:00
mwerezak	5f98346ab5	Fixes overdose not working for ingested reagents	2015-08-15 10:22:07 -04:00
Kelenius	cb5df3963a	Reverts #10649, fixes #10621	2015-08-15 13:15:52 +03:00
Kelenius	3b29856694	Fixes #10599	2015-08-15 13:04:57 +03:00
Snapshot	3b7ed9bdc4	Merge pull request #10649 from mwerezak/coffee-fix ... Fixes #10621	2015-08-14 22:51:43 -07:00
Snapshot	5f5671d21f	Merge pull request #10647 from mwerezak/acids ... Fixes #10645	2015-08-14 22:22:41 -07:00
mwerezak	3163de7a50	Fixes #10621 ... Coffee now adds jittery as an overdose effect. Set overdose so that drinking two full cups in one go (60 units) will result in 150 jitteriness.	2015-08-14 23:44:46 -04:00
mwerezak	133bc96344	Fixes #10645 ... Sets unacidable where appropriate.	2015-08-14 23:20:10 -04:00
Chinsky	0056a889de	Moved antibodies to the rest of reagents. ... Updates them to use new chem processing. Also axes unused commented out code.	2015-08-14 04:53:46 +03:00
PsiOmegaDelta	841f7f6db2	Compilation fixes.	2015-07-30 10:41:01 +02:00
PsiOmegaDelta	b6bd51828a	Merge remote-tracking branch 'upstream/master' into dev-freeze ... Conflicts: code/game/objects/items/robot/robot_upgrades.dm code/modules/admin/admin_verbs.dm code/modules/reagents/Chemistry-Holder.dm code/modules/reagents/Chemistry-Recipes.dm code/modules/reagents/reagent_containers/syringes.dm	2015-07-30 10:38:44 +02:00
GinjaNinja32	7a6599fdf4	Add logging to potassium-water and nitroglycerin reactions	2015-07-29 12:36:00 +01:00
GinjaNinja32	84c7625490	Chemical logging improvements	2015-07-29 07:55:30 +01:00
PsiOmega	984d5ee337	More #10285 fixes. ... This one is dev-freeze only. Adds another sanity check to trans_to_holder to avoid runtime issues.	2015-07-26 10:46:58 +02:00
PsiOmega	659b07415d	Merge remote-tracking branch 'upstream/master' into dev-freeze ... Conflicts: code/game/machinery/rechargestation.dm code/game/mecha/equipment/tools/medical_tools.dm maps/exodus-1.dmm	2015-07-26 10:00:12 +02:00
PsiOmega	3c1a3f6951	Fixes #10285. ... Adds Topic() input sanity checking.	2015-07-25 14:18:10 +02:00
Chinsky	90ae24dd1c	Merge pull request #10135 from Kelenius/ofBorgsAndShakers ... Of borgs and shakers	2015-07-23 21:41:48 +03:00
Kelenius	b6beb8c299	Admin logs for borg hypo	2015-07-20 09:31:02 +03:00
PsiOmega	b308e34388	Fixes #10170. ... Removes the bunsen burner completely. Was after the chem rework basically never referenced anyway.	2015-07-18 22:51:20 +02:00
Kelenius	678027d93d	Fixes #10145	2015-07-13 11:01:32 +03:00
Kelenius	0269d19bef	Borg reagent synths use links in chat and Topic()	2015-07-13 10:28:36 +03:00
Kelenius	79804f663e	Updates borg shaker and hypospray ... Fixes #6937 Hypospray no longer contains a bunch of reagent holders	2015-07-12 19:50:02 +03:00
Zuhayr	c59dc2445c	Fixes #10062 and #10061	2015-07-12 07:04:35 +09:30
PsiOmegaDelta	8fef02501c	Merge pull request #9936 from mwerezak/fire ... Balances fire to work better with very low concentration phoron gas burning	2015-06-26 13:34:21 +02:00
mwerezak	56065022a7	Updates fire_act() implementations to work better with lower temperature fires ... In some cases fire_act() wasn't even checking the applied temperature. Reworks how fire damages flooring.	2015-06-26 00:40:55 -04:00
GinjaNinja32	9c32851ba5	Merge pull request #9871 from mwerezak/extinguisher ... Fire Extinguishers	2015-06-22 15:36:55 +01:00
mwerezak	f8d5127078	Adds SLOT_EARS to various items	2015-06-21 01:45:43 -04:00
mwerezak	6a8aeb0153	Makes fire extinguishers effective at putting out mob fires ... Doubles the amount of water extinguishers carry and quadruples the amount of water sprayed with each use. Halves the damage taken by slimes when exposed to water to compensate. Also refactors chair propelling a bit.	2015-06-21 00:43:15 -04:00
GinjaNinja32	078cfb2533	Merge pull request #9774 from mwerezak/chem-touch ... Reagent splashing, mob fire	2015-06-17 10:05:11 +01:00
mwerezak	73333ac9c8	Moves metabolism to a holder subtype	2015-06-16 16:26:06 -04:00
mwerezak	70433b4367	Makes showers wash away touching reagents ... Also moves reagent permeability to it's own proc, and makes splash_mob respect copy	2015-06-16 16:26:04 -04:00
mwerezak	4cb70b2b94	Ingesting diseased blood contracts the disease ... Only if the disease is a contact type disease. The same restriction is also applied to touching diseased blood.	2015-06-16 16:26:02 -04:00
GinjaNinja32	4da75dba68	Fixes some more unbalanced HTML	2015-06-15 10:48:30 +01:00
mwerezak	8007d42783	Adjusts usages of reagent transfer procs ... Adds splash() proc for futureproofing. Replaces instances of splash_mob() with splash() Replaces instances of trans_to() with splash() where appropriate.	2015-06-10 00:03:08 -04:00
mwerezak	72a716b66c	Attempts to make transferring reagents a bit more logical ... Attempts to give trans_to, touch, and trans_to_* procs more distinct purposes. Applying reagents to things now calls touch() before attempting to transfer reagents. Reagents that affect fire stacks now do so from touch. Fixes #9750 when combined with the above. Also fixes acid affect_touch dealing brute instead of burn.	2015-06-09 21:39:45 -04:00
Zuhayr	389178a9ad	Merge pull request #9745 from Kelenius/ofReagentsAndOD ... Fixes #9738 - reagents always overdose	2015-06-08 20:43:55 +09:30
Kelenius	37f02ebc93	Fixes #9738 - reagents always overdose	2015-06-08 12:41:58 +03:00
mwerezak	f62cc38883	Adds logging for syringe_gun ... Also updates holder get_reagents() output formatting	2015-06-06 17:02:42 -04:00
PsiOmegaDelta	4a976e1ee2	Merge remote-tracking branch 'upstream/master' into dev-freeze	2015-06-02 13:13:40 +02:00
PsiOmegaDelta	e70faa20ee	Merge pull request #9629 from GinjaNinja32/spawn ... Spawn fixes	2015-06-02 08:05:54 +02:00
GinjaNinja32	5ebece6368	Spawn fixes ... Fixes spawning a chem dispenser spamming the log with label settings Fixes Spawn-Fruit and Spawn-Plant not being usable from hotbar Fixes Spawn-Fruit and Spawn-Plant not producing admin logs (file only) Allows spawning dispenser cartridges with different sizes and reagents	2015-06-02 02:24:32 +01:00
Yoshax	63f253a301	Makes hyposprays start empty	2015-06-01 17:17:16 +01:00
GinjaNinja32	76daebe0db	More consistent logging via admin_inject_log proc	2015-05-29 16:57:42 +01:00
GinjaNinja32	86f52910a1	Fixes #5945, de-copy-pastes parapens and sleepypens ... Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.	2015-05-28 22:23:37 +01:00
Kelenius	f2c0cb483d	Fixes skrell and dionaea alcohol resistance/weakness	2015-05-28 08:49:58 +03:00
StarSmasher	711ad88903	Fixes #9294 ... Adding 6 tomato juice to 50 protein doesn't really work if the maximum is 50. Also fixed it in the vegetable pizzas. Figured a quickfix would be better than a very delayed fix.	2015-05-25 22:26:55 +02:00
GinjaNinja32	3fb3a18f05	Supply shuttle and crate fixes ... - Supply point generation no longer increases over time, leading to a total of around 45000 points generating after 150 minutes - Supply packs can have access set as either a number or a list; either is transferred to crates' req_access var correctly - Non-secure reagent cartridge crates no longer use secure crates - Closet/crate examine now calls ..() in all circumstances, not just when the user is more than one tile away - Possibly more I can't remember	2015-05-23 16:15:04 +01:00
Kelenius	360113850a	Updates Chemistry-Readme.dm ... Also removes one unused variable that I forgot to remove.	2015-05-21 12:43:28 +03:00