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

10023 Commits

Author SHA1 Message Date
Zuhayr
c59dc2445c Fixes #10062 and #10061 2015-07-12 07:04:35 +09:30
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
mwerezak
a36844cf84 Adds inhand sprites for the flash 2015-07-10 00:27:33 -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
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
Zuhayr
d47c2c8a02 Fixes #10013 2015-07-09 04:05:40 +09:30
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
cdb4270f48 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-06 17:31:41 +02:00
Zuhayr
2129bf6c2e Merge pull request #10014 from mwerezak/raider-gear 
Fixes issues with equipping raiders, raider gun type
 2015-07-06 05:48:25 +09:30
Chinsky
c5eb043a46 Merge pull request #9998 from Kearel/trayFix 
Fixing Tray Bug
 2015-07-05 20:10:26 +03:00
mwerezak
1abb52532d Merge branch 'atmosfix' into airlockfix 2015-07-05 01:20:33 -04:00
mwerezak
c46f32e8d7 Airlock controller fixes 
Fixes airlocks opening their doors before the pumps have turned off.
Fixes airlocks getting confused if you mash buttons in quick succession.
 2015-07-04 23:49:54 -04:00
mwerezak
c1bbc5c3a6 Fixes issues with raider equipping 
Fixes raiders not being able to ever spawn with guns that cannot be equipped to the belt, despite those gun types being in the raider_guns list.
Fixes raiders spawning with guns for which they have no ammo.
Fixes taj/unathi raiders having a 2/3 chance of spawning without any shoes.
 2015-07-04 16:32:35 -04:00
mwerezak
fad0a712d8 Expands raider gear list 2015-07-04 15:39:31 -04:00
PJB3005
aa30a12125 Fixes another bug 2015-07-04 17:55:41 +02:00
mwerezak
b7ee6e11fc Swaps force divisors between kitchen knives and utensil knives. 
Because why does the utensil deal more damage than a chopping knife?
 2015-07-03 22:02:28 -04:00
mwerezak
b2d3711c11 Fixes knife inhand states 2015-07-03 21:58:11 -04:00
Kearel
9a6391747d fix trays 
Puts pikcup proc before loc is changed.
 2015-07-02 13:55:27 -05:00
Zuhayr
de39dbd1bb Merge pull request #9973 from PsiOmegaDelta/150630-SinglePortableUnit 
Portable turret changes.
 2015-07-02 18:36:13 +09:30
PsiOmegaDelta
791b9eb27d Merge pull request #9981 from Zuhayr/antioxidant 
Removes the RUST engine.
 2015-07-01 08:31:14 +02:00
Zuhayr
8ab80b7394 Removes the RUST engine. 2015-07-01 15:50:55 +09:30
PsiOmega
ba630d2556 Portable turret feedback changes. 2015-06-30 16:28:00 +02:00
PsiOmegaDelta
d827e41bdf Replaces the portable turrets on Crescent with the clean presets. 2015-06-30 15:51:26 +02:00
PsiOmegaDelta
a76c915e2e Adds missing changelog icon to the client pre-fetch. 2015-06-30 15:13:28 +02:00
PsiOmegaDelta
b7bdd4b583 Create Crescent/ERT portable turret presets. 2015-06-30 15:08:29 +02:00
PsiOmegaDelta
001d4839f1 Fixes missing assessment check. 2015-06-30 15:03:51 +02:00
PsiOmegaDelta
beaaaa9f8a Portable turrets are now (more or less) a single entity 2015-06-30 14:52:37 +02:00
PsiOmegaDelta
0624fced64 Compilation.. fix and ensuring the Thunderdome isn't a dark pit. 2015-06-30 08:46:32 +02:00
PsiOmegaDelta
cf10dc38b1 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm
 2015-06-30 08:24:43 +02:00