cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-17 19:07:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix fall damage dislocating undislocatable joints (#14276)

Browse Source 
* Fix fall damage dislocating undislocatable joints

* Update code/modules/multiz/movement.dm
This commit is contained in:
Wildkins
2022-06-11 19:33:49 -04:00
committed by GitHub
parent 76d34b9659
commit eb180eb3ab
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_external.dm
+10 -7
View File
@@ -187,19 +187,22 @@
..()
/obj/item/organ/external/proc/dislocate(var/primary)
if(dislocated != -1)
if(primary)
dislocated = 2
else
dislocated = 1
if(dislocated == -1)
return
if(primary)
dislocated = 2
else
dislocated = 1
owner.verbs |= /mob/living/carbon/human/proc/undislocate
if(children && children.len)
for(var/obj/item/organ/external/child in children)
child.dislocate()
/obj/item/organ/external/proc/undislocate()
if(dislocated != -1)
dislocated = 0
if(dislocated == -1)
return
dislocated = 0
if(children && children.len)
for(var/obj/item/organ/external/child in children)
if(child.dislocated == 1)