PsiOmega
|
69fde6af03
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/antagonist/alien/borer.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/objects/items/robot/robot_parts.dm
code/setup.dm
|
2015-09-05 09:24:30 +02:00 |
|
Daranz
|
ddeec9c89a
|
Fix effects for clonexadone
|
2015-09-04 16:06:03 +02:00 |
|
Zuhayr
|
14c57fcf11
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
code/modules/mob/holder.dm
icons/mob/head.dmi
|
2015-08-31 16:17:24 +09:30 |
|
Zuhayr
|
ac04bdfb52
|
Readded monkey scooping.
Conflicts:
code/modules/mob/living/carbon/human/species/species.dm
|
2015-08-31 07:01:56 +09:30 |
|
PsiOmegaDelta
|
713a7bd654
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/objects/items/devices/flashlight.dm
|
2015-08-25 08:12:39 +02:00 |
|
PsiOmegaDelta
|
c376c08cc0
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/objects/structures/girders.dm
code/modules/mob/living/carbon/human/human_damage.dm
|
2015-08-24 10:23:12 +02:00 |
|
mwerezak
|
75f19938b3
|
Fixes an apparent clonexadone typo
|
2015-08-24 00:04:03 -04:00 |
|
mwerezak
|
13c760c5bb
|
Fixes #9453 and fixes #10614
|
2015-08-22 11:09:17 -04:00 |
|
PsiOmega
|
8138815dc3
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
|
2015-08-18 18:05:16 +02:00 |
|
Kelenius
|
cf78446463
|
Fixes #10730
|
2015-08-18 16:10:25 +03:00 |
|
PsiOmegaDelta
|
7b5b7162d0
|
Merge pull request #10673 from Baystation12/master
Dev-freeze
|
2015-08-16 10:30:13 +02: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 |
|
Zuhayr
|
7e8713039a
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
|
2015-08-16 05:40:47 -07: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|