cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into deaddoll

Browse Source 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
This commit is contained in:
Chinsky
2015-05-12 06:04:22 +03:00
parent 29823e3552 dcdc0a4862
commit 5c8ceae2fa
893 changed files with 28919 additions and 26318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/client/preferences.dm
View File

@@ -1447,7 +1447,7 @@ datum/preferences
rlimb_data[limb] = choice
organ_data[limb] = "cyborg"
if(second_limb)
organ_data[second_limb] = choice
rlimb_data[second_limb] = choice
organ_data[second_limb] = "cyborg"
if(third_limb && organ_data[third_limb] == "amputated")
organ_data[third_limb] = null