Commit Graph

35 Commits

Author SHA1 Message Date
PsiOmegaDelta
f1a790f162 Fixes duplicate var definition. 2015-07-08 09:05:55 +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
mwerezak
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
Zuhayr
4b04b867ac Fxes #9625 2015-06-10 23:14:32 +09:30
Zuhayr
04d1b40e3d Merge pull request #9626 from GinjaNinja32/vine_event_fix
Fixes vine/infestation events not working with new lighting
2015-06-03 04:00:21 +09:30
GinjaNinja32
24adb8eb42 Fixes vine/infestation events not working with new lighting
Also adds a helper for finding whether there are any simulated atoms on a turf
2015-06-02 16:56:10 +01:00
Zuhayr
21a019b34f Cleanup 2015-05-30 05:35:00 +09:30
Zuhayr
a4c2267984 Fixes #9386 2015-05-30 04:01:13 +09:30
Zuhayr
887b8163cc Fixes #9498 2015-05-30 02:56:01 +09:30
PsiOmega
c2200109d0 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
Zuhayr
f72203c611 Set vine mouse opacity to 2. 2015-05-18 22:07:00 +09:30
Zuhayr
3ed1917c3a Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque. 2015-05-18 13:23:21 +09:30
Zuhayr
30cda10bb3 Fixes #9226 2015-05-15 13:43:28 +09:30
PsiOmega
d14904e1d6 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm
2015-05-11 09:28:59 +02:00
mwerezak
d39fc76113 Tweaks space vines
Vines no longer mature nearly immediately, entangle less frequently.
Fixes vines entangling from adjacent turfs, which made it hard to tell
which vine was entangling someone.
2015-05-10 23:23:25 -04:00
Mloc
16d50c645d new object-based lighting system
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 20:54:25 +01:00
Mloc
e602a7e286 remove the sub-area system
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:29 +01:00
PsiOmega
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
Zuhayr
1070a8f63c Adds weedkiller smoke checks to hydro trays and spreading plants. 2015-04-01 07:25:09 -07:00
Zuhayr
9deebbf9f6 Vines should now respect coverage and magboots. 2015-03-22 16:25:22 +10:30
GinjaNinja32
bbae1a49e5 Fixes vines spreading through doors 2015-03-09 09:04:22 +00:00
GinjaNinja32
34e30fd76a Properly fixes vines pulling through windoors 2015-02-28 21:35:29 +00:00
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
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
0b2ca42600 Tweaks. 2015-02-21 20:56:55 +10:30
Zuhayr
728cb3cffa Working on vines. 2015-02-18 23:37:27 +10:30
Zuhayr
3b7555c6e0 WIP 2015-02-14 23:43:52 +10:30
Zuhayr
232c2c93e2 Fixes infinite loop issues with plant controller. 2015-02-13 10:56:52 +10:30
Zuhayr
8fb5836e4f Generalized fruit products properly. 2015-02-13 03:52:46 +10:30
Zuhayr
5890fa3c4b Added plant controller. 2015-02-05 15:53:20 +10:30
Zuhayr
09b9500486 Compile fixes. Seed storage is still broken. 2015-02-04 22:00:07 +10:30
Zuhayr
93cf4f73c5 More work on the vine system, fixing multiple bugs. 2015-02-04 10:52:48 +10:30