Commit Graph

10347 Commits

Author SHA1 Message Date
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
PsiOmega
21407e5be6 Fixes #10128.
Lawyers can now access security records.
2015-07-13 09:53:42 +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
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
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
c59dc2445c Fixes #10062 and #10061 2015-07-12 07:04:35 +09:30
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
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
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
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
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
Iamgoofball
32a5582215 Fixes #10085 (probably)
if this doesn't fix it then ????
2015-07-10 02:32:35 -07:00
mwerezak
a36844cf84 Adds inhand sprites for the flash 2015-07-10 00:27:33 -04:00
mwerezak
8c4cc815ff Adds the ability to draw arrows with crayon 2015-07-09 23:35:06 -04:00
Zuhayr
fae8a6964e Merge pull request #10082 from mwerezak/inhand-icon-update
Fixes #9976
2015-07-10 13:02:16 +09:30
Zuhayr
eee306aedd Merge pull request #10083 from mwerezak/capgun-icon
Fixes #9984
2015-07-10 13:02:10 +09:30
mwerezak
6fb6237816 Fixes #9984
Fixes capgun and dart crossbow inhands.
2015-07-09 23:00:22 -04:00
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
Snapshot
aa97514c4a Merge pull request #10075 from comma/dev-freeze
Couple hacky fixes
2015-07-09 14:25:56 -07:00
HarpyEagle
cf88e87434 Fixes mounted RCD balance issues 2015-07-09 16:54:01 -04:00
Chinsky
1993935766 Fixes #9899 2015-07-09 23:17:06 +03:00
Null Snapshot
dcaa8289a1 Fix for missed if(A | B) else if (b) check. 2015-07-09 12:26:11 -07:00
Null Snapshot
a28d3cd9d1 Added new config variables for toggling moderator tempban permissions and maximum duration for bans. 2015-07-09 12:10:18 -07:00
Mloc
278a4c38ec get rid of mob.see_in_dark and species.darksight
They don't work with the current lighting system and cause weird artifacts.

Signed-off-by: Mloc <colmohici@gmail.com>
2015-07-09 19:17:04 +01: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
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
GinjaNinja32
f3d09e092e Removes the approximations cheap_pythag and cheap_hypotenuse, since they're anything *but* cheap 2015-07-09 16:25:47 +01:00
Zuhayr
20f93b6009 Fixes #9394 2015-07-10 00:21:17 +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
PsiOmegaDelta
df83203356 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/hydroponics/seed_mobs.dm
	code/modules/materials/materials.dm
2015-07-09 08:45:49 +02:00
Zuhayr
d47c2c8a02 Fixes #10013 2015-07-09 04:05:40 +09:30
mwerezak
471ee6a763 Updates to job economic modifiers 2015-07-08 01:54:08 -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
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
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
PsiOmega
cee5f1a057 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items.dm
2015-07-06 18:33:09 +02:00