cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes 'undislocate' to 'relocate' (#4650)

Browse Source 
* 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
This commit is contained in:
Cameron653
2018-02-03 23:45:50 -05:00
committed by Anewbe
parent 6f8d35a2b3
commit 1999fc2a2a
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/gamemodes/changeling/powers/revive.dm
View File

@@ -38,7 +38,7 @@
for(var/limb in H.organs_by_name) for(var/limb in H.organs_by_name)
var/obj/item/organ/external/current_limb = H.organs_by_name[limb] var/obj/item/organ/external/current_limb = H.organs_by_name[limb]
if(current_limb) if(current_limb)
current_limb.undislocate() current_limb.relocate()
current_limb.open = 0 current_limb.open = 0
BITSET(H.hud_updateflag, HEALTH_HUD) BITSET(H.hud_updateflag, HEALTH_HUD)
@@ -60,4 +60,4 @@
return 1 return 1

6
code/modules/mob/living/carbon/human/human.dm
View File

@@ -1347,9 +1347,9 @@
if(..(slipped_on,stun_duration)) if(..(slipped_on,stun_duration))
return 1 return 1
/mob/living/carbon/human/proc/undislocate() /mob/living/carbon/human/proc/relocate()
set category = "Object" set category = "Object"
set name = "Undislocate Joint" set name = "Relocate Joint"
set desc = "Pop a joint back into place. Extremely painful." set desc = "Pop a joint back into place. Extremely painful."
set src in view(1) set src in view(1)
@@ -1397,7 +1397,7 @@
else else
U << "<span class='danger'>You pop [S]'s [current_limb.joint] back in!</span>" U << "<span class='danger'>You pop [S]'s [current_limb.joint] back in!</span>"
S << "<span class='danger'>[U] pops your [current_limb.joint] back in!</span>" S << "<span class='danger'>[U] pops your [current_limb.joint] back in!</span>"
current_limb.undislocate() current_limb.relocate()
/mob/living/carbon/human/drop_from_inventory(var/obj/item/W, var/atom/Target = null) /mob/living/carbon/human/drop_from_inventory(var/obj/item/W, var/atom/Target = null)
if(W in organs) if(W in organs)

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

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