Datraen
caac4c5838
Randomized Plant Update ( #1805 )
...
* Plants now use a ban list instead of an approved.
This means that most reagents can be synthesized by plants.
Also added a name generator for strange seeds, based off of a bit of
lipsum and a bit of various plant genus and descriptors.
# Conflicts:
# code/modules/hydroponics/seed.dm
* Removes # sign
2016-05-31 15:08:42 +01:00
Yoshax
cd9fdd228b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall
2016-05-28 20:22:09 +01:00
Datraen
beda3185eb
Reverts the second mob clean up because of incomplete implementation.
...
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
mwerezak
11c5b10bb9
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.
Conflicts:
code/game/objects/items/weapons/clown_items.dm
code/game/objects/items/weapons/material/kitchen.dm
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-22 04:57:22 -04:00
Kelenius
98badae45f
Merge branch 'master' into cleanupTwo
2016-04-21 11:41:32 +03:00
Hubblenaut
3a45ceee64
Full fertilizer bottles of type glass/bottle
2016-03-30 19:42:13 +02:00
Kelenius
df5a0d7941
Mob inventory cleanup
...
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Neerti
a9ad84da4b
Merge pull request #1191 from Kelenius/inventoryCleanup
...
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Kelenius
1683761d6a
Fixes #1171
2016-03-21 14:22:44 +03:00
Kelenius
afbc235b96
Mob inventory cleanup
2016-03-15 16:39:40 +03:00
Kelenius
acc78a8000
Changes types of ghosts and eyes
...
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``
Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
Ithalan
9db3c3e268
Fixes plant analyzer not showing information about gasses consumed or released
...
Fixes hydroponics trays not showing sensor information when empty
2016-02-13 22:05:18 +01:00
Kelenius
e017b3f4ba
Fixes trays not processing reagents
...
#921
2016-02-08 12:00:49 +03:00
Zuhayr
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
Zuhayr
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
PsiOmegaDelta
9b1123cbaa
Replaces misc. checks with usr.incapacitated().
2015-11-24 14:05:04 +01:00
PsiOmegaDelta
e67ff9e903
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-24 14:02:15 +01:00
Datraen
301f7f5c8d
Fixes #11489 , fixes labels as well
2015-11-20 19:37:00 -05:00
Datraen
a79a8746e0
Fixes #11489
2015-11-20 18:30:52 -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
Datraen
7856ca948d
[BOTANY] Seed Fixes
...
Fixes seed storage, adds gas scanning properties to scanner
2015-10-11 00:27:49 -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
HarpyEagle
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
PsiOmegaDelta
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
PsiOmegaDelta
9946c837e4
Merge pull request #11134 from Baystation12/master
...
Dev-freeze
2015-09-18 08:50:11 +02:00
FalseIncarnate
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
mwerezak
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
Neerti
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
Datraen
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
Neerti
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
Zuhayr
90e51b87e3
Refactoring hardsuit click checking.
2015-08-23 02:14:55 +09:30
Kelenius
bed03443d1
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
Kelenius
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
Kelenius
65a9e11a52
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
baystation12.dme
2015-08-13 08:33:46 +03:00
Neerti
7a22829ee9
Revert "Replaces gaseous reagents with organic chemistry ones."
...
This reverts commit aa22f7307a
2015-07-26 22:43:40 -04:00
Kelenius
33a6cac0e1
Removes old hives
2015-07-08 12:55:53 +03:00
PsiOmegaDelta
746ac180aa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-08 09:11:47 +02:00
PsiOmegaDelta
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
Zuhayr
89f93d4aac
Fixes an issue with plants.
2015-07-08 16:08:59 +09:30
mwerezak
32b95445e3
Gives changeNextMove() a better name, default define
2015-06-30 22:29:45 -04:00
mwerezak
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
PsiOmega
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
Kelenius
0071ed3f24
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/machinery/deployable.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/modules/mob/living/simple_animal/simple_animal.dm
code/setup.dm
2015-06-07 14:05:54 +03:00
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
Kelenius
6d54e1c655
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/mob_grab.dm
2015-05-21 17:00:50 +03:00
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
Zuhayr
2714e458b3
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-17 12:58:09 +09:30
