Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merges l_leg and r_leg #22965

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Merges l_leg and r_leg #22965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,9 @@
pixel_x = -9;
pixel_y = -9
},
/obj/item/bodypart/l_leg,
/obj/item/bodypart/leg/left,
/obj/item/bodypart/r_arm,
/obj/item/bodypart/r_leg{
/obj/item/bodypart/leg/right{
pixel_x = 8;
pixel_y = 4
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/StationRuins/maint/3x3/3x3_deltaorgantrade.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/item/bodypart/r_leg,
/obj/item/bodypart/leg/right,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plasteel,
/area/template_noop)
Expand Down
2 changes: 1 addition & 1 deletion _maps/templates/shipbreaker/old_robotics.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
/obj/item/stack/sheet/mineral/gold,
/obj/item/stack/sheet/mineral/gold,
/obj/item/stack/sheet/mineral/gold,
/obj/item/bodypart/r_leg/ipc/sgmipc,
/obj/item/bodypart/leg/right/ipc/sgmipc,
/turf/open/floor/engine/airless,
/area/template_noop)
"K" = (
Expand Down
4 changes: 2 additions & 2 deletions code/datums/components/bloodysoles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ Like its parent but can be applied to carbon mobs instead of clothing items
/datum/component/bloodysoles/feet/update_icon()
. = list()
if(ishuman(wielder))// Monkeys get no bloody feet :(
var/obj/item/bodypart/l_leg/left_leg = wielder.get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/r_leg/right_leg = wielder.get_bodypart(BODY_ZONE_R_LEG)
var/obj/item/bodypart/leg/left/left_leg = wielder.get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/leg/right/right_leg = wielder.get_bodypart(BODY_ZONE_R_LEG)
if(left_leg?.species_id == right_leg?.species_id && icon_exists(bloody_feet.icon, "shoeblood_[left_leg.species_id]"))
bloody_feet.icon_state = "shoeblood_[left_leg.species_id]"
else if(HAS_TRAIT(wielder, TRAIT_DIGITIGRADE) && !HAS_TRAIT(wielder, TRAIT_DIGI_SQUISH))
Expand Down
8 changes: 4 additions & 4 deletions code/datums/components/crafting/recipes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
reqs = list(/obj/item/robot_suit = 1,
/obj/item/clothing/head/helmet = 1,
/obj/item/clothing/suit/armor/vest = 1,
/obj/item/bodypart/l_leg/robot = 1,
/obj/item/bodypart/r_leg/robot = 1,
/obj/item/bodypart/leg/left/robot = 1,
/obj/item/bodypart/leg/right/robot = 1,
/obj/item/stack/sheet/metal = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/gun/energy/e_gun/dragnet = 1,
Expand Down Expand Up @@ -805,7 +805,7 @@

/datum/crafting_recipe/leftprostheticleg
name = "Left Prosthetic Leg"
result = /obj/item/bodypart/l_leg/robot/surplus
result = /obj/item/bodypart/leg/left/robot/surplus
time = 10 SECONDS
reqs = list(/obj/item/stack/sheet/metal = 5,
/obj/item/stack/cable_coil = 10,
Expand All @@ -815,7 +815,7 @@

/datum/crafting_recipe/rightprostheticleg
name = "Right Prosthetic Leg"
result = /obj/item/bodypart/r_leg/robot/surplus
result = /obj/item/bodypart/leg/right/robot/surplus
time = 10 SECONDS
reqs = list(/obj/item/stack/sheet/metal = 5,
/obj/item/stack/cable_coil = 10,
Expand Down
4 changes: 2 additions & 2 deletions code/datums/status_effects/wound_effects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
alert_type = /atom/movable/screen/alert/status_effect/limp
var/msg_stage = 0//so you dont get the most intense messages immediately
/// The left leg of the limping person
var/obj/item/bodypart/l_leg/left
var/obj/item/bodypart/leg/left/left
/// The right leg of the limping person
var/obj/item/bodypart/r_leg/right
var/obj/item/bodypart/leg/right/right
/// Which leg we're limping with next
var/obj/item/bodypart/next_leg
/// How many deciseconds we limp for on the left leg
Expand Down
8 changes: 4 additions & 4 deletions code/datums/traits/negative.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,13 @@
prosthetic = new/obj/item/bodypart/r_arm/robot/surplus(quirk_holder)
slot_string = "right arm"
if(BODY_ZONE_L_LEG)
var/obj/item/bodypart/l_leg/L = H.get_bodypart(BODY_ZONE_L_LEG)
prosthetic = new/obj/item/bodypart/l_leg/robot/surplus(quirk_holder)
var/obj/item/bodypart/leg/left/L = H.get_bodypart(BODY_ZONE_L_LEG)
prosthetic = new/obj/item/bodypart/leg/left/robot/surplus(quirk_holder)
prosthetic.set_digitigrade(L.use_digitigrade)
slot_string = "left leg"
if(BODY_ZONE_R_LEG)
var/obj/item/bodypart/r_leg/R = H.get_bodypart(BODY_ZONE_R_LEG)
prosthetic = new/obj/item/bodypart/r_leg/robot/surplus(quirk_holder)
var/obj/item/bodypart/leg/right/R = H.get_bodypart(BODY_ZONE_R_LEG)
prosthetic = new/obj/item/bodypart/leg/right/robot/surplus(quirk_holder)
prosthetic.set_digitigrade(R.use_digitigrade)
slot_string = "right leg"
prosthetic.replace_limb(H)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/melee/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
return

// Special effects
if(affecting?.stamina_dam >= 50 && (istype(affecting, /obj/item/bodypart/l_leg) || istype(affecting, /obj/item/bodypart/r_leg)))
if(affecting?.stamina_dam >= 50 && (istype(affecting, /obj/item/bodypart/leg)))
desc = get_stun_description(target, user)
target.Knockdown(knockdown_time_carbon)

Expand Down
12 changes: 6 additions & 6 deletions code/game/objects/items/robot/robot_parts.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
/// Right arm part of the endoskeleton
var/obj/item/bodypart/r_arm/robot/r_arm = null
/// Left leg part of this endoskeleton
var/obj/item/bodypart/l_leg/robot/l_leg = null
var/obj/item/bodypart/leg/left/robot/l_leg = null
/// Right leg part of this endoskeleton
var/obj/item/bodypart/r_leg/robot/r_leg = null
var/obj/item/bodypart/leg/right/robot/r_leg = null
/// Chest part of this endoskeleton
var/obj/item/bodypart/chest/robot/chest = null
/// Head part of this endoskeleton
Expand Down Expand Up @@ -168,7 +168,7 @@
else
to_chat(user, span_warning("You need one sheet of metal to start building ED-209!"))
return
else if(istype(W, /obj/item/bodypart/l_leg/robot))
else if(istype(W, /obj/item/bodypart/leg/left/robot))
if(l_leg)
return
if(!user.transferItemToLoc(W, src))
Expand All @@ -178,8 +178,8 @@
l_leg = W
update_appearance(UPDATE_ICON)

else if(istype(W, /obj/item/bodypart/r_leg/robot))
var/obj/item/bodypart/r_leg/robot/L = W
else if(istype(W, /obj/item/bodypart/leg/right/robot))
var/obj/item/bodypart/leg/right/robot/L = W
if(L.use_digitigrade)
to_chat(user, span_warning("You can only install plantigrade legs on [src]!"))
return
Expand All @@ -193,7 +193,7 @@
update_appearance(UPDATE_ICON)

else if(istype(W, /obj/item/bodypart/l_arm/robot))
var/obj/item/bodypart/l_leg/robot/L = W
var/obj/item/bodypart/leg/left/robot/L = W
if(L.use_digitigrade)
to_chat(user, span_warning("You can only install plantigrade legs on [src]!"))
return
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/structures/crates_lockers/crates.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@
new /obj/item/bodypart/l_arm/robot/surplus(src)
new /obj/item/bodypart/r_arm/robot/surplus(src)
new /obj/item/bodypart/r_arm/robot/surplus(src)
new /obj/item/bodypart/l_leg/robot/surplus(src)
new /obj/item/bodypart/l_leg/robot/surplus(src)
new /obj/item/bodypart/r_leg/robot/surplus(src)
new /obj/item/bodypart/r_leg/robot/surplus(src)
new /obj/item/bodypart/leg/left/robot/surplus(src)
new /obj/item/bodypart/leg/left/robot/surplus(src)
new /obj/item/bodypart/leg/right/robot/surplus(src)
new /obj/item/bodypart/leg/right/robot/surplus(src)

/obj/structure/closet/crate/radiation
desc = "A crate with a radiation sign on it."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/devil/true_devil/_true_devil.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
mob_size = MOB_SIZE_LARGE
held_items = list(null, null)
bodyparts = list(/obj/item/bodypart/chest/devil, /obj/item/bodypart/head/devil, /obj/item/bodypart/l_arm/devil,
/obj/item/bodypart/r_arm/devil, /obj/item/bodypart/r_leg/devil, /obj/item/bodypart/l_leg/devil)
/obj/item/bodypart/r_arm/devil, /obj/item/bodypart/leg/right/devil, /obj/item/bodypart/leg/left/devil)
hud_type = /datum/hud/devil
var/ascended = FALSE
var/mob/living/oldform
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/eldritch_cult/transmutations/ash_transmutations.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

/datum/eldritch_transmutation/curse/paralysis
name = "Curse of Paralysis"
required_atoms = list(/obj/item/kitchen/knife,/obj/effect/decal/cleanable/blood,/obj/item/bodypart/l_leg,/obj/item/bodypart/r_leg,/obj/item/hatchet)
required_atoms = list(/obj/item/kitchen/knife,/obj/effect/decal/cleanable/blood,/obj/item/bodypart/leg/left,/obj/item/bodypart/leg/right,/obj/item/hatchet)
timer = 5 MINUTES
required_shit_list = "A knife, a pool of blood, a left and right leg, and a hatchet. Requires an item touched by the to-be victim."

Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/shoes/_shoes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
/obj/item/clothing/shoes/suicide_act(mob/living/carbon/user)
if(rand(2)>1)
user.visible_message(span_suicide("[user] begins tying \the [src] up waaay too tightly! It looks like [user.p_theyre()] trying to commit suicide!"))
var/obj/item/bodypart/l_leg = user.get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/r_leg = user.get_bodypart(BODY_ZONE_R_LEG)
var/obj/item/bodypart/leg/left/l_leg = user.get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/leg/right/r_leg = user.get_bodypart(BODY_ZONE_R_LEG)
if(l_leg)
l_leg.dismember()
playsound(user,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
var/custom_pixel_y_offset = 0
deathsound = 'sound/voice/hiss6.ogg'
bodyparts = list(/obj/item/bodypart/chest/alien, /obj/item/bodypart/head/alien, /obj/item/bodypart/l_arm/alien,
/obj/item/bodypart/r_arm/alien, /obj/item/bodypart/r_leg/alien, /obj/item/bodypart/l_leg/alien)
/obj/item/bodypart/r_arm/alien, /obj/item/bodypart/leg/right/alien, /obj/item/bodypart/leg/left/alien)

GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list(
/datum/strippable_item/hand/left,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/carbon_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
var/tinttotal = 0 // Total level of visualy impairing items

var/list/bodyparts = list(/obj/item/bodypart/chest, /obj/item/bodypart/head, /obj/item/bodypart/l_arm,
/obj/item/bodypart/r_arm, /obj/item/bodypart/r_leg, /obj/item/bodypart/l_leg)
/obj/item/bodypart/r_arm, /obj/item/bodypart/leg/right, /obj/item/bodypart/leg/left)
//Gets filled up in create_bodyparts()

var/list/hand_bodyparts = list() //a collection of arms (or actually whatever the fug /bodyparts you monsters use to wreck my systems)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/human.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,8 @@
return dna?.species?.get_butt_sprite(src)

/mob/living/carbon/human/get_footprint_sprite()
var/obj/item/bodypart/l_leg/left_leg = get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/r_leg/right_leg = get_bodypart(BODY_ZONE_R_LEG)
var/obj/item/bodypart/leg/left/left_leg = get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/leg/right/right_leg = get_bodypart(BODY_ZONE_R_LEG)
var/species_id
var/datum/species/species
if(left_leg?.species_id == right_leg?.species_id)
Expand Down
12 changes: 6 additions & 6 deletions code/modules/mob/living/carbon/human/update_icons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ There are several things that need to be remembered:
//Friendly reminder that icon_exists(file, state, scream = TRUE) is your friend when debugging this code.
var/icon_file
var/target_overlay = RESOLVE_ICON_STATE(uniform) //Selects proper icon from the vars the clothing has (Search define for more.)
var/obj/item/bodypart/l_leg = get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/r_leg = get_bodypart(BODY_ZONE_R_LEG)
var/obj/item/bodypart/leg/left/l_leg = get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/leg/right/r_leg = get_bodypart(BODY_ZONE_R_LEG)
var/obj/item/bodypart/chest/chest = get_bodypart(BODY_ZONE_CHEST)
uniform.species_fitted = null
if(uniform.adjusted)
Expand Down Expand Up @@ -381,8 +381,8 @@ There are several things that need to be remembered:

if(shoes)
var/target_overlay = RESOLVE_ICON_STATE(shoes)
var/obj/item/bodypart/l_leg = get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/r_leg = get_bodypart(BODY_ZONE_R_LEG)
var/obj/item/bodypart/leg/left/l_leg = get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/leg/right/r_leg = get_bodypart(BODY_ZONE_R_LEG)
shoes.species_fitted = null
if(istype(shoes, /obj/item/clothing/shoes))
var/obj/item/clothing/shoes/real_shoes = shoes
Expand Down Expand Up @@ -508,8 +508,8 @@ There are several things that need to be remembered:
var/obj/item/bodypart/chest/chest = get_bodypart(BODY_ZONE_CHEST)
var/icon_to_use = DEFAULT_SUIT_FILE
suit.species_fitted = null
var/obj/item/bodypart/l_leg = get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/r_leg = get_bodypart(BODY_ZONE_R_LEG)
var/obj/item/bodypart/leg/left/l_leg = get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/leg/right/r_leg = get_bodypart(BODY_ZONE_R_LEG)
if(l_leg?.species_id == r_leg?.species_id == SPECIES_VOX)//for Vox, it's the Vox legs that make regular sprites not fit
if(icon_exists(suit.sprite_sheets[l_leg.species_id], suit.icon_state))
icon_to_use = suit.sprite_sheets[l_leg.species_id]
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/monkey/monkey.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
unique_name = TRUE
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
bodyparts = list(/obj/item/bodypart/chest/monkey, /obj/item/bodypart/head/monkey, /obj/item/bodypart/l_arm/monkey,
/obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/r_leg/monkey, /obj/item/bodypart/l_leg/monkey)
/obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/leg/right/monkey, /obj/item/bodypart/leg/left/monkey)
hud_type = /datum/hud/monkey
blood_volume = BLOOD_VOLUME_MONKEY // Yogs -- Makes monkeys/xenos have different amounts of blood from normal carbonbois
can_be_held = TRUE
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/silicon/robot/robot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,8 +858,8 @@
new /obj/item/key/janitor(T)
else
new /obj/item/robot_suit(T)
new /obj/item/bodypart/l_leg/robot(T)
new /obj/item/bodypart/r_leg/robot(T)
new /obj/item/bodypart/leg/left/robot(T)
new /obj/item/bodypart/leg/right/robot(T)
new /obj/item/stack/cable_coil(T, 1)
new /obj/item/bodypart/chest/robot(T)
new /obj/item/bodypart/l_arm/robot(T)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/bot/construction.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
..()
switch(build_step)
if(ASSEMBLY_FIRST_STEP, ASSEMBLY_SECOND_STEP)
if(istype(W, /obj/item/bodypart/l_leg/robot) || istype(W, /obj/item/bodypart/r_leg/robot))
if(istype(W, /obj/item/bodypart/leg/left/robot) || istype(W, /obj/item/bodypart/leg/right/robot))
if(!user.temporarilyRemoveItemFromInventory(W))
return
to_chat(user, span_notice("You add [W] to [src]."))
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/simple_animal/bot/ed209bot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,9 @@ Auto Patrol[]"},
G.update_appearance(UPDATE_ICON)

if(prob(50))
new /obj/item/bodypart/l_leg/robot(Tsec)
new /obj/item/bodypart/leg/left/robot(Tsec)
if(prob(25))
new /obj/item/bodypart/r_leg/robot(Tsec)
new /obj/item/bodypart/leg/right/robot(Tsec)
if(prob(25))//50% chance for a helmet OR vest
if(prob(50))
new /obj/item/clothing/head/helmet(Tsec)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/research/designs/limbgrower_designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@
id = "leftleg"
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
build_path = /obj/item/bodypart/l_leg
build_path = /obj/item/bodypart/leg/left
category = list("initial","human","lizard","fly","moth","plasmaman","polysmorph","vox")

/datum/design/rightleg
name = "Right Leg"
id = "rightleg"
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
build_path = /obj/item/bodypart/r_leg
build_path = /obj/item/bodypart/leg/right
category = list("initial","human","lizard","fly","moth","plasmaman","polysmorph","vox")

/datum/design/digi_leftleg
name = "Digitigrade Left Leg"
id = "digi_leftleg"
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 30)
build_path = /obj/item/bodypart/l_leg/digitigrade
build_path = /obj/item/bodypart/leg/left/digitigrade
category = list("initial","lizard","polysmorph")

/datum/design/digi_rightleg
name = "Digitigrade Right Leg"
id = "digi_rightleg"
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 30)
build_path = /obj/item/bodypart/r_leg/digitigrade
build_path = /obj/item/bodypart/leg/right/digitigrade
category = list("initial","lizard","polysmorph")

//Non-limb limb designs
Expand Down
4 changes: 2 additions & 2 deletions code/modules/research/designs/mechfabricator_designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
name = "Cyborg Left Leg"
id = "borg_l_leg"
build_type = MECHFAB
build_path = /obj/item/bodypart/l_leg/robot
build_path = /obj/item/bodypart/leg/left/robot
materials = list(/datum/material/iron=10000)
construction_time = 200
category = list("Cyborg")
Expand All @@ -57,7 +57,7 @@
name = "Cyborg Right Leg"
id = "borg_r_leg"
build_type = MECHFAB
build_path = /obj/item/bodypart/r_leg/robot
build_path = /obj/item/bodypart/leg/right/robot
materials = list(/datum/material/iron=10000)
construction_time = 200
category = list("Cyborg")
Expand Down
4 changes: 2 additions & 2 deletions code/modules/surgery/bodyparts/dismemberment.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
C.update_inv_gloves() //to remove the bloody hands overlay


/obj/item/bodypart/r_leg/drop_limb(special)
/obj/item/bodypart/leg/right/drop_limb(special)
if(owner && !special)
if(owner.legcuffed)
owner.legcuffed.forceMove(owner.drop_location()) //At this point bodypart is still in nullspace
Expand All @@ -266,7 +266,7 @@
owner.dropItemToGround(owner.shoes, TRUE)
..()

/obj/item/bodypart/l_leg/drop_limb(special) //copypasta
/obj/item/bodypart/leg/left/drop_limb(special) //copypasta
if(owner && !special)
if(owner.legcuffed)
owner.legcuffed.forceMove(owner.drop_location())
Expand Down
Loading
Loading