diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index c424b0cc200..ea9f1663ed0 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -389,7 +389,7 @@
playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1)
LE.firer = src
- LE.def_zone = get_organ_target()
+ LE.def_zone = ran_zone(zone_selected)
LE.original = A
LE.current = T
LE.yo = U.y - T.y
diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm
index 102e38cba77..a825cadb8d3 100644
--- a/code/_onclick/hud/alien.dm
+++ b/code/_onclick/hud/alien.dm
@@ -126,9 +126,9 @@
alien_plasma_display = new /obj/screen/alien/plasma_display()
infodisplay += alien_plasma_display
- mymob.zone_sel = new /obj/screen/zone_sel/alien()
- mymob.zone_sel.update_icon(mymob)
- static_inventory += mymob.zone_sel
+ zone_select = new /obj/screen/zone_sel/alien()
+ zone_select.update_icon(mymob)
+ static_inventory += zone_select
for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm
index 9e57fd9429b..68a2826fca3 100644
--- a/code/_onclick/hud/alien_larva.dm
+++ b/code/_onclick/hud/alien_larva.dm
@@ -34,6 +34,6 @@
using.screen_loc = ui_alienlarva_language_menu
static_inventory += using
- mymob.zone_sel = new /obj/screen/zone_sel/alien()
- mymob.zone_sel.update_icon(mymob)
- static_inventory += mymob.zone_sel
+ zone_select = new /obj/screen/zone_sel/alien()
+ zone_select.update_icon(mymob)
+ static_inventory += zone_select
diff --git a/code/_onclick/hud/devil.dm b/code/_onclick/hud/devil.dm
index 1e17cae1708..53f7265c6a4 100644
--- a/code/_onclick/hud/devil.dm
+++ b/code/_onclick/hud/devil.dm
@@ -49,9 +49,9 @@
using.screen_loc = ui_swaphand2
static_inventory += using
- mymob.zone_sel = new /obj/screen/zone_sel()
- mymob.zone_sel.icon = ui_style
- mymob.zone_sel.update_icon(mymob)
+ zone_select = new /obj/screen/zone_sel()
+ zone_select.icon = ui_style
+ zone_select.update_icon(mymob)
lingchemdisplay = new /obj/screen/ling/chems()
devilsouldisplay = new /obj/screen/devil/soul_counter
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index d06069b43a4..beb6949ce2c 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -24,6 +24,7 @@
var/obj/screen/alien_plasma_display
var/obj/screen/nightvisionicon
var/obj/screen/action_intent
+ var/obj/screen/zone_select
var/obj/screen/move_intent
var/obj/screen/module_store_icon
@@ -67,6 +68,7 @@
inv_slots.Cut()
action_intent = null
+ zone_select = null
move_intent = null
QDEL_LIST(toggleable_inventory)
@@ -80,7 +82,6 @@
mymob.healths = null
mymob.healthdoll = null
mymob.pullin = null
- mymob.zone_sel = null
//clear the rest of our reload_fullscreen
lingchemdisplay = null
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 0a6680b3ba4..e28fdf65f1e 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -370,10 +370,10 @@
devilsouldisplay = new /obj/screen/devil/soul_counter
infodisplay += devilsouldisplay
- mymob.zone_sel = new /obj/screen/zone_sel()
- mymob.zone_sel.icon = ui_style
- mymob.zone_sel.update_icon(mymob)
- static_inventory += mymob.zone_sel
+ zone_select = new /obj/screen/zone_sel()
+ zone_select.icon = ui_style
+ zone_select.update_icon(mymob)
+ static_inventory += zone_select
inventory_shown = 0
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index ea23a56d8e4..14080274617 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -154,9 +154,9 @@
mymob.pullin.screen_loc = ui_borg_pull
hotkeybuttons += mymob.pullin
- mymob.zone_sel = new /obj/screen/zone_sel/robot()
- mymob.zone_sel.update_icon(mymob)
- static_inventory += mymob.zone_sel
+ zone_select = new /obj/screen/zone_sel/robot()
+ zone_select.update_icon(mymob)
+ static_inventory += zone_select
//Headlamp
mymobR.lamp_button = new /obj/screen/robot/lamp()
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index dc9b8674c69..c279a7be2a5 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -291,9 +291,10 @@
update_icon(usr)
return 1
-/obj/screen/zone_sel/update_icon()
+/obj/screen/zone_sel/update_icon(mob/user)
overlays.Cut()
overlays += image('icons/mob/zone_sel.dmi', "[selecting]")
+ user.zone_selected = selecting
/obj/screen/zone_sel/alien
icon = 'icons/mob/screen_alien.dmi'
@@ -301,6 +302,7 @@
/obj/screen/zone_sel/alien/update_icon(mob/user)
overlays.Cut()
overlays += image('icons/mob/screen_alien.dmi', "[selecting]")
+ user.zone_selected = selecting
/obj/screen/zone_sel/robot
icon = 'icons/mob/screen_robot.dmi'
diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm
index fa9f2a323e8..f49a250b0fa 100644
--- a/code/game/dna/genes/goon_powers.dm
+++ b/code/game/dna/genes/goon_powers.dm
@@ -316,7 +316,7 @@
var/atom/movable/the_item = targets[1]
if(ishuman(the_item))
var/mob/living/carbon/human/H = the_item
- var/obj/item/organ/external/limb = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/limb = H.get_organ(user.zone_selected)
if(!istype(limb))
to_chat(user, "You can't eat this part of them!")
revert_cast()
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 67f42b81285..187ac0f0ea1 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -788,7 +788,7 @@ var/global/list/multiverse = list()
target.bodytemperature += 50
GiveHint(target)
else if(is_pointed(I))
- to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_sel.selecting)]!")
+ to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_selected)]!")
target.Weaken(2)
GiveHint(target)
else if(istype(I,/obj/item/bikehorn))
@@ -819,7 +819,7 @@ var/global/list/multiverse = list()
target = input(user, "Select your victim!", "Voodoo") as null|anything in possible
return
- if(user.zone_sel.selecting == "chest")
+ if(user.zone_selected == "chest")
if(link)
target = null
link.loc = get_turf(src)
@@ -829,7 +829,7 @@ var/global/list/multiverse = list()
return
if(target && cooldown < world.time)
- switch(user.zone_sel.selecting)
+ switch(user.zone_selected)
if("mouth")
var/wgw = sanitize(input(user, "What would you like the victim to say", "Voodoo", null) as text)
target.say(wgw)
diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm
index eda83e47cb4..fc329011d14 100644
--- a/code/game/objects/items/devices/autopsy.dm
+++ b/code/game/objects/items/devices/autopsy.dm
@@ -165,7 +165,7 @@
timeofdeath = M.timeofdeath
- var/obj/item/organ/external/S = M.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/S = M.get_organ(user.zone_selected)
if(!S)
to_chat(user, "You can't scan this body part.")
return
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 90a778f8e49..2685cc4aafa 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -46,7 +46,7 @@
/obj/item/flashlight/attack(mob/living/M as mob, mob/living/user as mob)
add_fingerprint(user)
- if(on && user.zone_sel.selecting == "eyes")
+ if(on && user.zone_selected == "eyes")
if(((CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly
return ..() //just hit them in the head
@@ -362,7 +362,7 @@
return TRUE
/obj/item/flashlight/emp/attack(mob/living/M as mob, mob/living/user as mob)
- if(on && user.zone_sel.selecting == "eyes") // call original attack proc only if aiming at the eyes
+ if(on && user.zone_selected == "eyes") // call original attack proc only if aiming at the eyes
..()
return
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 43b22eb4979..21b71e7668c 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -98,7 +98,7 @@
//human/alien mobs
if(iscarbon(target))
var/mob/living/carbon/C = target
- if(user.zone_sel.selecting == "eyes")
+ if(user.zone_selected == "eyes")
add_attack_logs(user, C, "Shone a laser in the eyes with [src]")
var/severity = 1
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 887016d1fdf..7dc1a97a735 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -28,7 +28,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affecting = H.get_organ(user.zone_selected)
if(!H.can_inject(user, TRUE))
return 1
@@ -81,7 +81,7 @@
/obj/item/stack/medical/proc/heal(mob/living/M, mob/user)
var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affecting = H.get_organ(user.zone_selected)
user.visible_message("[user] [healverb]s the wounds on [H]'s [affecting.name].", \
"You [healverb] the wounds on [H]'s [affecting.name]." )
@@ -144,7 +144,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affecting = H.get_organ(user.zone_selected)
if(affecting.open == 0)
affecting.germ_level = 0
@@ -194,7 +194,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affecting = H.get_organ(user.zone_selected)
if(affecting.open == 0)
affecting.germ_level = 0
@@ -250,7 +250,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affecting = H.get_organ(user.zone_selected)
var/limb = affecting.name
if(!(affecting.limb_name in list("l_arm", "r_arm", "l_hand", "r_hand", "l_leg", "r_leg", "l_foot", "r_foot")))
diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm
index 08e871c66a4..59dad865acb 100644
--- a/code/game/objects/items/stacks/nanopaste.dm
+++ b/code/game/objects/items/stacks/nanopaste.dm
@@ -24,7 +24,7 @@
if(istype(M,/mob/living/carbon/human)) //Repairing robotic limbs and IPCs
var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/S = H.get_organ(user.zone_selected)
if(S && S.is_robotic())
if(S.get_damage())
diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index c6adcdb2af3..9f1f6bc194f 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -108,7 +108,7 @@
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/head/C = H.get_organ("head")
var/datum/robolimb/robohead = all_robolimbs[C.model]
- if(user.zone_sel.selecting == "mouth")
+ if(user.zone_selected == "mouth")
if(!get_location_accessible(H, "mouth"))
to_chat(user, "The mask is in the way.")
return
@@ -139,7 +139,7 @@
C.f_style = "Shaved"
H.update_fhair()
playsound(src.loc, usesound, 20, 1)
- if(user.zone_sel.selecting == "head")
+ if(user.zone_selected == "head")
if(!get_location_accessible(H, "head"))
to_chat(user, "The headgear is in the way.")
return
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 3d18b2e0109..66d1e625e8c 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -47,7 +47,7 @@
return ..()
if(user.a_intent != INTENT_HELP)
- if(user.zone_sel.selecting == "head" || user.zone_sel.selecting == "eyes")
+ if(user.zone_selected == "head" || user.zone_selected == "eyes")
if((CLUMSY in user.mutations) && prob(50))
M = user
return eyestab(M,user)
diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
index d69c04792a3..d141d7ade27 100644
--- a/code/game/objects/items/weapons/lighters.dm
+++ b/code/game/objects/items/weapons/lighters.dm
@@ -88,7 +88,7 @@
if(!istype(M, /mob))
return
- if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_sel.selecting == "mouth" && lit)
+ if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_selected == "mouth" && lit)
var/obj/item/clothing/mask/cigarette/cig = M.wear_mask
if(M == user)
cig.attackby(src, user)
diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm
index b8a0ac65ca0..62f65b5a6cc 100644
--- a/code/game/objects/items/weapons/soap.dm
+++ b/code/game/objects/items/weapons/soap.dm
@@ -60,7 +60,7 @@
qdel(O)
/obj/item/soap/attack(mob/target as mob, mob/user as mob)
- if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == "mouth" )
+ if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_selected == "mouth" )
user.visible_message("\the [user] washes \the [target]'s mouth out with [name]!")
return
..()
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 664cc8229bd..a4fb593ab6f 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -207,7 +207,7 @@
if(!istype(M, /mob))
return
- if(istype(M) && M == user && user.zone_sel.selecting == "mouth" && contents.len > 0 && !user.wear_mask)
+ if(istype(M) && M == user && user.zone_selected == "mouth" && contents.len > 0 && !user.wear_mask)
var/got_cig = 0
for(var/num=1, num <= contents.len, num++)
var/obj/item/I = contents[num]
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index bf861c5acb1..224d3bc2727 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -161,7 +161,7 @@
/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user)
if(!istype(M) || user.a_intent == INTENT_HELP)
return ..()
- if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head")
+ if(user.zone_selected != "eyes" && user.zone_selected != "head")
return ..()
if((CLUMSY in user.mutations) && prob(50))
M = user
@@ -416,7 +416,7 @@
/obj/item/weldingtool/attack(mob/M, mob/user)
if(ishuman(M))
var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/S = H.bodyparts_by_name[user.zone_sel.selecting]
+ var/obj/item/organ/external/S = H.bodyparts_by_name[user.zone_selected]
if(!S)
return
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index fc5ec2b9339..d518d86c777 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -542,7 +542,7 @@
if(busy)
to_chat(user, "Someone's already washing here.")
return
- var/selected_area = parse_zone(user.zone_sel.selecting)
+ var/selected_area = parse_zone(user.zone_selected)
var/washing_face = 0
if(selected_area in list("head", "mouth", "eyes"))
washing_face = 1
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index cd50dcedb71..2bcc8812ef7 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -52,7 +52,7 @@
force = 15 //Smashing bottles over someoen's head hurts.
- var/obj/item/organ/external/affecting = user.zone_sel.selecting //Find what the player is aiming at
+ var/obj/item/organ/external/affecting = user.zone_selected //Find what the player is aiming at
var/armor_block = 0 //Get the target's armor values for normal attack damage.
var/armor_duration = 0 //The more force the bottle has, the longer the duration.
diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm
index 8cdda48af5d..063570f0cc9 100644
--- a/code/modules/food_and_drinks/drinks/drinks/cans.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm
@@ -32,7 +32,7 @@
if(canopened == 0)
to_chat(user, "You need to open the drink!")
return
- else if(M == user && !reagents.total_volume && user.a_intent == INTENT_HARM && user.zone_sel.selecting == "head")
+ else if(M == user && !reagents.total_volume && user.a_intent == INTENT_HARM && user.zone_selected == "head")
user.visible_message("[user] crushes [src] on [user.p_their()] forehead!", "You crush [src] on your forehead.")
crush(user)
return
diff --git a/code/modules/martial_arts/brawling.dm b/code/modules/martial_arts/brawling.dm
index 7869e101505..d5d2e35b338 100644
--- a/code/modules/martial_arts/brawling.dm
+++ b/code/modules/martial_arts/brawling.dm
@@ -23,7 +23,7 @@
return 0
- var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_sel.selecting))
+ var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, "melee")
playsound(D.loc, 'sound/weapons/punch1.ogg', 25, 1, -1)
@@ -81,7 +81,7 @@
D.visible_message("[A] has attempted to hit [D] with a [atk_verb]!")
return 1 //returns 1 so that they actually miss and don't switch to attackhand damage
- var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_sel.selecting))
+ var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, "melee")
playsound(D.loc, 'sound/weapons/punch1.ogg', 25, 1, -1)
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index 571eefcfb00..64e7cba86cd 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -56,7 +56,7 @@
D.visible_message("[A] has attempted to [atk_verb] [D]!")
return 0
- var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_sel.selecting))
+ var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, "melee")
playsound(D.loc, attack.attack_sound, 25, 1, -1)
diff --git a/code/modules/martial_arts/mimejutsu.dm b/code/modules/martial_arts/mimejutsu.dm
index e8aa7a53d03..5bfff3bf093 100644
--- a/code/modules/martial_arts/mimejutsu.dm
+++ b/code/modules/martial_arts/mimejutsu.dm
@@ -30,7 +30,7 @@
return 0
- var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_sel.selecting))
+ var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, "melee")
D.visible_message("[A] has hit [D] with invisible nuncucks!", \
diff --git a/code/modules/martial_arts/wrestleing.dm b/code/modules/martial_arts/wrestleing.dm
index e9dfd9c02a8..177662527e3 100644
--- a/code/modules/martial_arts/wrestleing.dm
+++ b/code/modules/martial_arts/wrestleing.dm
@@ -51,7 +51,7 @@
D.grabbedby(A,1)
D.visible_message("[A] holds [D] down!", \
"[A] holds [D] down!")
- var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_sel.selecting))
+ var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, "melee")
D.apply_damage(10, STAMINA, affecting, armor_block)
return 1
diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm
index 5a0c17d9e93..869864e5768 100644
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -48,7 +48,6 @@
/mob/living/simple_animal/hostile/mining_drone/New()
..()
stored_gun = new(src)
- zone_sel = new /obj/screen/zone_sel(src) //Gross, but necessary TO-DO; remove this.
toggle_light_action = new()
toggle_light_action.Grant(src)
toggle_meson_vision_action = new()
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index da23de1f6ad..7bc9ffd4a0d 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -241,7 +241,7 @@
// BEGIN HUGCODE - N3X
else
playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- if(M.zone_sel.selecting == "head")
+ if(M.zone_selected == "head")
M.visible_message(\
"[M] pats [src] on the head.",\
"You pat [src] on the head.",\
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index e327f151db0..fd4c9f0116e 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1013,7 +1013,7 @@
if(!user)
target_zone = pick("chest","chest","chest","left leg","right leg","left arm", "right arm", "head")
else
- target_zone = user.zone_sel.selecting
+ target_zone = user.zone_selected
if(PIERCEIMMUNE in dna.species.species_traits)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index b68b77e77de..1f78983560d 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -355,7 +355,7 @@ emp_act
qdel(src)
- var/obj/item/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting))
+ var/obj/item/organ/external/affecting = get_organ(ran_zone(user.zone_selected))
if(!affecting)
to_chat(user, "They are missing that limb!")
return 1
@@ -382,7 +382,7 @@ emp_act
var/armor = run_armor_check(affecting, "melee", "Your armour has protected your [hit_area].", "Your armour has softened hit to your [hit_area].", armour_penetration = I.armour_penetration)
var/weapon_sharp = is_sharp(I)
- if(weapon_sharp && prob(getarmor(user.zone_sel.selecting, "melee")))
+ if(weapon_sharp && prob(getarmor(user.zone_selected, "melee")))
weapon_sharp = 0
if(armor >= 100)
return 0
@@ -532,7 +532,7 @@ emp_act
var/damage = rand(1, 3)
if(stat != DEAD)
L.amount_grown = min(L.amount_grown + damage, L.max_grown)
- var/obj/item/organ/external/affecting = get_organ(ran_zone(L.zone_sel.selecting))
+ var/obj/item/organ/external/affecting = get_organ(ran_zone(L.zone_selected))
var/armor_block = run_armor_check(affecting, "melee")
apply_damage(damage, BRUTE, affecting, armor_block)
updatehealth("larva attack")
@@ -551,7 +551,7 @@ emp_act
playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
visible_message("[M] has lunged at [src]!")
return 0
- var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
+ var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_selected))
var/armor_block = run_armor_check(affecting, "melee")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
@@ -568,7 +568,7 @@ emp_act
if(M.a_intent == INTENT_DISARM)
if(prob(80))
- var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
+ var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_selected))
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
apply_effect(5, WEAKEN, run_armor_check(affecting, "melee"))
add_attack_logs(M, src, "Alien tackled")
diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm
index 1e753279059..19861534af9 100644
--- a/code/modules/mob/living/carbon/human/species/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/_species.dm
@@ -395,7 +395,7 @@
/datum/species/proc/harm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
//Vampire code
- if(user.mind && user.mind.vampire && (user.mind in SSticker.mode.vampires) && !user.mind.vampire.draining && user.zone_sel && user.zone_sel.selecting == "head" && target != user)
+ if(user.mind && user.mind.vampire && (user.mind in SSticker.mode.vampires) && !user.mind.vampire.draining && user.zone_selected == "head" && target != user)
if((NO_BLOOD in target.dna.species.species_traits) || target.dna.species.exotic_blood || !target.blood_volume)
to_chat(user, "They have no blood!")
return
@@ -438,7 +438,7 @@
return FALSE
- var/obj/item/organ/external/affecting = target.get_organ(ran_zone(user.zone_sel.selecting))
+ var/obj/item/organ/external/affecting = target.get_organ(ran_zone(user.zone_selected))
var/armor_block = target.run_armor_check(affecting, "melee")
playsound(target.loc, attack.attack_sound, 25, 1, -1)
@@ -465,7 +465,7 @@
user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
if(target.w_uniform)
target.w_uniform.add_fingerprint(user)
- var/obj/item/organ/external/affecting = target.get_organ(ran_zone(user.zone_sel.selecting))
+ var/obj/item/organ/external/affecting = target.get_organ(ran_zone(user.zone_selected))
var/randn = rand(1, 100)
if(randn <= 25)
target.apply_effect(2, WEAKEN, target.run_armor_check(affecting, "melee"))
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 92155f745a8..3aa8790cfce 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -376,15 +376,6 @@
/mob/living/is_drawable(mob/user, allowmobs = TRUE)
return (allowmobs && reagents && can_inject(user))
-/mob/living/proc/get_organ_target()
- var/mob/shooter = src
- var/t = shooter:zone_sel.selecting
- if((t in list( "eyes", "mouth" )))
- t = "head"
- var/obj/item/organ/external/def_zone = ran_zone(t)
- return def_zone
-
-
/mob/living/proc/restore_all_organs()
return
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index 4bc9f5f2c81..3061c765359 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -67,9 +67,6 @@ Difficulty: Medium
. = ..()
miner_saw = new(src)
- // Add a zone selection UI; otherwise the mob can't melee attack properly.
- zone_sel = new /obj/screen/zone_sel()
-
/datum/action/innate/megafauna_attack/dash
name = "Dash To Target"
icon_icon = 'icons/mob/actions/actions.dmi'
diff --git a/code/modules/mob/living/simple_animal/posessed_object.dm b/code/modules/mob/living/simple_animal/posessed_object.dm
index acd71fdcaff..bde995d8edb 100644
--- a/code/modules/mob/living/simple_animal/posessed_object.dm
+++ b/code/modules/mob/living/simple_animal/posessed_object.dm
@@ -95,8 +95,6 @@
forceMove( possessed_loc )
possessed_item.forceMove(src) // We'll keep the actual item inside of us until we die.
- zone_sel = new /obj/screen/zone_sel(src) // Create a new zone selection item so the human attacks have something to reference. Horrifying and ugly hack, do not look directly at this.
-
update_icon(1)
visible_message("[src] rises into the air and begins to float!") // Inform those around us that shit's gettin' spooky.
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index ae7b7980d1f..09084236551 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -8,6 +8,9 @@
var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak
+ /// The zone this mob is currently targeting
+ var/zone_selected = null
+
var/obj/screen/hands = null
var/obj/screen/pullin = null
var/obj/screen/i_select = null
@@ -21,7 +24,6 @@
I'll make some notes on where certain variable defines should probably go.
Changing this around would probably require a good look-over the pre-existing code.
*/
- var/obj/screen/zone_sel/zone_sel = null
var/obj/screen/leap_icon = null
var/obj/screen/healthdoll/healthdoll = null
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 805d48fdd9f..53e6b467165 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -106,7 +106,7 @@
assailant.client.screen -= hud
assailant.client.screen += hud
- var/hit_zone = assailant.zone_sel.selecting
+ var/hit_zone = assailant.zone_selected
last_hit_zone = hit_zone
if(assailant.pulling == affecting)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index c45ff96df34..94f1e2048db 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -388,7 +388,7 @@
/mob/proc/update_gravity()
return
/client/proc/check_has_body_select()
- return mob && mob.hud_used && mob.zone_sel && istype(mob.zone_sel, /obj/screen/zone_sel)
+ return mob && mob.hud_used && mob.hud_used.zone_select && istype(mob.hud_used.zone_select, /obj/screen/zone_sel)
/client/verb/body_toggle_head()
set name = "body-toggle-head"
@@ -398,7 +398,7 @@
return
var/next_in_line
- switch(mob.zone_sel.selecting)
+ switch(mob.zone_selected)
if(BODY_ZONE_HEAD)
next_in_line = BODY_ZONE_PRECISE_EYES
if(BODY_ZONE_PRECISE_EYES)
@@ -406,7 +406,7 @@
else
next_in_line = BODY_ZONE_HEAD
- var/obj/screen/zone_sel/selector = mob.zone_sel
+ var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(next_in_line, mob)
/client/verb/body_r_arm()
@@ -416,12 +416,12 @@
return
var/next_in_line
- if(mob.zone_sel.selecting == BODY_ZONE_R_ARM)
+ if(mob.zone_selected == BODY_ZONE_R_ARM)
next_in_line = BODY_ZONE_PRECISE_R_HAND
else
next_in_line = BODY_ZONE_R_ARM
- var/obj/screen/zone_sel/selector = mob.zone_sel
+ var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(next_in_line, mob)
/client/verb/body_chest()
@@ -431,7 +431,7 @@
if(!check_has_body_select())
return
- var/obj/screen/zone_sel/selector = mob.zone_sel
+ var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(BODY_ZONE_CHEST, mob)
/client/verb/body_l_arm()
@@ -442,12 +442,12 @@
return
var/next_in_line
- if(mob.zone_sel.selecting == BODY_ZONE_L_ARM)
+ if(mob.zone_selected == BODY_ZONE_L_ARM)
next_in_line = BODY_ZONE_PRECISE_L_HAND
else
next_in_line = BODY_ZONE_L_ARM
- var/obj/screen/zone_sel/selector = mob.zone_sel
+ var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(next_in_line, mob)
/client/verb/body_r_leg()
@@ -458,12 +458,12 @@
return
var/next_in_line
- if(mob.zone_sel.selecting == BODY_ZONE_R_LEG)
+ if(mob.zone_selected == BODY_ZONE_R_LEG)
next_in_line = BODY_ZONE_PRECISE_R_FOOT
else
next_in_line = BODY_ZONE_R_LEG
- var/obj/screen/zone_sel/selector = mob.zone_sel
+ var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(next_in_line, mob)
/client/verb/body_groin()
@@ -473,7 +473,7 @@
if(!check_has_body_select())
return
- var/obj/screen/zone_sel/selector = mob.zone_sel
+ var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(BODY_ZONE_PRECISE_GROIN, mob)
/client/verb/body_l_leg()
@@ -484,12 +484,12 @@
return
var/next_in_line
- if(mob.zone_sel.selecting == BODY_ZONE_L_LEG)
+ if(mob.zone_selected == BODY_ZONE_L_LEG)
next_in_line = BODY_ZONE_PRECISE_L_FOOT
else
next_in_line = BODY_ZONE_L_LEG
- var/obj/screen/zone_sel/selector = mob.zone_sel
+ var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(next_in_line, mob)
/client/verb/toggle_walk_run()
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index ce5d51aae55..a88565d3818 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -131,12 +131,12 @@
return
/obj/item/paper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
- if(user.zone_sel.selecting == "eyes")
+ if(user.zone_selected == "eyes")
user.visible_message("You show the paper to [M]. ", \
" [user] holds up a paper and shows it to [M]. ")
M.examinate(src)
- else if(user.zone_sel.selecting == "mouth")
+ else if(user.zone_selected == "mouth")
if(!istype(M, /mob)) return
if(ishuman(M))
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 811c0711074..6d22afe282f 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -510,7 +510,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/attack(mob/M, mob/user)
if(ishuman(M))
var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/S = H.bodyparts_by_name[user.zone_sel.selecting]
+ var/obj/item/organ/external/S = H.bodyparts_by_name[user.zone_selected]
if(!S)
return
diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm
index c2333da9107..d1e549dbdb0 100644
--- a/code/modules/projectiles/firing.dm
+++ b/code/modules/projectiles/firing.dm
@@ -28,7 +28,7 @@
if(zone_override)
BB.def_zone = zone_override
else
- BB.def_zone = user.zone_sel.selecting
+ BB.def_zone = user.zone_selected
BB.suppressed = quiet
if(reagents && BB.reagents)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 510e8f60264..ec011bad472 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -136,7 +136,7 @@
return
if(!ismob(target) || user.a_intent == INTENT_HARM) //melee attack
return
- if(target == user && user.zone_sel.selecting != "mouth") //so we can't shoot ourselves (unless mouth selected)
+ if(target == user && user.zone_selected != "mouth") //so we can't shoot ourselves (unless mouth selected)
return
if(istype(user))//Check if the user can use the gun, if the user isn't alive(turrets) assume it can.
@@ -149,7 +149,7 @@
return
if(flag)
- if(user.zone_sel.selecting == "mouth")
+ if(user.zone_selected == "mouth")
handle_suicide(user, target, params)
return
@@ -428,7 +428,7 @@
semicd = 1
- if(!do_mob(user, target, 120) || user.zone_sel.selecting != "mouth")
+ if(!do_mob(user, target, 120) || user.zone_selected != "mouth")
if(user)
if(user == target)
user.visible_message("[user] decided life was worth living.")
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 99ec51f9fdd..21992f43704 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -286,7 +286,7 @@
var/obj/item/ammo_casing/AC = chambered
if(AC.fire(user, user))
playsound(user, fire_sound, 50, 1)
- var/zone = check_zone(user.zone_sel.selecting)
+ var/zone = check_zone(user.zone_selected)
if(zone == "head" || zone == "eyes" || zone == "mouth")
shoot_self(user, zone)
else
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index ef00c6230d1..d82c128be47 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -76,7 +76,7 @@
return
if(!istype(M))
return
- if(R.total_volume && M.can_inject(user, TRUE, user.zone_sel.selecting, penetrate_thick = bypass_protection))
+ if(R.total_volume && M.can_inject(user, TRUE, user.zone_selected, penetrate_thick = bypass_protection))
to_chat(user, "You inject [M] with the injector.")
to_chat(M, "You feel a tiny prick!")
diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm
index fb45bddb9ba..f4fbe753972 100644
--- a/code/modules/surgery/bones.dm
+++ b/code/modules/surgery/bones.dm
@@ -16,7 +16,7 @@
/datum/surgery/bone_repair/can_start(mob/user, mob/living/carbon/target)
if(istype(target,/mob/living/carbon/human))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(!affected)
return 0
if(affected.is_robotic())
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index 16d1b18dc1b..e86ab317fce 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -20,7 +20,7 @@
/datum/surgery/cavity_implant/can_start(mob/user, mob/living/carbon/human/target)
if(!istype(target))
return 0
- var/obj/item/organ/external/affected = target.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = target.get_organ(user.zone_selected)
if(!affected)
return 0
if(affected.is_robotic())
@@ -30,7 +30,7 @@
/datum/surgery/cavity_implant/synth/can_start(mob/user, mob/living/carbon/human/target)
if(!istype(target))
return 0
- var/obj/item/organ/external/affected = target.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = target.get_organ(user.zone_selected)
if(!affected)
return 0
return affected.is_robotic()
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index f3e039da6a8..c63cd286787 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -2,7 +2,7 @@
if(istype(M))
var/mob/living/carbon/human/H
var/obj/item/organ/external/affecting
- var/selected_zone = user.zone_sel.selecting
+ var/selected_zone = user.zone_selected
var/list/cautery_tools = list(
/obj/item/scalpel/laser = 100, \
/obj/item/cautery = 100, \
diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm
index 435ce92b94e..48895a3378a 100644
--- a/code/modules/surgery/implant_removal.dm
+++ b/code/modules/surgery/implant_removal.dm
@@ -16,7 +16,7 @@
/datum/surgery/implant_removal/can_start(mob/user, mob/living/carbon/human/target)
if(!istype(target))
return 0
- var/obj/item/organ/external/affected = target.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = target.get_organ(user.zone_selected)
if(!affected)
return 0
if(affected.is_robotic())
@@ -26,7 +26,7 @@
/datum/surgery/implant_removal/synth/can_start(mob/user, mob/living/carbon/human/target)
if(!istype(target))
return 0
- var/obj/item/organ/external/affected = target.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = target.get_organ(user.zone_selected)
if(!affected)
return 0
if(!affected.is_robotic())
diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm
index d2f11364cfe..bec73e6e69b 100644
--- a/code/modules/surgery/limb_augmentation.dm
+++ b/code/modules/surgery/limb_augmentation.dm
@@ -6,7 +6,7 @@
/datum/surgery/limb_augmentation/can_start(mob/user, mob/living/carbon/target)
if(ishuman(target))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(!affected)
return 0
if(affected.status & ORGAN_BROKEN) //The arm has to be in prime condition to augment it.
diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm
index 42db2e97da1..11ceaaeb0fb 100644
--- a/code/modules/surgery/limb_reattach.dm
+++ b/code/modules/surgery/limb_reattach.dm
@@ -12,7 +12,7 @@
/datum/surgery/amputation/can_start(mob/user, mob/living/carbon/target)
if(ishuman(target))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(!affected)
return 0
if(affected.is_robotic())
@@ -31,7 +31,7 @@
/datum/surgery/reattach/can_start(mob/user, mob/living/carbon/target)
if(ishuman(target))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(ismachine(target))
// RIP bi-centennial man
return 0
@@ -47,7 +47,7 @@
/datum/surgery/reattach_synth/can_start(mob/user, mob/living/carbon/target)
if(ishuman(target))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(!affected)
return 1
@@ -62,7 +62,7 @@
/datum/surgery/robo_attach/can_start(mob/user, mob/living/carbon/target)
if(ishuman(target))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(!affected)
return 1
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 32270c329c2..a67774389c0 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -28,7 +28,7 @@
/datum/surgery/organ_manipulation/can_start(mob/user, mob/living/carbon/target)
if(istype(target,/mob/living/carbon/human))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(!affected)
// I'd like to see you do surgery on LITERALLY NOTHING
return 0
@@ -41,7 +41,7 @@
/datum/surgery/organ_manipulation_boneless/can_start(mob/user, mob/living/carbon/target)
if(istype(target,/mob/living/carbon/human))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(affected && affected.is_robotic())
return 0//no operating on robotic limbs in an organic surgery
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index ebe824f0bbc..939fa360d03 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -21,7 +21,7 @@
/datum/surgery/infection/can_start(mob/user, mob/living/carbon/target)
if(ishuman(target))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(!affected)
return 0
if(affected.is_robotic())
@@ -32,7 +32,7 @@
/datum/surgery/bleeding/can_start(mob/user, mob/living/carbon/target)
if(ishuman(target))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(!affected)
return 0
@@ -43,7 +43,7 @@
/datum/surgery/debridement/can_start(mob/user, mob/living/carbon/target)
if(ishuman(target))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(!hasorgans(target))
return 0
@@ -256,7 +256,7 @@
if(!is_thrall(target))
return 0
var/obj/item/organ/internal/brain/B = target.get_int_organ(/obj/item/organ/internal/brain)
- var/obj/item/organ/external/affected = target.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = target.get_organ(user.zone_selected)
if(!B)
// No brain to remove the tumor from
return 0
@@ -272,7 +272,7 @@
if(!is_thrall(target))
return 0
var/obj/item/organ/internal/brain/B = target.get_int_organ(/obj/item/organ/internal/brain)
- var/obj/item/organ/external/affected = target.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = target.get_organ(user.zone_selected)
if(!B)
// No brain to remove the tumor from
return 0
diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm
index 9483818d153..0aac0bf705f 100644
--- a/code/modules/surgery/plastic_surgery.dm
+++ b/code/modules/surgery/plastic_surgery.dm
@@ -6,7 +6,7 @@
/datum/surgery/plastic_surgery/can_start(mob/user, mob/living/carbon/target)
if(ishuman(target))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/head/head = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/head/head = H.get_organ(user.zone_selected)
if(!head)
return FALSE
if(head.is_robotic())
diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm
index 3dde9ce1a09..340492545be 100644
--- a/code/modules/surgery/remove_embedded_object.dm
+++ b/code/modules/surgery/remove_embedded_object.dm
@@ -10,7 +10,7 @@
/datum/surgery/embedded_removal/can_start(mob/user, mob/living/carbon/human/target)
if(!istype(target))
return 0
- var/obj/item/organ/external/affected = target.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = target.get_organ(user.zone_selected)
if(!affected)
return 0
if(affected.is_robotic())
@@ -20,7 +20,7 @@
/datum/surgery/embedded_removal/synth/can_start(mob/user, mob/living/carbon/human/target)
if(!istype(target))
return 0
- var/obj/item/organ/external/affected = target.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = target.get_organ(user.zone_selected)
if(!affected)
return 0
if(!affected.is_robotic())
@@ -38,9 +38,9 @@
/datum/surgery_step/remove_object/begin_step(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
L = surgery.organ_ref
if(L)
- user.visible_message("[user] looks for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)].", "You look for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)]...")
+ user.visible_message("[user] looks for objects embedded in [target]'s [parse_zone(user.zone_selected)].", "You look for objects embedded in [target]'s [parse_zone(user.zone_selected)]...")
else
- user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].", "You look for [target]'s [parse_zone(user.zone_sel.selecting)]...")
+ user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...")
/datum/surgery_step/remove_object/end_step(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -61,6 +61,6 @@
to_chat(user, "You find no objects embedded in [H]'s [L]!")
else
- to_chat(user, "You can't find [target]'s [parse_zone(user.zone_sel.selecting)], let alone any objects embedded in it!")
+ to_chat(user, "You can't find [target]'s [parse_zone(user.zone_selected)], let alone any objects embedded in it!")
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index 7c388d25899..c3198b961be 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -25,7 +25,7 @@
if(istype(target,/mob/living/carbon/human))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(!affected)
return 0
if(!affected.is_robotic())
@@ -35,7 +35,7 @@
/datum/surgery/cybernetic_amputation/can_start(mob/user, mob/living/carbon/target)
if(istype(target,/mob/living/carbon/human))
var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected)
if(!affected)
return 0
if(!affected.is_robotic())
@@ -550,7 +550,7 @@
/datum/surgery/cybernetic_customization/can_start(mob/user, mob/living/carbon/human/target)
if(ishuman(target))
- var/obj/item/organ/external/affected = target.get_organ(user.zone_sel.selecting)
+ var/obj/item/organ/external/affected = target.get_organ(user.zone_selected)
if(!affected)
return FALSE
if(!(affected.status & ORGAN_ROBOT))
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 18e38f7dfc6..0b13d18f9da 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -32,7 +32,7 @@
var/datum/surgery_step/S = get_surgery_step()
if(S)
- if(S.try_op(user, target, user.zone_sel.selecting, user.get_active_hand(), src))
+ if(S.try_op(user, target, user.zone_selected, user.get_active_hand(), src))
return 1
return 0