PsiOmegaDelta
5d3d0c5dc3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
Spamcat
a515f0469a
Wrenched opwn welding tanks now explode when exposed to fire.
...
#11537
2015-12-16 17:59:05 +03:00
PsiOmegaDelta
f382626075
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/asteroid.dm
code/game/verbs/ooc.dm
code/modules/admin/verbs/icarus.dm
code/modules/mob/living/silicon/robot/robot_items.dm
code/modules/projectiles/projectile/special.dm
code/modules/random_map/random_map.dm
code/setup.dm
2015-12-13 10:15:29 +01:00
GinjaNinja32
0f2b17f7bb
fix #11631
2015-12-10 13:01:06 +00:00
PsiOmegaDelta
5fcf13ac55
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/surgery_limbattachment.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/organs/organ.dm
code/modules/organs/organ_external.dm
code/setup.dm
2015-12-08 08:09:37 +01:00
Zuhayr
c2eba995ac
Merge pull request #11604 from mwerezak/organ-tag-fix
...
Organ fixes
2015-12-07 19:13:09 +10:30
PsiOmegaDelta
6a22086c17
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/verbs/suicide.dm
code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
mwerezak
9135a609cb
Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468
2015-12-06 04:17:52 -05:00
mwerezak
2312631508
Fixes #11510
...
Splashing and external transfer now checks if the container is open
2015-12-06 02:49:46 -05:00
PsiOmegaDelta
dd855b5259
Compilation fixes.
2015-10-27 12:47:35 +01:00
PsiOmegaDelta
3db2c4fb49
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
2015-10-27 12:38:28 +01:00
Chinsky
35ce07aa71
Merge pull request #11296 from mwerezak/pepperspray-fix
...
Pepperspray and chem smoke fixes
2015-10-26 05:42:59 +03:00
PsiOmegaDelta
d845a2f587
Generalizes the feed and force feed checks.
2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14
Can no longer use utensils to eat if you lack the means.
...
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes #11333 .
2015-10-22 16:52:07 +02:00
PsiOmegaDelta
db833735a8
Merge pull request #11340 from Baystation12/master
...
Dev-freeze.
2015-10-21 10:36:30 +02:00
PsiOmegaDelta
4c96cd62a7
Condiments now check for proximity before continuing with the rest of afterattack. Fixes #11334 .
2015-10-20 17:11:55 +02:00
PsiOmegaDelta
fc4c1d6af7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
mwerezak
27fe99bdf0
Reagent transfer now checks simulated var
2015-10-15 06:46:07 -04:00
mwerezak
d260b3bb18
Fixes #11300
...
Atoms crossing a smoke cloud now get splashed with up to 10 units of reagent.
2015-10-15 06:44:21 -04:00
mwerezak
dcde34512c
Refactors pepperspray touch effect, adjusts pepperspray messages.
2015-10-15 06:42:08 -04:00
PsiOmegaDelta
2fcaaf80c7
Chemistry machinery fixes.
...
Makes Topic() calls check parent. Adds proper operable() checks where applicable.
Makes the interact_offline only affect the NOPOWER flag.
Fixes #11116 . Fixes #11302 .
2015-10-15 11:31:57 +02:00
mwerezak
27429f7b0c
Less copypasta
2015-10-15 01:59:04 -04:00
Mike
4db9677c88
Fixes pepperspray confusion
...
Eye protection now prevents blindness, face protection prevents stun, instead of face protection doing both.
2015-10-14 14:49:52 -04:00
PsiOmegaDelta
9946c837e4
Merge pull request #11134 from Baystation12/master
...
Dev-freeze
2015-09-18 08:50:11 +02:00
PsiOmega
5c1b8380a4
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/jetpack.dm
code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
Kelenius
eef1013db2
Fixes #10925
...
Makes psilocybin less robust, also cuts down emote spam
2015-09-14 16:54:24 +03:00
GinjaNinja32
e29f5d108c
fix pill attack_log entry, switch to using key_name
2015-09-14 06:24:49 +01:00
PsiOmega
834d93df00
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-12 12:51:22 +02:00
mwerezak
19b195cd27
Revert "Reverts #10649 , fixes #10621 "
...
This reverts commit cb5df3963a
2015-09-09 21:12:24 -04:00
mwerezak
8e66d3b31a
Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon
...
Replaces the hardcoded def_zones with a headcheck() proc to handle species who have "brains" are located in non-standard places.
2015-09-09 19:49:46 -04:00
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
