Commit Graph

19284 Commits

Author SHA1 Message Date
LightningIron
1e1b741ef9 Fixes #9546. 2015-07-13 20:42:40 -05:00
HarpyEagle
e0f89532e0 Fixes #10078 2015-07-13 11:08:58 -04:00
Ccomp5950
9990fb05be Merge pull request #10167 from PsiOmegaDelta/150713-MorgueTrays
Fixes #10143.
2015-07-13 09:40:20 -04:00
Ccomp5950
889019b445 Merge pull request #10163 from PsiOmegaDelta/150713-Fixes
Fixes
2015-07-13 09:35:58 -04:00
PsiOmega
e11ffcdfc9 Fixes #10143.
Morgue/crematorium trays should now garbage collect properly.
2015-07-13 15:06:02 +02:00
Kelenius
e8bc544a92 Fixes #10150 2015-07-13 11:44:47 +03:00
PsiOmega
64cda4aa5a Destroyed items now use drop_from_inventory instead of unEquip. Reduces the risk of references being kept in case of held items. 2015-07-13 10:20:46 +02:00
PsiOmega
9ba21f3079 Tried to resolve ID cards not GCing properly. Sorted some awful : uses instead. 2015-07-13 10:18:08 +02:00
PsiOmega
750c3f9e66 Puts the world end handling inside a spawn instead of sleep. 2015-07-13 10:13:45 +02:00
Kelenius
678027d93d Fixes #10145 2015-07-13 11:01:32 +03:00
PsiOmega
21407e5be6 Fixes #10128.
Lawyers can now access security records.
2015-07-13 09:53:42 +02:00
PsiOmega
f601ba45d6 Fixes #10144.
Fixed depricated type path.
2015-07-13 09:53:21 +02: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
Chinsky
dabdbf529c Fixes several jobs not spawning with their prefered lootbag.
Added a proc that spawns it for those jobs that didn't put a bag on in their 'equip' proc. There's just too many of those to move thme out in override for that proc and some jobs (like miners) depend on knowing if bag is there or not. It won't spawn second bag if first one is there anyway.
2015-07-12 19:29:29 +03:00
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
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
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
Loganbacca
7a82e1c563 Fixed turrets accidentally killing the AI 2015-07-11 13:31:28 +12:00
GinjaNinja32
c24f8f3452 Merge pull request #10088 from mwerezak/inhand-overlays2
Ports grenade and flash in-hand sprites
2015-07-10 21:12:11 +01: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
mwerezak
fb1eeae640 Adds inhand sprites for grenades
Adds inhand sprites for generic grenades, flashbang, and emp grenade.

Conflicts:
	code/game/objects/items/weapons/grenades/emgrenade.dm
2015-07-10 11:00:29 -04: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
mwerezak
a36844cf84 Adds inhand sprites for the flash 2015-07-10 00:27:33 -04: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