3384f13a31
Merge pull request #8029 from GinjaNinja32/viro
...
Virology rework
2015-02-06 00:18:13 +03:00
2100c51905
Merge pull request #8042 from PsiOmegaDelta/HearItSayIt
...
Silicons now have some timestamped input
2015-02-06 00:15:15 +03:00
abd3396a13
Merge pull request #8041 from PsiOmegaDelta/SetMyName
...
Silicons can now more easily be correctly renamed.
2015-02-06 00:15:07 +03:00
fc4e6796ce
Merge pull request #8035 from PsiOmegaDelta/CanHasNano
...
NanoUI/Topic make-over
2015-02-06 00:15:04 +03:00
43d576dcc5
Merge pull request #8054 from mwerezak/chembottles
...
Replaces chem bottles with their overlay equivalents
2015-02-05 23:05:45 +10:30
a073cba477
Merge remote-tracking branch 'upstream/dev' into CanHasNano
...
Conflicts:
code/setup.dm
2015-02-05 12:37:15 +01:00
50064d86b3
Corrects ATM Machine syndromes.
2015-02-05 11:56:00 +01:00
c5e2feb5f1
Merge with dev.
2015-02-05 20:24:06 +10:30
9caf76d069
Glass bottles are now dispensed with the lid on
...
It seemed kind of silly that vendors, for example, would dispense
bottles with their lids off.
2015-02-05 00:41:59 -05:00
8da0fb7f43
Merge remote-tracking branch 'upstream/dev' into chembottles
...
Conflicts:
code/modules/hydroponics/hydro_tools.dm - flags var
2015-02-05 00:37:19 -05:00
59bbf3a883
Replaces chem bottles with their overlay equivalents
2015-02-05 00:31:56 -05:00
5890fa3c4b
Added plant controller.
2015-02-05 15:53:20 +10:30
6567c68ecb
Merge remote-tracking branch 'remotes/upstream/dev' into 1_30_2015_new_shuttle
2015-02-04 13:34:48 -05:00
13d8bd47e7
Adds subtype of the AI core structure to disallow latejoining.
...
Fixes a bug where carding an AI would free open a slot.
Adds cameras and holopads to the shuttle and a few areas at Centcom.
Adds check to AI's Life() to make sure it won't die in areas which have magical free power.
Adds subtype of oxygen canister, which starts off very cold. This is meant to replace the freezer on Centcom, and for the emergency shuttle's cryo.
2015-02-04 13:29:55 -05:00
d5c8a6262a
Fixes the fix for supersonic walking.
2015-02-04 10:33:39 -07:00
7d502aa255
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity
2015-02-04 07:40:20 -08:00
4f541758c6
Merge pull request #8003 from Jamini/dev
...
Added Tajran, Lizardfiend, and Slugfiendian depiction transformations for the CE rig
2015-02-04 18:17:32 +03:00
8a46903231
Merge pull request #7830 from PsiOmegaDelta/CanTrack
...
Camera tracking logic cleanup and tracking notice feature.
2015-02-04 18:17:21 +03:00
f8b94456ba
Merge pull request #7844 from Kelenius/ofDryingAndRacks
...
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
82ca870c53
Merge pull request #8028 from GinjaNinja32/beaker
...
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
2015-02-04 18:14:22 +03:00
f386d2eb47
Merge pull request #7979 from PsiOmegaDelta/GhostSight
...
Ghosts now have more sight options.
2015-02-04 17:31:21 +03:00
fcb2770004
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity
2015-02-04 05:15:23 -08:00
8bc85c6bca
Missing files added
2015-02-04 20:40:39 +08:00
952fd3a373
Fixes supersonic walking with canes.
2015-02-04 05:30:56 -07:00
5a1980aabd
Updated seed storage to use trait procs.
2015-02-04 22:19:37 +10:30
09b9500486
Compile fixes. Seed storage is still broken.
2015-02-04 22:00:07 +10:30
f045f5b2e9
Timestamped speech for silicons.
2015-02-04 10:12:01 +01:00
9352932e3d
Timestamped radio for silicons
...
All silicons now have timestamped radio messages.
2015-02-04 10:04:18 +01:00
1a1bf4a718
Silicons can now be easily renamed.
...
Moves the AI SetName proc down silicon level.
2015-02-04 09:48:30 +01:00
1eaf311b25
Merge pull request #7887 from Zuhayr/pickaxes
...
Renames pickaxes to drills, resprites accordingly.
2015-02-04 06:32:37 +01:00
a737dd0ca2
Merge pull request #7800 from Zuhayr/randmap
...
Random map generator/distribution map refactor.
2015-02-04 07:11:45 +03:00
0091aca22c
Merge with dev.
2015-02-04 11:05:35 +10:30
11ec632c22
Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap
2015-02-04 11:03:44 +10:30
3402912335
Merge with dev.
2015-02-04 11:03:13 +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
e323bbf6db
Integrated xenoarch plants into regular system again. WIP.
2015-02-04 10:54:27 +10:30
3b60a5959e
Added labelling for hydro trays.
2015-02-04 10:54:18 +10:30
61f4699da2
Added printouts to plant analyzers.
2015-02-04 10:54:08 +10:30
2d1fd2dd2f
Added report printing for plant scanners.
2015-02-04 10:53:09 +10:30
93cf4f73c5
More work on the vine system, fixing multiple bugs.
2015-02-04 10:52:48 +10:30
0f126d2e54
Minor Entered() refactoring.
2015-02-04 10:49:53 +10:30
09e4be2b1b
Collapsed space vines, glowshrooms and biomass into one spreading-plant system.
2015-02-04 10:49:41 +10:30
43802dceb7
Removed TRAIT_LIFESPAN.
2015-02-04 10:49:30 +10:30
8790bfd014
Mature mob-plants have a chance of self-harvesting if the tray lid is not closed.
2015-02-04 10:49:21 +10:30
0e93c1cf7b
Rewriting the /obj/effect/glowshroom into a more general system.
2015-02-04 10:49:09 +10:30
d616040e8c
Renamed some files, did some path replacements
2015-02-04 10:48:18 +10:30
5359d62735
All mobs produced from hydroponics will look for a player.
2015-02-04 10:47:48 +10:30
d6b99b7995
Spread 1 plants can be planted outside of trays.
2015-02-04 10:47:35 +10:30
c789f58b3c
Converted seed genetics over to a macro-based list of traits
2015-02-04 10:47:24 +10:30
3ff956da69
Moved grown.dm to hydro folder for traits.
2015-02-04 10:46:24 +10:30
Chinsky