cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ghettoChutes

Browse Source
This commit is contained in:
Anewbe
2018-02-05 00:53:33 -06:00
parent 67e22cf0a6 7ada0973ee
commit 3e31b6678f
40 changed files with 1000 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/organs/organ_external.dm
View File

@@ -193,9 +193,9 @@
dislocated = 1
if(owner)
owner.verbs |= /mob/living/carbon/human/proc/undislocate
owner.verbs |= /mob/living/carbon/human/proc/relocate
/obj/item/organ/external/proc/undislocate()
/obj/item/organ/external/proc/relocate()
if(dislocated == -1)
return
@@ -207,7 +207,7 @@
for(var/obj/item/organ/external/limb in owner.organs)
if(limb.dislocated == 1)
return
owner.verbs -= /mob/living/carbon/human/proc/undislocate
owner.verbs -= /mob/living/carbon/human/proc/relocate
/obj/item/organ/external/update_health()
damage = min(max_damage, (brute_dam + burn_dam))