PsiOmegaDelta
1287ad818a
Ninjas can no longer teleport unto turfs that contain solid objects.
2015-07-11 11:12:08 +02:00
PsiOmegaDelta
339d08b20e
Compilation fix.
2015-07-11 10:51:03 +02:00
PsiOmegaDelta
5575acccfd
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-11 09:51:24 +02:00
Chinsky
9d2ffa3ffb
Merge pull request #10087 from Loganbacca/turretfixes
...
Fixes - turrets and cargo trains
2015-07-11 08:33:04 +03:00
GinjaNinja32
9dbd06de0d
Merge pull request #10099 from Loganbacca/conveyorfix
...
Fixed dropping modules on conveyor belts
2015-07-10 21:11:50 +01:00
Zuhayr
58c3da3970
Merge pull request #10093 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-07-11 03:43:59 +09:30
Loganbacca
09f502f8d7
Fixed spriteless item in xenoarch loot drop
2015-07-11 03:38:20 +12:00
Loganbacca
8848a51fe8
Fixed dropping modules on conveyor belts
2015-07-11 03:26:41 +12:00
Loganbacca
c04fc312e2
Moved trajectory check to during target assessment
2015-07-11 02:47:47 +12:00
Loganbacca
ba7e3ae9e8
Cargo train vs projectiles
...
If a cargo train has a mob riding it, there is a chance the mob will be hit by the projectile instead.
2015-07-11 02:16:17 +12:00
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
265802d270
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/_DynamicAreaLighting_TG.dm
code/game/objects/effects/chem/chemsmoke.dm
code/game/objects/explosion.dm
2015-07-10 12:57:46 +02:00
PsiOmegaDelta
6246d3bd9d
Merge pull request #10079 from mwerezak/20150708-droplimb-fixes
...
Droplimb fixes
2015-07-10 11:38:00 +02:00
PsiOmegaDelta
e0ed7c3e69
Merge pull request #10089 from mwerezak/infection-fix
...
Fixes a couple more virus oversights/bugs
2015-07-10 11:37:50 +02:00
mwerezak
d1b15fc601
Fixes a couple more virus oversights/bugs
...
Fixes contact viruses spreading through windows, fixes bad copypasta in
infection_spreading_check()
2015-07-10 01:02:16 -04:00
HarpyEagle
3fd71881a3
Tweak/refactor external organ droplimb mechanics
2015-07-10 00:14:35 -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
HarpyEagle
5011f9b806
Fixes virus infectionchance oversight
...
Fixes oversight in minormutate() that would cause viruses to become
extremely infectious after spreading to another person.
2015-07-09 17:26:15 -04:00
Null Snapshot
f2e27a8c89
fixes #8391
2015-07-09 13:23:13 -07: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
Zuhayr
946c445b29
Fixes #9896
2015-07-10 01:14:12 +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
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
Zuhayr
9d02b41ae7
Emergency workaround for the observer bug.
2015-07-09 11:01:42 +09:30
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
550ea5f127
Fixes #9740
2015-07-09 03:40:26 +09:30
Zuhayr
76571bf758
Fixes #9646
2015-07-09 03:29:24 +09:30
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
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
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
Zuhayr
b8623859b0
Merge pull request #10029 from mwerezak/vines
...
Stops sampling from being a means of fighting vines
2015-07-08 05:50:22 +09:30
PsiOmegaDelta
ed5a12c2a2
Revert "[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes"
2015-07-07 17:14:42 +02:00
PsiOmegaDelta
0a4131e9dc
Reduced Hell Universe Lag
...
Based on https://github.com/d3athrow/vgstation13/pull/5273 .
2015-07-07 12:55:39 +02:00
Chinsky
64fba0e4d5
Merge pull request #10023 from PsiOmegaDelta/150705-NoClientQdel
...
Removes a qdel(client) call.
2015-07-07 07:54:10 +03:00
PsiOmegaDelta
62017e7af2
Merge pull request #10008 from mwerezak/custom-item-icons
...
[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes
2015-07-07 06:44:10 +02:00
