GinjaNinja32
9c267539a3
Merge remote-tracking branch 'polaris/master' into pl-chemistry
2015-12-22 02:55:31 +00:00
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
Neerti
33f85b8b88
Makes radiation medication not actually irradiate you worse.
2015-12-15 22:25:49 -05:00
GinjaNinja32
e068a689e3
tweak power cost
2015-12-14 23:13:17 +00:00
GinjaNinja32
53905d3669
add chemical regeneration to cartridge dispensers, remove energy dispensers
2015-12-14 23:01:45 +00:00
Neerti
e3bf3483c8
Merge pull request #559 from Yoshax/master
...
Adjusts the death-whiskey
2015-12-13 21:28:09 -05:00
Neerti
2aaa4e9a5e
Merge pull request #525 from Zuhayr/qol
...
Porting various QOL from Bay.
2015-12-13 21:25:43 -05:00
Yoshax
1eb91b3144
Adjusts the death-whiskey
2015-12-13 22:46:42 +00: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
Yoshax
48dcb85b44
Makes the mythical special blend whiskey real
2015-12-13 03:31:36 +00:00
Zuhayr
793bc18efd
Mops can now be wet in buckets or sinks.
2015-12-11 15:54:56 +10:30
Zuhayr
2edf2c499f
POCKET SAND!
2015-12-11 15:53:40 +10:30
GinjaNinja32
0f2b17f7bb
fix #11631
2015-12-10 13:01:06 +00:00
Zuhayr
565e39a28f
Porting forensics from Aurora.
2015-12-10 19:16:28 +10:30
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
Yoshax
db7af654ec
Adds checks to ensure target is valid, adds user feedback
2015-12-05 15:10:10 +00:00
Yoshax
4c201d8219
Adds ability to smash bottles on things other than people's heads
2015-12-05 14:22:40 +00:00
SinTwo
8d747eed8d
Moderator Logs
2015-11-29 13:34:00 -05:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
Neerti
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta
3dcd35508f
Compilation fixes.
2015-10-27 13:43:30 +01:00
PsiOmegaDelta
9d6c99aaf3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/carbon/breathe.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
html/changelogs/.all_changelog.yml
2015-10-27 13:08:33 +01: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
e37394e8fa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/human_helpers.dm
code/modules/reagents/reagent_containers/food/snacks.dm
2015-10-25 20:28:48 +01:00
PsiOmegaDelta
7d4f51be8e
Merge pull request #10287 from mwerezak/attack-cleanup2
...
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +01: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
0b9b8feb1e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
2015-10-21 10:38:57 +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
299ad9580c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/admin.dm
code/modules/admin/topic.dm
2015-10-16 13:02:59 +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
Chinsky
2a88b4d0aa
Merge pull request #11219 from PsiOmegaDelta/150929-HumanoidVision
...
Overhauls humanoid vision handling.
2015-10-15 19:15:28 +03:00
mwerezak
07881e7495
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2
...
Conflicts:
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
2015-10-15 07:08:16 -04:00
HarpyEagle
e24313be2e
Fix macro
2015-10-15 07:02:57 -04: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
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
PsiOmegaDelta
13b175c529
Merge remote-tracking branch 'upstream/dev' into xenomorphs
...
Conflicts:
code/game/objects/effects/aliens.dm
code/game/objects/structures/lamarr_cage.dm
2015-10-10 12:05:36 +02:00
