10440 Commits

Author	SHA1	Message	Date
Zuhayr	0bb2cd835c	Merge pull request #8600 from mwerezak/bread-tube ... Adds bread tube trash item, merc shuttle vendor	2015-03-25 00:54:16 +10:30
mwerezak	1ce81b91b1	Adds bread tube trash item	2015-03-24 04:03:06 -04:00
mwerezak	113498dc1e	Makes bread tube nutriment content similar to comparable snacks	2015-03-24 03:57:17 -04:00
Zuhayr	7e615521ef	Should fix issues with invisible seeds/products/plants.	2015-03-24 13:51:44 +10:30
Zuhayr	45f28d5372	Fixes #8485	2015-03-24 13:20:24 +10:30
Zuhayr	ef50918b9c	Hackfix for #8588	2015-03-24 12:46:07 +10:30
PsiOmega	bd48c76620	Merge remote-tracking branch 'upstream/master' into dev-freeze	2015-03-23 21:14:32 +01:00
PsiOmegaDelta	c85e1ce786	Merge pull request #8592 from comma/maxlen ... Readded missing check for paper editing	2015-03-23 21:13:43 +01:00
Chinsky	a9ee51bc64	Readded missing check for paper editing ... Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues. Thanks @volas for noticing.	2015-03-23 23:02:43 +03:00
Zuhayr	14950a7e3a	Merge pull request #8584 from Kelenius/ofBorgsAndGlass ... Fixed construction borg's Rglass	2015-03-23 21:34:36 +10:30
PsiOmega	1908ba59e2	Merge remote-tracking branch 'upstream/master' into dev-freeze	2015-03-23 11:45:32 +01:00
Kelenius	026ec265d4	Fixed construction borg's Rglass	2015-03-23 12:11:58 +03:00
Zuhayr	1474c6fdd1	Merge pull request #8574 from PsiOmegaDelta/AIDel ... Deletes AI eye along with the AI.	2015-03-23 10:54:36 +10:30
Chinsky	f4dd077d50	Merge pull request #8571 from PsiOmegaDelta/EyeFix ... Fixes #8534.	2015-03-22 21:47:17 +03:00
PsiOmega	767f4dd537	Deletes AI eye along with the AI.	2015-03-22 18:51:15 +01:00
PsiOmega	f9b8c2dbc9	Fixes #8534. ... Sets icontype to its proper value.	2015-03-22 16:25:24 +01:00
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
GinjaNinja32	26d878fb02	Move closing bracket outside <i> tag ... Opening bracket is outside. Consistency!	2015-03-21 21:08:54 +00:00
GinjaNinja32	04640eafb1	Fix issues with skill class procs	2015-03-20 22:47:51 +00:00
Zuhayr	fb52e095d0	Fixes #8543	2015-03-20 12:37:55 +10:30
MrSnapwalk	9463ab028a	Adds Andrewmeythaler's custom item.	2015-03-17 22:19:13 -05:00
Chinsky	d3b202db4d	Merge pull request #8512 from Zuhayr/dev-freeze ... Fixes.	2015-03-17 14:19:59 +03:00
PsiOmega	018bd4ebdd	Merge remote-tracking branch 'upstream/master' into dev-freeze	2015-03-17 12:01:09 +01:00
Zuhayr	92f53d6b80	Fixes #8478	2015-03-17 20:08:46 +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	beaba0b88f	Fixes #8440	2015-03-17 19:35:25 +10:30
Zuhayr	b766f9efcf	Fixes #8378	2015-03-17 19:20:33 +10:30
Zuhayr	7cbe2c94fb	Fixes #8388	2015-03-17 19:19:28 +10:30
Zuhayr	0267f156b5	Fixes #8446	2015-03-17 19:17:36 +10:30
Zuhayr	1f1fe76ec6	Fixes #8495	2015-03-17 19:16:56 +10:30
PsiOmega	cfb3bad3e2	Fixes #8498. ... Simple animals should now die properly when killed.	2015-03-16 13:46:08 +01:00
PsiOmega	172110b582	Merge remote-tracking branch 'upstream/master' into dev-freeze	2015-03-16 12:37:43 +01:00
PsiOmegaDelta	e61494561d	Merge pull request #8460 from comma/master ... Fixes organ bioprinter and the organs.	2015-03-15 02:43:47 +01:00
mwerezak	6c794a8608	Fixes damage multiplier mixup, bumped var not being reset	2015-03-14 02:56:05 -04:00
mwerezak	e6e0c87062	Aggressive grab auto hit only applies to close targets and melee attacks	2015-03-14 01:53:11 -04:00
mwerezak	c4e4c77320	Having a neck grab on someone causes them to be hit by projectiles first instead of you. ... If however the bullet misses or passes through the person being grabbed then it continues on and may still hit the person doing the grabbing.	2015-03-14 01:30:09 -04:00
mwerezak	812ff9869d	Implements projectile point blank damage multipliers for targets being grabbed.	2015-03-14 00:41:55 -04:00
mwerezak	6a5dd6c89e	Aggressive grabs prevent missing with weapons	2015-03-13 21:30:18 -04:00
PsiOmega	14811d35e9	Fixes #8439. ... Appears to be the last of the major re-occuring runtimes. Good work team.	2015-03-13 23:27:35 +01:00
PsiOmega	ac25b0a614	Merge remote-tracking branch 'upstream/master' into dev-freeze	2015-03-13 14:21:38 +01:00
PsiOmega	2efa9c78f0	Corrects pulling icon_states.	2015-03-13 11:02:18 +01:00
Chinsky	f03759a246	Fixes organ bioprinter and the organs. Now less debuggy and less buggy too.	2015-03-13 12:24:27 +03:00
PsiOmega	0cc60870f5	Merge remote-tracking branch 'upstream/master' into dev-freeze	2015-03-13 09:31:03 +01:00
Zuhayr	100ffe4966	Merge pull request #8451 from comma/master ... Fixes #8438	2015-03-13 17:19:36 +10:30
Chinsky	64a94a5043	Fixes #8438 ... Removed spawn based on suggestion, doesn't seem to cause that graphical glitch it was against.	2015-03-12 17:00:53 +03:00
Zuhayr	b5419a1673	Merge pull request #8443 from Baystation12/master ... Master into dev-freeze.	2015-03-11 19:37:19 +10:30
Chinsky	69a080e2d6	Merge pull request #8421 from Neerti/3_9_2015-examine-text-med ... Examine Tab Text: (Some) Medical Stuff	2015-03-11 07:28:54 +03:00