PsiOmegaDelta
06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmega
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
Zuhayr
572a480679
Merge pull request #9723 from atlantiscze/plant-fix
...
Fixes #9706
2015-06-13 01:38:47 +09:30
Zuhayr
f9134028b6
Fixes #9777
2015-06-10 23:14:34 +09:30
Zuhayr
48b063a96e
Fixes #9620
2015-06-10 23:14:33 +09:30
Zuhayr
4b04b867ac
Fxes #9625
2015-06-10 23:14:32 +09:30
Atlantis
0135051498
Fixes #9706
...
- Adds checks whether the turf exists. This should prevent runtimes.
- Moves ..() call in food/snacks/grown after seed.thrown_at() call. I believe this was causing the runtime in first place.
2015-06-07 06:43:50 +02:00
PsiOmegaDelta
00953968dd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-04 08:20:00 +02:00
Zuhayr
04d1b40e3d
Merge pull request #9626 from GinjaNinja32/vine_event_fix
...
Fixes vine/infestation events not working with new lighting
2015-06-03 04:00:21 +09:30
GinjaNinja32
24adb8eb42
Fixes vine/infestation events not working with new lighting
...
Also adds a helper for finding whether there are any simulated atoms on a turf
2015-06-02 16:56:10 +01:00
PsiOmega
d0232732d4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
Zuhayr
21a019b34f
Cleanup
2015-05-30 05:35:00 +09:30
Zuhayr
a4c2267984
Fixes #9386
2015-05-30 04:01:13 +09:30
Zuhayr
887b8163cc
Fixes #9498
2015-05-30 02:56:01 +09:30
Zuhayr
88b3019e6c
Adds ghost click to posibrains.
...
Added ghost trap system used by plants and posibrains to get players. Added attack_ghost() to hydro trays and posibrains for the aforementioned.
Changelog.
Minor typo.
Topic fixes.
Minor fix.
2015-05-25 16:49:22 +09:30
Zuhayr
d4e45fbee8
Merge pull request #9327 from Techhead0/chemRenames
...
Replaces gaseous reagents with organic chemistry ones, adjusts flammable chemicals.
2015-05-23 20:52:58 +09:30
Zuhayr
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
Techhead0
aa22f7307a
Replaces gaseous reagents with organic chemistry ones.
...
Hydrogen, Oxygen, Nitrogen, Chlorine, and Fluorine have been replaced with Hydrazine, Acetone, Ammonia, and Hydrochloric Acid.
The new chemicals have been given appropriate effects and integrated into hydroponics.
Flammable liquids have higher touch_met so they don't take forever to build fire stacks.
Liquid phoron now contaminates clothing and burns eyes when splashed on mobs.
2015-05-19 09:32:24 -04:00
PsiOmega
c2200109d0
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
Zuhayr
f72203c611
Set vine mouse opacity to 2.
2015-05-18 22:07:00 +09:30
Zuhayr
3ed1917c3a
Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque.
2015-05-18 13:23:21 +09:30
Zuhayr
2714e458b3
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-17 12:58:09 +09:30
PsiOmega
83a09faf07
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/brain/MMI.dm
code/modules/projectiles/guns/launcher/crossbow.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-05-16 22:38:01 +02:00
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
Zuhayr
a101855343
Converted over hatchets and scythes.
2015-05-17 00:15:46 +09:30
Zuhayr
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
Zuhayr
a32179a062
Renamed knives.
2015-05-16 20:54:34 +09:30
GinjaNinja32
137c77c19d
Typo fix
2015-05-16 10:48:59 +01:00
Kelenius
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
Zuhayr
fe3f169959
Fixes #9234
2015-05-15 13:53:01 +09:30
Zuhayr
30cda10bb3
Fixes #9226
2015-05-15 13:43:28 +09:30
Zuhayr
1dfade1a33
master>dev
2015-05-13 17:09:57 +09:30
Chinsky
009dc181b2
Merge pull request #9203 from mwerezak/vines2
...
Updates weed control crate
2015-05-12 15:58:47 +03:00
PsiOmega
b52cf35680
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/projectiles/projectile.dm
2015-05-12 13:40:47 +02:00
PsiOmegaDelta
b30465374d
Merge pull request #9201 from GinjaNinja32/vine
...
Fixes vines not being vines.
2015-05-12 07:04:41 +02:00
Zuhayr
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
mwerezak
56c610e111
Updates weed control crate
...
Removes the scythe from the weed control crate and replaces it with hatchets and plantkiller spray bottles.
2015-05-11 21:20:16 -04:00
GinjaNinja32
3fc9d89163
Fixes vines not being vines.
2015-05-12 01:56:51 +01:00
Zuhayr
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
PsiOmega
d14904e1d6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/response_team.dm
code/modules/hydroponics/spreading/spreading.dm
code/modules/mob/dead/observer/observer.dm
2015-05-11 09:28:59 +02:00
mwerezak
d39fc76113
Tweaks space vines
...
Vines no longer mature nearly immediately, entangle less frequently.
Fixes vines entangling from adjacent turfs, which made it hard to tell
which vine was entangling someone.
2015-05-10 23:23:25 -04:00
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
Mloc
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +01:00
Mloc
e602a7e286
remove the sub-area system
...
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 17:06:29 +01:00
PsiOmega
d7e5792f98
Ensures dionaea nymphs respect antagHUD restrictions.
2015-05-07 13:28:35 +02:00
Chinsky
e0a903d9eb
Merge pull request #9093 from Baystation12/master
...
Master->Freeze
2015-05-05 01:42:57 +03:00
Kelenius
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
Kelenius
a2cea5c49c
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-04-28 19:22:35 +03:00
Kelenius
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
PsiOmega
f760d44127
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/objects/items/weapons/candle.dm
code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00
