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
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
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
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
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
572a480679
Merge pull request #9723 from atlantiscze/plant-fix
...
Fixes #9706
2015-06-13 01:38:47 +09:30
f9134028b6
Fixes #9777
2015-06-10 23:14:34 +09:30
48b063a96e
Fixes #9620
2015-06-10 23:14:33 +09:30
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
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
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
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +01:00
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
8791c2bf1e
Fixing a typo.
...
! and ~ both compile. Feh.
2015-03-23 00:05:29 +10:30
9deebbf9f6
Vines should now respect coverage and magboots.
2015-03-22 16:25:22 +10:30
bf8ad6d585
Rebalanced xenoflora sprites, fixed numerous issues.
2015-03-22 16:13:15 +10:30
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
23b93e7540
Added tray lighting verb.
2015-02-22 17:34:41 +10:30
728cb3cffa
Working on vines.
2015-02-18 23:37:27 +10:30
d0b4f9de8a
Merge branch 'xenohydro' of https://github.com/Zuhayr/Baystation12 into xenohydro
2015-02-14 23:44:01 +10:30
3b7555c6e0
WIP
2015-02-14 23:43:52 +10:30
77177b514f
Working on spores.
2015-02-14 10:30:06 +10:30
a9d55a17b8
Readded mob products.
2015-02-12 23:24:44 +10:30
c953e279a4
Update from dev.
2015-02-12 23:15:47 +10:30
e6eab3fabf
Adding more plant genes to play with.
2015-02-11 15:04:59 +10:30
5890fa3c4b
Added plant controller.
2015-02-05 15:53:20 +10:30
fdf0360a69
Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP.
2015-02-04 10:55:33 +10:30
93cf4f73c5
More work on the vine system, fixing multiple bugs.
2015-02-04 10:52:48 +10:30
Datraen