Loganbacca
6b10b648d2
Implements turret trajectory prediction
...
- Adds trajectory checking for turrets, so they don't burn holes through other objects (like walls and AI's) if they wouldn't hit them anyway.
2015-07-11 02:16:17 +12:00
PsiOmegaDelta
a32b712bae
Merge pull request #10097 from Loganbacca/laserfixes
...
Projectile visual bug fixes
2015-07-10 14:37:04 +02:00
Loganbacca
ce77c61028
Projectile visual bug fixes
...
- Fixed visible beam projectile
- Fixed additional tracers overlaying impact effects
2015-07-11 00:06:44 +12:00
PsiOmegaDelta
6246d3bd9d
Merge pull request #10079 from mwerezak/20150708-droplimb-fixes
...
Droplimb fixes
2015-07-10 11:38:00 +02:00
HarpyEagle
3fd71881a3
Tweak/refactor external organ droplimb mechanics
2015-07-10 00:14:35 -04:00
Zuhayr
fae8a6964e
Merge pull request #10082 from mwerezak/inhand-icon-update
...
Fixes #9976
2015-07-10 13:02:16 +09:30
mwerezak
bb0dea8991
Fixes #9976
...
Deleted items update their loc's inhand overlays if they are in a mob
when GC'd.
2015-07-09 22:55:51 -04:00
mwerezak
cd2604e82d
Fixes droplimb runtime
2015-07-09 22:25:18 -04:00
PsiOmegaDelta
6a8b051b21
Merge pull request #10076 from comma/dev-freeze
...
Fixes #9680
2015-07-09 23:41:42 +02:00
Chinsky
a21ce398ae
Merge pull request #10074 from NullSnapshot/dev-freeze
...
Fix for #8391
2015-07-10 00:28:10 +03:00
Chinsky
d469b3f42d
Fixes #9680
2015-07-10 00:27:16 +03:00
Snapshot
aa97514c4a
Merge pull request #10075 from comma/dev-freeze
...
Couple hacky fixes
2015-07-09 14:25:56 -07:00
GinjaNinja32
34293d2650
Merge pull request #10073 from mwerezak/rcd-balance
...
Fixes mounted RCD balance issues
2015-07-09 22:13:45 +01:00
HarpyEagle
cf88e87434
Fixes mounted RCD balance issues
2015-07-09 16:54:01 -04:00
Null Snapshot
f2e27a8c89
fixes #8391
2015-07-09 13:23:13 -07:00
Chinsky
1993935766
Fixes #9899
2015-07-09 23:17:06 +03:00
Chinsky
5b627cc763
Fixes #9939
2015-07-09 23:07:28 +03:00
Chinsky
c7d9ce4697
Merge pull request #10046 from mwerezak/custom-item-icons
...
Makes custom items use the host item's inhand sprites if none are provided, knife fixes
2015-07-09 20:52:38 +03:00
Chinsky
7d9b7e10f4
Merge pull request #10038 from PsiOmegaDelta/150707-HellUniverseOptimizations
...
Reduced Hell Universe Lag
2015-07-09 20:45:51 +03:00
Chinsky
ff407b5672
Merge pull request #10067 from Zuhayr/dev-freeze
...
More fixes.
2015-07-09 19:52:02 +03:00
Zuhayr
d047311931
Should fix #9895 , hopefully.
2015-07-10 01:21:12 +09:30
Zuhayr
946c445b29
Fixes #9896
2015-07-10 01:14:12 +09:30
Zuhayr
20f93b6009
Fixes #9394
2015-07-10 00:21:17 +09:30
Zuhayr
07bd7ef684
Fixes #9610
2015-07-10 00:06:07 +09:30
Mloc
ffbf547923
Merge pull request #9889 from PJB3005/bay-lights
...
Lighting optimizations + NVG meson fix
2015-07-09 14:50:10 +01:00
GinjaNinja32
05c280ff2d
Merge pull request #10064 from Kelenius/ofVotesAndLinks
...
Fixes #9894
2015-07-09 10:38:03 +01:00
Kelenius
879fc98a8c
Fixes #9894
2015-07-09 11:50:42 +03:00
PsiOmegaDelta
2dc613c4f1
Merge pull request #10063 from Kelenius/ofSlimesAndMonkeys
...
Fixes #9908
2015-07-09 10:50:00 +02:00
Kelenius
12fdb7521a
Fixes #9908
2015-07-09 11:29:49 +03:00
PsiOmegaDelta
3751e1cdbf
Merge pull request #10055 from Zuhayr/dev-freeze
...
Fixes.
2015-07-09 08:35:06 +02:00
PsiOmegaDelta
14acf43646
Merge pull request #10059 from Baystation12/master
...
Dev-freeze
2015-07-09 08:34:43 +02:00
Chinsky
5812622524
Merge pull request #10057 from Zuhayr/observerfix
...
Emergency workaround for the observer heresy.
2015-07-09 04:36:07 +03:00
Zuhayr
9d02b41ae7
Emergency workaround for the observer bug.
2015-07-09 11:01:42 +09:30
PsiOmegaDelta
191832bf06
Merge pull request #10056 from atlantiscze/i-feel-pain-too
...
Fixes #9965
2015-07-08 22:28:17 +02:00
Atlantis
e37503dedb
Fixes #9965
...
- Hardsuit injectors now only work on carbon-based mobs. This prevents injecting of AIs, Robots and other silicon-based mobs.
2015-07-08 21:44:04 +02:00
HarpyEagle
f23c2d5e00
Fixes droplimb wound not handling damage type
2015-07-08 15:17:50 -04:00
Zuhayr
e4fdf84ef7
Fixes #10054 , fixes some mushroom issues.
2015-07-09 04:25:36 +09:30
Zuhayr
d47c2c8a02
Fixes #10013
2015-07-09 04:05:40 +09:30
Zuhayr
550ea5f127
Fixes #9740
2015-07-09 03:40:26 +09:30
Zuhayr
76571bf758
Fixes #9646
2015-07-09 03:29:24 +09:30
PsiOmegaDelta
c1a601477b
Merge pull request #10051 from Ccomp5950/admin_fix
...
Admins will no longer see stars when viewing faxes.
2015-07-08 17:21:51 +02:00
ccomp5950
0f764d8779
Admins will no longer see stars when viewing faxes.
...
If an admin wasn't human / ghosting / or a silicon mob they would see garbled text.
This uses the "force view" setting to 1 bypassing the check.
Fixes #10050
2015-07-08 10:47:22 -04:00
PsiOmegaDelta
2de04f110d
Merge pull request #10048 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-07-08 09:10:42 +02:00
PsiOmegaDelta
f1a790f162
Fixes duplicate var definition.
2015-07-08 09:05:55 +02:00
PsiOmegaDelta
16abe8148a
Relocates drone law update to the new law set location.
2015-07-08 08:58:38 +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
GinjaNinja32
f4e70a3426
Merge pull request #10047 from Zuhayr/xenohydrofix
...
Fixes an issue with plants.
2015-07-08 07:45:01 +01:00
Zuhayr
89f93d4aac
Fixes an issue with plants.
2015-07-08 16:08:59 +09:30
mwerezak
8957412826
Custom items default to the inhands of the parent
...
Makes custom items use the inhand states and icons of the parent item
type if inhand states are not present in CUSTOM_ITEM_MOB.
Makes item_icons take precedence over icon_override for inhands only.
2015-07-08 01:39:02 -04:00
mwerezak
01104eda45
Fixes utensil force dividers.
...
Fixes utensil knives deal more damage than a chopping knife, and spoons being a potentially deadly weapon.
2015-07-08 01:37:07 -04:00
