PsiOmegaDelta
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +02:00
PsiOmegaDelta
8da7141af1
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-07-14 08:11:11 +02:00
Zuhayr
b12d1d4bdd
Refactors spiderbots a little, cleans up some spans, updates them.
2015-07-14 06:56:52 +09:30
Zuhayr
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
Zuhayr
cd380aba24
Removed the last few references to MODE, fixed some oversights with player_is_antag().
2015-07-14 05:19:00 +09:30
Zuhayr
9376e33acf
Fixes #10159
2015-07-14 05:19:00 +09:30
Zuhayr
7bb9ca6ec2
Fixes #10129
2015-07-14 05:18:58 +09:30
Zuhayr
af7c87366e
Fixes #10137
2015-07-14 05:18:57 +09:30
Ccomp5950
e6481d4a2c
Merge pull request #10168 from Kelenius/ofCowsAndTables
...
Fixes #8294
2015-07-13 10:03:38 -04:00
Kelenius
765731f7d5
Fixes #8294
...
Fuck mobcode.
2015-07-13 16:51:46 +03:00
Ccomp5950
889019b445
Merge pull request #10163 from PsiOmegaDelta/150713-Fixes
...
Fixes
2015-07-13 09:35:58 -04:00
Kelenius
678027d93d
Fixes #10145
2015-07-13 11:01:32 +03:00
PsiOmega
f601ba45d6
Fixes #10144 .
...
Fixed depricated type path.
2015-07-13 09:53:21 +02:00
mwerezak
0fc12eb22b
Fixes #9927
...
Fixes issues with deca code crates.
2015-07-13 00:45:36 -04:00
Zuhayr
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
GinjaNinja32
b04ed47e2f
Merge pull request #10070 from Mloc/lightwrite-2
...
Lighting overlay changes + optimizations
2015-07-12 15:51:44 +01:00
Mloc
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
Mloc
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
PsiOmegaDelta
c6f4f7fcee
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-12 15:14:43 +02:00
PsiOmegaDelta
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
PsiOmegaDelta
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
Ccomp5950
325dfd9852
Merge pull request #10072 from NullSnapshot/adminfeatures
...
[Fast-track] Moderator tempban changes.
2015-07-11 23:21:49 -04:00
Zuhayr
7a4ed714d2
Merge pull request #10109 from GinjaNinja32/table
...
Fixes tables not connecting
2015-07-12 09:50:04 +09:30
GinjaNinja32
3b13199425
Fixes tables not connecting
2015-07-11 23:19:57 +01:00
PsiOmegaDelta
570c18881d
Merge pull request #10108 from Zuhayr/dev-freeze
...
Fixes #10062 and #10061
2015-07-12 00:14:24 +02:00
Zuhayr
c59dc2445c
Fixes #10062 and #10061
2015-07-12 07:04:35 +09:30
PsiOmegaDelta
796c6c7e42
Teleportation code now ignores dense objects with the ON_BORDER flag.
2015-07-11 17:30:40 +02:00
Null Snapshot
5b30703d30
Should be the last fixes needed.
2015-07-11 04:22:36 -07:00
PsiOmegaDelta
8457488755
Re-adds the Clamp defines.
2015-07-11 11:23:55 +02:00
PsiOmegaDelta
1287ad818a
Ninjas can no longer teleport unto turfs that contain solid objects.
2015-07-11 11:12:08 +02:00
PsiOmegaDelta
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
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
Null Snapshot
168f823c35
Fixed up the things pointed out by Ccomp5950.
2015-07-09 22:19:05 -07: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
