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

fixes robo- and amputated limbs not working on spawn

Browse Source 
i pulled in some patches from upstream today, then my players reported
robotic and amputated limbs are not appearing on spawn.
not exactly sure what happened here, but it looks like
somebody tried to fix one issue and created a bigger one.
organs are never in both organs_by_name and internal_organs_by_name,
so the flag setters became unreachable due to "if(!I || !O) continue"
This commit is contained in:
Walter0o
2014-11-04 20:33:43 +01:00
parent 6ec12a0037
commit 3c1780a301
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1576,25 +1576,23 @@ datum/preferences
// Destroy/cyborgize organs
for(var/name in organ_data)
var/datum/organ/external/O = character.organs_by_name[name]
var/datum/organ/internal/I = character.internal_organs_by_name[name]
var/status = organ_data[name]
if(!I || !O)
continue
if(status == "amputated")
O.amputated = 1
O.status |= ORGAN_DESTROYED
O.destspawn = 1
if(status == "cyborg")
O.status |= ORGAN_ROBOT
if(status == "assisted")
I.mechassist()
else if(status == "mechanical")
I.mechanize()
else continue
var/status = organ_data[name]
var/datum/organ/external/O = character.organs_by_name[name]
if(O)
if(status == "amputated")
O.amputated = 1
O.status |= ORGAN_DESTROYED
O.destspawn = 1
else if(status == "cyborg")
O.status |= ORGAN_ROBOT
else
var/datum/organ/internal/I = character.internal_organs_by_name[name]
if(I)
if(status == "assisted")
I.mechassist()
else if(status == "mechanical")
I.mechanize()
if(underwear > underwear_m.len || underwear < 1)
underwear = 0 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me. //HAH NOW NO MORE MAGIC CLONING UNDIES