33fe2b5fc7
Makes grab eye attacking respect species lore better
2015-07-14 00:25:53 -04:00
b12d1d4bdd
Refactors spiderbots a little, cleans up some spans, updates them.
2015-07-14 06:56:52 +09:30
5e1ae26b74
Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.
2015-07-14 05:19:01 +09:30
cd380aba24
Removed the last few references to MODE, fixed some oversights with player_is_antag().
2015-07-14 05:19:00 +09:30
9376e33acf
Fixes #10159
2015-07-14 05:19:00 +09:30
7bb9ca6ec2
Fixes #10129
2015-07-14 05:18:58 +09:30
af7c87366e
Fixes #10137
2015-07-14 05:18:57 +09:30
a93adb2710
Fixes #9868
2015-07-13 11:27:15 -04:00
883ce8b7c1
Merge remote-tracking branch 'upstream/dev-freeze' into ert-lights2
2015-07-13 10:46:48 -04:00
e6481d4a2c
Merge pull request #10168 from Kelenius/ofCowsAndTables
...
Fixes #8294
2015-07-13 10:03:38 -04:00
765731f7d5
Fixes #8294
...
Fuck mobcode.
2015-07-13 16:51:46 +03:00
889019b445
Merge pull request #10163 from PsiOmegaDelta/150713-Fixes
...
Fixes
2015-07-13 09:35:58 -04:00
678027d93d
Fixes #10145
2015-07-13 11:01:32 +03:00
f601ba45d6
Fixes #10144 .
...
Fixed depricated type path.
2015-07-13 09:53:21 +02:00
0269d19bef
Borg reagent synths use links in chat and Topic()
2015-07-13 10:28:36 +03:00
0fc12eb22b
Fixes #9927
...
Fixes issues with deca code crates.
2015-07-13 00:45:36 -04:00
ba981f8783
Fixes glasses interfering with species vision modes and cult ghost viewing.
2015-07-12 20:21:38 -04:00
0b2b475be4
Adds lights to ERT shuttle, ERT ready light
...
Fixes #10155
2015-07-12 18:41:24 -04:00
52cc850bf8
Merge pull request #10115 from PsiOmegaDelta/150712-SolidJaunting
...
Wizards can no longer de-jaunt in turfs with dense objects.
2015-07-13 06:14:44 +09:30
79804f663e
Updates borg shaker and hypospray
...
Fixes #6937
Hypospray no longer contains a bunch of reagent holders
2015-07-12 19:50:02 +03:00
b04ed47e2f
Merge pull request #10070 from Mloc/lightwrite-2
...
Lighting overlay changes + optimizations
2015-07-12 15:51:44 +01:00
bd705fb7e0
optimize apply/remove_lum
...
Light sources no longer track applied lumcounts in an assocative list,
using shared-indices with the applied turf list instead.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-12 15:47:17 +01:00
291f0b8556
client optimizations for lighting overlays
...
Removes lighting transitions- they don't work with the new system.
Greyscale overlays now use BLEND_OVERLAY instead of BLEND_MULTIPLY for
better client performance.
Light overlays in total darkness are now made invisible.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-12 15:47:13 +01:00
c6f4f7fcee
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-12 15:14:43 +02:00
7b3759c1f3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/configuration.dm
code/modules/admin/topic.dm
config/example/config.txt
2015-07-12 14:49:31 +02:00
2ed978b1e1
Wizards can no longer de-jaunt in turfs with dense objects.
...
Also fixes an exploit where wizards could cast CentCom restricted spells by hiding inside objects, such as lockers or coffins.
2015-07-12 14:31:26 +02:00
49e9248836
Fixes looking through cameras retaining the sight flags of worn glasses.
2015-07-11 23:27:18 -04:00
680a052136
Fixes check_eye() for AI, pAI, and helm console
...
reset_view() is no longer called every time check_eye() is. Instead it
is called only when the mob's eye should change.
2015-07-11 23:26:57 -04:00
325dfd9852
Merge pull request #10072 from NullSnapshot/adminfeatures
...
[Fast-track] Moderator tempban changes.
2015-07-11 23:21:49 -04:00
7a4ed714d2
Merge pull request #10109 from GinjaNinja32/table
...
Fixes tables not connecting
2015-07-12 09:50:04 +09:30
64da8265a9
Attempts to fix old character save files in a slightly nicer way. Should mean there's no difference with converted characters, but you never know.
2015-07-11 23:24:56 +01:00
3b13199425
Fixes tables not connecting
2015-07-11 23:19:57 +01:00
570c18881d
Merge pull request #10108 from Zuhayr/dev-freeze
...
Fixes #10062 and #10061
2015-07-12 00:14:24 +02:00
c59dc2445c
Fixes #10062 and #10061
2015-07-12 07:04:35 +09:30
796c6c7e42
Teleportation code now ignores dense objects with the ON_BORDER flag.
2015-07-11 17:30:40 +02:00
5b30703d30
Should be the last fixes needed.
2015-07-11 04:22:36 -07:00
8457488755
Re-adds the Clamp defines.
2015-07-11 11:23:55 +02:00
1287ad818a
Ninjas can no longer teleport unto turfs that contain solid objects.
2015-07-11 11:12:08 +02:00
9b4d09c974
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/grenades/emgrenade.dm
code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
339d08b20e
Compilation fix.
2015-07-11 10:51:03 +02:00
5575acccfd
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-11 09:51:24 +02:00
9d2ffa3ffb
Merge pull request #10087 from Loganbacca/turretfixes
...
Fixes - turrets and cargo trains
2015-07-11 08:33:04 +03:00
9dbd06de0d
Merge pull request #10099 from Loganbacca/conveyorfix
...
Fixed dropping modules on conveyor belts
2015-07-10 21:11:50 +01:00
58c3da3970
Merge pull request #10093 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-07-11 03:43:59 +09:30
09f502f8d7
Fixed spriteless item in xenoarch loot drop
2015-07-11 03:38:20 +12:00
8848a51fe8
Fixed dropping modules on conveyor belts
2015-07-11 03:26:41 +12:00
c04fc312e2
Moved trajectory check to during target assessment
2015-07-11 02:47:47 +12:00
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
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
a32b712bae
Merge pull request #10097 from Loganbacca/laserfixes
...
Projectile visual bug fixes
2015-07-10 14:37:04 +02:00
mwerezak