Kelenius
7c1d9b5614
Mech chargers are now a single machine
...
Can be built and upgraded
Resolves #5215
2015-08-16 06:07:36 -07:00
Kelenius
bb915a2c34
Reverts #10649 , fixes #10621
2015-08-16 06:04:39 -07:00
Kelenius
abf2bea2f0
Fixes #10599
2015-08-16 06:04:38 -07:00
PsiOmega
4cf736bb5c
Compilation fix.
2015-08-15 11:12:43 +02:00
PsiOmega
c81ad0964e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-08-15 11:06:03 +02:00
PsiOmega
3a08e2884a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/largecrate.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02: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
Kelenius
aa318b8d1c
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
code/modules/materials/material_recipes.dm
2015-08-14 16:55:21 +03:00
PsiOmegaDelta
d5c6d9c341
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-14 08:43:43 +02:00
PsiOmegaDelta
3a55b130a0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
.travis.yml
code/modules/virus2/disease2.dm
maps/exodus-5.dmm
2015-08-14 08:34:42 +02: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
mwerezak
e0965bc2cb
Implements inserting rags into booze bottles
2015-08-13 18:37:17 -04:00
mwerezak
b003e2f94c
Lowers the volume of eggs to 10
2015-08-13 18:37:15 -04:00
mwerezak
498253f056
Splashing atoms now causes a proportion of the chems to land on the target's loc
...
Splashing now differs from trans_to(). A proportion of the splashed chemicals will splash on the target's loc, until a turf is splashed.
2015-08-13 18:37:15 -04:00
mwerezak
b5425e0bd9
Makes beer and ale bottles into actual bottles, adjusts bottle smashing
...
Generalizes opening drink containers, makes beer and ale bottles a subtype of bottle instead of can
Adjusts bottle smashing, duration, damage, and reliability.
2015-08-13 18:37:13 -04:00
mwerezak
5ae15e222c
Bottles smash when thrown using harm intent
...
Throwing a glass bottle at something nearby on harm intent causes it to smash, splashing it's contents over whatever it hits.
If the hit atom is too far away the bottle will not smash. Also it does not smash with 100% reliability.
2015-08-13 18:32:50 -04:00
Kelenius
65a9e11a52
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
baystation12.dme
2015-08-13 08:33:46 +03:00
PsiOmegaDelta
93e914f021
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
2015-07-30 10:49:37 +02: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
PsiOmegaDelta
5cbb703609
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/jobs/access.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/update_icons.dm
code/modules/organs/organ.dm
code/modules/reagents/Chemistry-Holder.dm
code/setup.dm
2015-07-27 10:20:20 +02: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
bd6ec4a98e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/atoms.dm
code/game/machinery/rechargestation.dm
2015-07-26 10:21:36 +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
PsiOmegaDelta
74872e28a7
Compilation fix.
2015-07-24 11:02:39 +02:00
PsiOmegaDelta
f3c9a7224b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
code/modules/reagents/reagent_containers/borghydro.dm
2015-07-24 10:53:57 +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
PsiOmegaDelta
388343a84e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/recharger.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/mob.dm
2015-07-20 08:28:32 +02: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
PsiOmegaDelta
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +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
PsiOmegaDelta
c6f4f7fcee
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-12 15:14:43 +02:00
Zuhayr
c59dc2445c
Fixes #10062 and #10061
2015-07-12 07:04:35 +09:30
Kelenius
33a6cac0e1
Removes old hives
2015-07-08 12:55:53 +03:00
PsiOmega
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
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
PsiOmegaDelta
9698def0e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/nano/modules/human_appearance.dm
2015-06-22 16:59:19 +02:00
GinjaNinja32
9c32851ba5
Merge pull request #9871 from mwerezak/extinguisher
...
Fire Extinguishers
2015-06-22 15:36:55 +01:00
Zuhayr
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
mwerezak
f8d5127078
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
