cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,547 Commits 10 Branches 0 Tags
c59dc2445c20eab49d8880de94d88dc361e13c04
Commit Graph

25547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zuhayr
c59dc2445c Fixes #10062 and #10061 2015-07-12 07:04:35 +09:30
PsiOmegaDelta
ef7d13c3dd Merge pull request #10102 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-07-11 10:55:01 +02:00
PsiOmegaDelta
339d08b20e Compilation fix. 2015-07-11 10:51:03 +02:00
PsiOmegaDelta
47ced1df13 Changelog update. 2015-07-11 09:51:58 +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
511a119695 Merge pull request #10096 from PsiOmegaDelta/TravisDevFreeze 
Attempts to utilize Travis' new container-based infrastructure.
 2015-07-11 04:11:00 +09:30
Zuhayr
58c3da3970 Merge pull request #10093 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-07-11 03:43:59 +09:30
PsiOmegaDelta
312859dbfe Attempts to utilize Travis' new container-based infrastructure. 
http://docs.travis-ci.com/user/migrating-from-legacy/
 2015-07-10 19:38:47 +02:00
Ccomp5950
74f93abf22 Merge pull request #10098 from Loganbacca/xenoarch 
Xenoarch fix
 2015-07-10 13:33:35 -04:00
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
f023069ab2 Changelog 2015-07-10 11:00:33 -04: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
f30fa4b4be Changelog 2015-07-11 02:16:17 +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
dd231d4f2e Changelog update. 2015-07-10 12:58:05 +02: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
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
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
mwerezak
cd2604e82d Fixes droplimb runtime 2015-07-09 22:25:18 -04:00
Chinsky
06c5e019ff Merge pull request #10077 from mwerezak/infection-rate-fix 
Fixes virus infectionchance oversight
 2015-07-10 00:42:05 +03: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
Snapshot
aa97514c4a Merge pull request #10075 from comma/dev-freeze 
Couple hacky fixes
 2015-07-09 14:25:56 -07:00
GinjaNinja32
34293d2650 Merge pull request #10073 from mwerezak/rcd-balance 
Fixes mounted RCD balance issues
 2015-07-09 22:13:45 +01:00
HarpyEagle
cf88e87434 Fixes mounted RCD balance issues 2015-07-09 16:54:01 -04:00
Null Snapshot
f2e27a8c89 fixes #8391 2015-07-09 13:23:13 -07:00
Chinsky
1993935766 Fixes #9899 2015-07-09 23:17:06 +03: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
Chinsky
ff407b5672 Merge pull request #10067 from Zuhayr/dev-freeze 
More fixes.
 2015-07-09 19:52:02 +03:00
Chinsky
4594294cf3 Merge pull request #10066 from GinjaNinja32/cheap_pythag_is_not_cheap 
Removes the approximations cheap_pythag and cheap_hypotenuse
 2015-07-09 19:52:00 +03:00