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

5611 Commits

Author SHA1 Message Date
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
07bd7ef684 Fixes #9610 2015-07-10 00:06:07 +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
Kelenius
12fdb7521a Fixes #9908 2015-07-09 11:29:49 +03:00
PsiOmegaDelta
3751e1cdbf Merge pull request #10055 from Zuhayr/dev-freeze 
Fixes.
 2015-07-09 08:35:06 +02:00
PsiOmegaDelta
14acf43646 Merge pull request #10059 from Baystation12/master 
Dev-freeze
 2015-07-09 08:34:43 +02:00
Zuhayr
9d02b41ae7 Emergency workaround for the observer bug. 2015-07-09 11:01:42 +09:30
Zuhayr
e4fdf84ef7 Fixes #10054, fixes some mushroom issues. 2015-07-09 04:25:36 +09:30
mwerezak
8957412826 Custom items default to the inhands of the parent 
Makes custom items use the inhand states and icons of the parent item
type if inhand states are not present in CUSTOM_ITEM_MOB.
Makes item_icons take precedence over icon_override for inhands only.
 2015-07-08 01:39:02 -04:00
PsiOmegaDelta
0a4131e9dc Reduced Hell Universe Lag 
Based on https://github.com/d3athrow/vgstation13/pull/5273.
 2015-07-07 12:55:39 +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
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
PsiOmegaDelta
fb60cfde4c Rejuvenation now clears chemicals in mobs. 
Fixes #9921.
 2015-07-03 16:41:10 +02:00
GinjaNinja32
88b9787ac4 Merge pull request #9991 from PsiOmegaDelta/150702-MyHandYourPocket 
Fixes #9986.
 2015-07-02 13:55:27 +01:00
GinjaNinja32
a2e66b4095 Merge pull request #9989 from PsiOmegaDelta/150702-St-St-StutteringFi-Fi-Fix 
Speech impediment fixes.
 2015-07-02 13:54:16 +01:00
Zuhayr
de39dbd1bb Merge pull request #9973 from PsiOmegaDelta/150630-SinglePortableUnit 
Portable turret changes.
 2015-07-02 18:36:13 +09:30
PsiOmegaDelta
db1135169d Fixes #9986. 
A simple matter of a missing return line.
 2015-07-02 10:43:22 +02:00
PsiOmegaDelta
a98c4a2c8e Speech impediment fixes. 
Fixes #9987.
Removes unnecessary speech problem flag check.
Removes unnecessary changeling language check. Hivemind languages are excluded from speech problems already.
 2015-07-02 10:04:08 +02:00
PsiOmegaDelta
977ed13e14 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
 2015-07-01 22:35:00 +02:00
PsiOmega
15c165f4e5 Fixes #7042. 
Fixes issues with the AI centering on its core whenever it's attached to machinery.
Previously fixed on dev-freeze.
 2015-06-30 20:09:10 +02:00
PsiOmegaDelta
a76c915e2e Adds missing changelog icon to the client pre-fetch. 2015-06-30 15:13:28 +02:00
PsiOmegaDelta
001d4839f1 Fixes missing assessment check. 2015-06-30 15:03:51 +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
PsiOmega
7e33beab0f Fixes drone runtime. 
Spawning drones no longer cause runtimes. Fixes #9909.
 2015-06-28 19:02:23 +02:00
Chinsky
9cfd04f959 Merge pull request #9952 from mwerezak/camera-console-fix 
Fixes #7910
 2015-06-28 19:42:00 +03:00
mwerezak
4062f81f20 Fixes #7910 
Partial port from vgstation.

Notable differences:
handle_regular_hud_updates() is called anytime view is reset, instead of
just from the cancel camera verb.  check_eye() now returns the vision
flags to be set on the viewer.  Moved cameraFollow to silicon. Camera
consoles now call reset_view explicitly when they want to change a mob's
view, instead of leaving it as a side effect of check_eye()
 2015-06-28 11:59:19 -04:00
Zuhayr
411987c68b Merge resolution with master. 2015-06-28 06:02:52 +09:30
GinjaNinja32
3c3d6f3497 Un-breaks hats, semi-fixes #9873, partially reverts #9937 2015-06-27 08:59:27 +01:00
PsiOmega
6c891406f9 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/update_icons.dm
	code/setup.dm
 2015-06-26 19:22:31 +02:00
PsiOmegaDelta
8fef02501c Merge pull request #9936 from mwerezak/fire 
Balances fire to work better with very low concentration phoron gas burning
 2015-06-26 13:34:21 +02:00
mwerezak
1b978f9570 Makes update_inv_head() respect item_state and item_icons 
Fixes #9873
 2015-06-26 01:34:15 -04:00
mwerezak
56065022a7 Updates fire_act() implementations to work better with lower temperature fires 
In some cases fire_act() wasn't even checking the applied temperature. Reworks how fire damages flooring.
 2015-06-26 00:40:55 -04:00
mwerezak
9d7a1b9ad6 Fixes misleading path and proc name 2015-06-26 00:40:31 -04:00
Chinsky
265b1d5b51 Fixes #9913 
Also axes hidden var in lieu of using implants like other foreign objects. Now instead of one object, amount of stuff you can put in someone's organ is restricted by stuff's combined w_class.
 2015-06-25 23:51:58 +03:00
Chinsky
9d03286b6c Added yet another special snowflake check for assistants so they'd get properly dressed on preview icon. 2015-06-25 23:04:33 +03:00
Chinsky
e6b4cecf50 Fixes #9519 
Now client can't escape the resetting!
 2015-06-25 21:09:51 +03:00
PJB3005
c48ffa8d63 Lighting optimizations + meson fix 2015-06-23 17:46:11 +02:00
Chinsky
8bb0f7496e Merge pull request #9900 from mwerezak/extinguisher 
Changelog, fire patting
 2015-06-23 06:46:34 +03:00
mwerezak
4961efec0f Adjusts patting to account for shorter timeout 2015-06-22 22:17:30 -04:00
GinjaNinja32
9c32851ba5 Merge pull request #9871 from mwerezak/extinguisher 
Fire Extinguishers
 2015-06-22 15:36:55 +01:00
GinjaNinja32
7f319f528a Merge pull request #9875 from Zuhayr/dev-freeze 
Antag system fixes
 2015-06-21 12:07:50 +01:00
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmegaDelta
9426d0844c Merge pull request #9872 from mwerezak/earslot 
Fixes #9514
 2015-06-21 09:03:00 +02:00
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
mwerezak
a4fb9fbb51 Patting out flames is no longer extremely effective 2015-06-21 00:44:14 -04:00
PsiOmegaDelta
4a5da7221c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/resist.dm
 2015-06-20 20:24:05 +02:00
PsiOmegaDelta
33dc2e5811 Merge pull request #9867 from Zuhayr/dev-freeze 
More fixes
 2015-06-20 19:05:32 +02:00
Zuhayr
6fff0069db Fixes # #8327 2015-06-21 01:48:15 +09:30
Zuhayr
7c1696c3c8 Fixes #9435 2015-06-21 01:27:23 +09:30