Commit Graph

149 Commits

Author SHA1 Message Date
Kelenius
159ad76fab Fixes #8998 2015-04-27 08:06:21 +03:00
PsiOmegaDelta
f988545ed5 Merge pull request #8827 from comma/dev-freeze
Some fixes
2015-04-13 08:17:53 +02:00
Chinsky
10699ccfa3 Fixes #8473
..() doesn't really do anything meaningful, so it always returned null. Left it there just in case, but at least now it doesn't stop un-lightening.
2015-04-13 07:35:23 +03:00
Chinsky
271977dd7e Fixes #8537
Apparently drying racks don't actually do anything, but at least now they can do nothing on all the grown fruits! Also added some darkening so people feel like they were slightly less cheated.
2015-04-13 07:19:40 +03:00
Zuhayr
1070a8f63c Adds weedkiller smoke checks to hydro trays and spreading plants. 2015-04-01 07:25:09 -07:00
Zuhayr
7e615521ef Should fix issues with invisible seeds/products/plants. 2015-03-24 13:51:44 +10:30
Zuhayr
ef50918b9c Hackfix for #8588 2015-03-24 12:46:07 +10:30
Zuhayr
8791c2bf1e Fixing a typo.
! and ~ both compile. Feh.
2015-03-23 00:05:29 +10:30
Zuhayr
9deebbf9f6 Vines should now respect coverage and magboots. 2015-03-22 16:25:22 +10:30
Zuhayr
bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30
Zuhayr
fb52e095d0 Fixes #8543 2015-03-20 12:37:55 +10:30
Zuhayr
033f758abd Fixes #8477 2015-03-17 20:04:07 +10:30
Zuhayr
145b4442e5 Fixes #8388 2015-03-17 19:49:18 +10:30
Zuhayr
7cbe2c94fb Fixes #8388 2015-03-17 19:19:28 +10:30
PsiOmega
a86c16b3e3 Fixes hydroponics update_icon() runtime.
Rounding could cause plant maturation to have a value of 0.
2015-03-10 08:16:20 +01:00
GinjaNinja32
bbae1a49e5 Fixes vines spreading through doors 2015-03-09 09:04:22 +00:00
Raptor1628
cf0e526d91 Fixes and adjustments
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
2015-03-04 11:18:40 -05:00
GinjaNinja32
34e30fd76a Properly fixes vines pulling through windoors 2015-02-28 21:35:29 +00:00
Zuhayr
38d959e9f8 Should fix light level reporting. 2015-02-28 17:34:31 +10:30
Zuhayr
273a9e2480 Should stop plants spreading through diagonal windows. 2015-02-28 17:20:49 +10:30
Zuhayr
b572763f77 Fixes #8253 2015-02-28 17:19:21 +10:30
Zuhayr
227fda7b4c Fixes #8245 2015-02-28 16:59:37 +10:30
Zuhayr
3bf7d1446c Fixes #8285 2015-02-28 16:45:18 +10:30
Zuhayr
d0451eaa2d Fixes #8249 2015-02-28 16:30:34 +10:30
Mustafa Kalash
5d2f492386 Fixes #8265. Moves the print report link being added to the window to after the data is saved for printing. 2015-02-27 18:09:09 -05:00
Zuhayr
391ddd970e Resolves remaining issues with xenohydro PR. 2015-02-24 17:55:39 +10:30
Zuhayr
6c121e8e33 Fixes bugs with vines and potency. 2015-02-22 18:36:06 +10:30
Zuhayr
23b93e7540 Added tray lighting verb. 2015-02-22 17:34:41 +10:30
Zuhayr
9ad9f19a0b Transitioning back to using flour as a reagent. Sorry RKF. 2015-02-21 22:04:32 +10:30
Zuhayr
0b2ca42600 Tweaks. 2015-02-21 20:56:55 +10:30
Zuhayr
728cb3cffa Working on vines. 2015-02-18 23:37:27 +10:30
Zuhayr
d0b4f9de8a Merge branch 'xenohydro' of https://github.com/Zuhayr/Baystation12 into xenohydro 2015-02-14 23:44:01 +10:30
Zuhayr
3b7555c6e0 WIP 2015-02-14 23:43:52 +10:30
Zuhayr
77177b514f Working on spores. 2015-02-14 10:30:06 +10:30
Zuhayr
232c2c93e2 Fixes infinite loop issues with plant controller. 2015-02-13 10:56:52 +10:30
Zuhayr
066482de93 Readds predefined ambrosia items. 2015-02-13 05:53:45 +10:30
Zuhayr
15e666150e Readded pumpkin carving and poultice making. Added a description generator and cache. 2015-02-13 05:02:21 +10:30
Zuhayr
8fb5836e4f Generalized fruit products properly. 2015-02-13 03:52:46 +10:30
Zuhayr
a9d55a17b8 Readded mob products. 2015-02-12 23:24:44 +10:30
Zuhayr
c953e279a4 Update from dev. 2015-02-12 23:15:47 +10:30
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
mwerezak
5b5e16916f Replaces text expressions with macros 2015-02-12 01:55:12 -05:00
mwerezak
28f3bf739d Fixes randomized seed nutrient_consumption
Centers the range of possible values evenly between small amount and
heavy supply.
2015-02-11 23:06:29 -05:00
Zuhayr
e6eab3fabf Adding more plant genes to play with. 2015-02-11 15:04:59 +10:30
Kelenius
e6dc9d36fd Update for machine upgrades and some science
Also adds RPED and makes biogenerator and borg charger constructible .
2015-02-08 15:39:11 +03:00
Zuhayr
43d576dcc5 Merge pull request #8054 from mwerezak/chembottles
Replaces chem bottles with their overlay equivalents
2015-02-05 23:05:45 +10:30
Zuhayr
c5e2feb5f1 Merge with dev. 2015-02-05 20:24:06 +10:30
mwerezak
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
mwerezak
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
mwerezak
59bbf3a883 Replaces chem bottles with their overlay equivalents 2015-02-05 00:31:56 -05:00