cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,396 Commits 6 Branches 0 Tags
7af63ede5a5bf8f5f6008b9fcc6cc2d3eb71b5ca
Commit Graph

11521 Commits

Author SHA1 Message Date
mwerezak
7af63ede5a 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.
 2015-07-04 10:40:44 -04: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
PsiOmegaDelta
b482c5c07d Merge pull request #9958 from GinjaNinja32/botfix 
(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly
 2015-06-28 12:48:54 +02:00
GinjaNinja32
9a9f8e5563 (probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly 2015-06-28 11:43:53 +01: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
GinjaNinja32
98572db1a0 Merge pull request #9940 from atlantiscze/connection_estabilished 
Fixes #9929
 2015-06-26 19:24:24 +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
Atlantis
90f08d3fa7 Fixes #9929 
- Adds missing connect_to_network() and disconnect_from_network() into TEG wrenching code.
 2015-06-26 18:22:59 +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
Chinsky
ed779b7ff9 Merge pull request #9937 from mwerezak/master-fixes 
Fixes
 2015-06-26 09:19:48 +03:00
mwerezak
c6c200c127 Fixes #9251 2015-06-26 01:38:04 -04:00
mwerezak
1b978f9570 Makes update_inv_head() respect item_state and item_icons 
Fixes #9873
 2015-06-26 01:34:15 -04:00
mwerezak
aae29d8b6e Adds 'melting' and ignition points for various materials 2015-06-26 00:41:19 -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
GinjaNinja32
5906ae7556 Adds 'age' command to world.Topic, for the IRC bot. Also runs all keys through ckey() before using them, to avoid easily-fixed errors 2015-06-25 22:52:36 +01:00
Chinsky
78784a3d9a Fixes #9933 
Also potential same issue with other scalpel subtypes.
 2015-06-25 23:59:12 +03: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
GinjaNinja32
d722dfa420 Merge pull request #9911 from mwerezak/disposal 
Disposals fixes
 2015-06-25 06:14:00 +01:00
mwerezak
51eecd54f0 Fixes disposal bins filling instantly 
Fixes disposal bins filling instantly, side effect of fixing
air_contents having the wrong volume
 2015-06-24 22:09:47 -04:00
mwerezak
cb0b3a30da Fixes runtime 
Fixes the other runtime in #9310
 2015-06-24 00:13:41 -04:00
mwerezak
a147a4e15e Removes fat mutation checks 2015-06-23 23:36:19 -04:00
mwerezak
285ce84044 Fixes disposals not transferring gas to holder, creating air_contents with the wrong volume, runtime due to terrible management of shared gas_mix 
Fixes one of the runtimes in #9310
 2015-06-23 23:32:27 -04: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
Zuhayr
aa2e25928d Fixes a runtime with organ Destroy() called with nonhuman owner. 2015-06-22 22:03:24 +09:30
PsiOmega
60f6a2ea10 Fixes antags being able to see the appearance changer. 
Sets invisibility level to MAXIMUM.
 2015-06-21 21:12:28 +02:00
GinjaNinja32
e3cf4692b5 Merge pull request #9879 from PsiOmegaDelta/150621-BoldChanges 
Fixes the Changelog menu button.
 2015-06-21 13:16:18 +01:00
PsiOmegaDelta
1a6ea56194 Fixes the Changelog menu button. 
It had lost the ability to go bold upon detected unread changelog entries.
 2015-06-21 13:39:26 +02:00
GinjaNinja32
7f319f528a Merge pull request #9875 from Zuhayr/dev-freeze 
Antag system fixes
 2015-06-21 12:07:50 +01:00
Zuhayr
d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmegaDelta
3d572ccc27 Merge pull request #9874 from mwerezak/fixes 
Dev-freeze Fixes
 2015-06-21 09:04:08 +02:00
PsiOmegaDelta
9426d0844c Merge pull request #9872 from mwerezak/earslot 
Fixes #9514
 2015-06-21 09:03:00 +02:00
mwerezak
80c80abe3a Fixes #9511 2015-06-21 03:00:37 -04: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
mwerezak
6a8aeb0153 Makes fire extinguishers effective at putting out mob fires 
Doubles the amount of water extinguishers carry and quadruples the
amount of water sprayed with each use. Halves the damage taken by slimes
when exposed to water to compensate.

Also refactors chair propelling a bit.
 2015-06-21 00:43:15 -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
Zuhayr
f371da4ae9 Merge pull request #9838 from mwerezak/stunrevolver 
Assorted small dev-freeze tweaks, stunrevolver fix
 2015-06-21 01:16:58 +09:30