From 1999fc2a2a9a5868db13d29b828877b0a41efb2f Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sat, 3 Feb 2018 23:45:50 -0500 Subject: [PATCH] Changes 'undislocate' to 'relocate' (#4650) * Chaning undislocate to relocate. Have to use web browser for this one at the moment. * Changes undislocate -> relocate * Last file to change to relocate * Changes it to the best medical term for the action. * Reduce -> Relocate --- code/game/gamemodes/changeling/powers/revive.dm | 4 ++-- code/modules/mob/living/carbon/human/human.dm | 6 +++--- code/modules/organs/organ_external.dm | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index 98b091abaa..ab8111000d 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -38,7 +38,7 @@ for(var/limb in H.organs_by_name) var/obj/item/organ/external/current_limb = H.organs_by_name[limb] if(current_limb) - current_limb.undislocate() + current_limb.relocate() current_limb.open = 0 BITSET(H.hud_updateflag, HEALTH_HUD) @@ -60,4 +60,4 @@ - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 19aaecf712..68ea9b8e72 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1347,9 +1347,9 @@ if(..(slipped_on,stun_duration)) return 1 -/mob/living/carbon/human/proc/undislocate() +/mob/living/carbon/human/proc/relocate() set category = "Object" - set name = "Undislocate Joint" + set name = "Relocate Joint" set desc = "Pop a joint back into place. Extremely painful." set src in view(1) @@ -1397,7 +1397,7 @@ else U << "You pop [S]'s [current_limb.joint] back in!" S << "[U] pops your [current_limb.joint] back in!" - current_limb.undislocate() + current_limb.relocate() /mob/living/carbon/human/drop_from_inventory(var/obj/item/W, var/atom/Target = null) if(W in organs) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 0bfd3dfd0e..5b855d584c 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -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))