4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
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
a1757ee696
Removes acetone and hydrazine from the chem list.
2015-11-05 19:41:04 -05:00
6660b6f61c
Tweaks plants to create a more diverse selection, different environment constants.
2015-11-05 18:43:05 -05:00
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
8c8b5a34d3
Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob
...
Blob spawn locations are now more random
2015-10-14 03:24:28 +03:00
3b5990121f
Blobs locations are now more random.
...
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.
Space vines and nuclear discs have been updated to use the same mechanics.
2015-10-13 18:49:55 +02:00
7856ca948d
[BOTANY] Seed Fixes
...
Fixes seed storage, adds gas scanning properties to scanner
2015-10-11 00:27:49 -04:00
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
7f066065d3
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
95f270ad3a
Xenomorph Queens can now infest victims.
2015-09-21 20:36:51 +09:30
22ef779f65
Cherrypicked xenophage-rewrite mechanics over.
2015-09-21 20:36:45 +09:30
d891fba1cc
Mob size tweaks.
...
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +02:00
232dd5bfb1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-09-18 08:51:10 +02:00
9946c837e4
Merge pull request #11134 from Baystation12/master
...
Dev-freeze
2015-09-18 08:50:11 +02:00
4a9dc8dc8f
Invisible / Missing Growth State Fix
...
Fixes a number of plants seemingly randomly having invisible plant
growth states.
- This was caused by overly-rounded math resulting in attempts to call
growth states that do not exist.
2015-09-14 17:35:33 -04:00
6e66ad307c
Refactors bottle smashing, apply_hit_effect() now returns the blocked status.
2015-09-09 13:58:45 -04:00
068d02c28c
Refactors various item attack() implementations
...
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
2015-09-08 23:39:33 -04:00
6ceffaacb5
Refactors item_attack.dm
...
Refactors and cleans up item_attack.dm and related mob attack code
2015-09-08 23:23:31 -04:00
fca95039bf
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/game/gamemodes/intercept_report.dm
code/game/gamemodes/traitor/traitor.dm
code/global.dm
code/modules/mob/inventory.dm
code/modules/mob/living/living.dm
html/changelogs/.all_changelog.yml
2015-09-07 11:31:19 +09:30
b9c01bf2f2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
2015-09-07 11:17:06 +09:30
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
05a29f8f3a
[BOTANY] Fixes plant storage nutrient check
...
Reported only high, low or none with previous system.
2015-09-06 16:42:58 -04:00
fa566fbe47
[Botany] Gas-related traits revealed on the plant analyzer
...
http://baystation12.net/forums/threads/the-little-things-4-with-a-vengance.9/page-11#post-10909
2015-08-30 11:58:39 -04:00
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
90e51b87e3
Refactoring hardsuit click checking.
2015-08-23 02:14:55 +09:30
bed03443d1
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
ac738f3db4
Moves flags values to item_flags var
...
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
2015-08-18 17:18:25 -04:00
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
65a9e11a52
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
baystation12.dme
2015-08-13 08:33:46 +03:00
ba240cb768
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
64a89fc5e4
Removes seed colour from nymphs.
2015-08-13 03:33:28 +09:30
7a22829ee9
Revert "Replaces gaseous reagents with organic chemistry ones."
...
This reverts commit aa22f7307a
2015-07-26 22:43:40 -04:00
42a9032e78
Hive dismantling, build timer, smoker sprite
2015-07-09 10:47:00 +03:00
df83203356
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/hydroponics/seed_mobs.dm
code/modules/materials/materials.dm
2015-07-09 08:45:49 +02:00
e4fdf84ef7
Fixes #10054 , fixes some mushroom issues.
2015-07-09 04:25:36 +09:30
53152abfd9
More sprites, span.
2015-07-08 17:00:09 +03:00
876dde550a
Beekeeping: spans, sprites, wood recipes, fixes
2015-07-08 12:55:55 +03:00
33a6cac0e1
Removes old hives
2015-07-08 12:55:53 +03:00
c5b98782d5
Adds a new type of beehives
...
Needs sprites, and removal of old beehives.
2015-07-08 12:55:37 +03:00
746ac180aa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-08 09:11:47 +02:00
f1a790f162
Fixes duplicate var definition.
2015-07-08 09:05:55 +02:00
e18472c444
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/datums/ai_laws.dm
code/modules/hydroponics/spreading/spreading.dm
2015-07-08 08:57:48 +02:00
89f93d4aac
Fixes an issue with plants.
2015-07-08 16:08:59 +09:30
8925a5b23e
Stops sampling from being a means of fighting vines
...
Vines can now only be sampled once mature, can only be sampled
periodically, and take less damage from sampling.
2015-07-05 20:59:23 -04:00
32b95445e3
Gives changeNextMove() a better name, default define
2015-06-30 22:29:45 -04:00
087a978d56
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown
...
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-28 22:35:14 -04:00
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
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
572a480679
Merge pull request #9723 from atlantiscze/plant-fix
...
Fixes #9706
2015-06-13 01:38:47 +09:30
Neerti