389178a9ad
Merge pull request #9745 from Kelenius/ofReagentsAndOD
...
Fixes #9738 - reagents always overdose
2015-06-08 20:43:55 +09:30
37f02ebc93
Fixes #9738 - reagents always overdose
2015-06-08 12:41:58 +03:00
f62cc38883
Adds logging for syringe_gun
...
Also updates holder get_reagents() output formatting
2015-06-06 17:02:42 -04:00
4a976e1ee2
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-02 13:13:40 +02:00
e70faa20ee
Merge pull request #9629 from GinjaNinja32/spawn
...
Spawn fixes
2015-06-02 08:05:54 +02:00
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
63f253a301
Makes hyposprays start empty
2015-06-01 17:17:16 +01:00
76daebe0db
More consistent logging via admin_inject_log proc
2015-05-29 16:57:42 +01:00
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
f2c0cb483d
Fixes skrell and dionaea alcohol resistance/weakness
2015-05-28 08:49:58 +03:00
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
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
360113850a
Updates Chemistry-Readme.dm
...
Also removes one unused variable that I forgot to remove.
2015-05-21 12:43:28 +03:00
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
fd450561c2
Carbon now clears ingested chemicals
...
Also fixes a bug that made ethy-thing not work.
2015-05-19 15:41:14 +03:00
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
83570a1a9e
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-16 23:35:05 +09:30
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
98fce1fa1e
Merge pull request #9301 from Kelenius/ofChemAndRuntime
...
Fixes #9294
2015-05-16 13:47:05 +02:00
a32179a062
Renamed knives.
2015-05-16 20:54:34 +09:30
8aa24b86bb
Renamed shards, katanas, claymores.
2015-05-16 20:36:33 +09:30
b4bfe917eb
Fixes #9294
2015-05-16 12:05:14 +03:00
5b9eefdebf
Merge with dev.
2015-05-15 23:22:48 +09:30
1e1471a601
Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173 .
2015-05-15 23:19:57 +09:30
10915eae24
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/customitems/item_defines.dm
code/modules/projectiles/guns/launcher/syringe_gun.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers/food/drinks.dm
code/modules/reagents/reagent_containers/pill.dm
maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
1e6921f924
Merge pull request #9268 from Mloc/lightwrite
...
fix for "cleaning light"
2015-05-14 15:08:03 -04:00
d95701a7b5
fix for "cleaning light"
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-14 18:03:18 +01:00
4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
e9cc39039c
Merge pull request #8946 from Zuhayr/miningstuff
...
Wall refactor/mining changes.
2015-05-12 13:13:31 +03:00
c8135cf87b
Merge pull request #9205 from mwerezak/masks
...
Snacks, drinks, and pills now check mouth coverage
2015-05-12 18:11:48 +09:30
b721eb36ef
Span classes and visible_message(), changelog
2015-05-11 23:40:44 -04:00
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
b1bfbf346d
Snacks, drinks, and pills now check mouth coverage
...
Mouth coverage is defined somewhat conservatively so that breath masks
and the like do not prevent eating. In general only things that
completely cover your face or head like gasmasks and space suit helmets
block eating and drinking, or forcing the same on someone.
2015-05-11 22:17:24 -04:00
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
6f41625752
Added construction drone sprites from Pawn.
2015-05-11 14:46:47 +09:30
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
fedd0342a0
Minor chem fixes
2015-05-09 12:03:22 +03:00
80467f8fa6
Removes metorapan reaction
2015-05-05 12:01:02 +03:00
1c38be5cfd
Crayons are now children of pens.
2015-05-05 08:41:24 +02:00
873b38e0a5
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-05-04 22:36:35 +03:00
e4ce047bd1
Chemistry-Reagents: absolute paths and split
2015-05-04 00:29:42 +03:00
4500eac948
Merge and removal of a wild file
...
Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
code/modules/reagents/Chemistry-Holder.dm
2015-04-29 14:20:44 +03:00
bd6a8e4d54
Chemistry-Holder.dm: absolute paths
2015-04-29 13:53:04 +03:00
a2cea5c49c
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-04-28 19:22:35 +03:00
185aadb5a9
Chemistry recipes: absolute pathing
2015-04-28 16:55:13 +03:00
948252d25b
Removes unused files added by accident, separates reagent files
2015-04-28 11:00:56 +03:00
317abc6b79
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/datums/recipe.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/medbot.dm
code/game/mecha/equipment/tools/tools.dm
code/game/objects/effects/chem/chemsmoke.dm
code/game/objects/effects/effect_system.dm
code/game/objects/items/toys.dm
code/game/objects/items/weapons/extinguisher.dm
code/game/objects/items/weapons/mop.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/organs/organ_internal.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/pill.dm
code/modules/reagents/reagent_containers/spray.dm
maps/exodus-1.dmm
2015-04-28 10:49:26 +03:00
bf43270624
Merge pull request #9015 from Kelenius/ofChemAndOne
...
Chemistry update - part one
In spite of the sassy tone.
2015-04-28 08:39:27 +02:00
d9e2947b32
Updates chemistry colors
2015-04-28 09:23:39 +03:00
Zuhayr