Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit e979bd4

Browse files
authored
ugh (#22965)
1 parent 5729598 commit e979bd4

File tree

29 files changed

+128
-176
lines changed

29 files changed

+128
-176
lines changed

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,9 +473,9 @@
473473
pixel_x = -9;
474474
pixel_y = -9
475475
},
476-
/obj/item/bodypart/l_leg,
476+
/obj/item/bodypart/leg/left,
477477
/obj/item/bodypart/r_arm,
478-
/obj/item/bodypart/r_leg{
478+
/obj/item/bodypart/leg/right{
479479
pixel_x = 8;
480480
pixel_y = 4
481481
},

_maps/RandomRuins/StationRuins/maint/3x3/3x3_deltaorgantrade.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
/obj/effect/turf_decal/tile/red{
7777
dir = 8
7878
},
79-
/obj/item/bodypart/r_leg,
79+
/obj/item/bodypart/leg/right,
8080
/obj/effect/decal/cleanable/blood/old,
8181
/turf/open/floor/plasteel,
8282
/area/template_noop)

_maps/templates/shipbreaker/old_robotics.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
/obj/item/stack/sheet/mineral/gold,
7979
/obj/item/stack/sheet/mineral/gold,
8080
/obj/item/stack/sheet/mineral/gold,
81-
/obj/item/bodypart/r_leg/ipc/sgmipc,
81+
/obj/item/bodypart/leg/right/ipc/sgmipc,
8282
/turf/open/floor/engine/airless,
8383
/area/template_noop)
8484
"K" = (

code/datums/components/bloodysoles.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ Like its parent but can be applied to carbon mobs instead of clothing items
237237
/datum/component/bloodysoles/feet/update_icon()
238238
. = list()
239239
if(ishuman(wielder))// Monkeys get no bloody feet :(
240-
var/obj/item/bodypart/l_leg/left_leg = wielder.get_bodypart(BODY_ZONE_L_LEG)
241-
var/obj/item/bodypart/r_leg/right_leg = wielder.get_bodypart(BODY_ZONE_R_LEG)
240+
var/obj/item/bodypart/leg/left/left_leg = wielder.get_bodypart(BODY_ZONE_L_LEG)
241+
var/obj/item/bodypart/leg/right/right_leg = wielder.get_bodypart(BODY_ZONE_R_LEG)
242242
if(left_leg?.species_id == right_leg?.species_id && icon_exists(bloody_feet.icon, "shoeblood_[left_leg.species_id]"))
243243
bloody_feet.icon_state = "shoeblood_[left_leg.species_id]"
244244
else if(HAS_TRAIT(wielder, TRAIT_DIGITIGRADE) && !HAS_TRAIT(wielder, TRAIT_DIGI_SQUISH))

code/datums/components/crafting/recipes.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
reqs = list(/obj/item/robot_suit = 1,
7676
/obj/item/clothing/head/helmet = 1,
7777
/obj/item/clothing/suit/armor/vest = 1,
78-
/obj/item/bodypart/l_leg/robot = 1,
79-
/obj/item/bodypart/r_leg/robot = 1,
78+
/obj/item/bodypart/leg/left/robot = 1,
79+
/obj/item/bodypart/leg/right/robot = 1,
8080
/obj/item/stack/sheet/metal = 1,
8181
/obj/item/stack/cable_coil = 1,
8282
/obj/item/gun/energy/e_gun/dragnet = 1,
@@ -805,7 +805,7 @@
805805

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

816816
/datum/crafting_recipe/rightprostheticleg
817817
name = "Right Prosthetic Leg"
818-
result = /obj/item/bodypart/r_leg/robot/surplus
818+
result = /obj/item/bodypart/leg/right/robot/surplus
819819
time = 10 SECONDS
820820
reqs = list(/obj/item/stack/sheet/metal = 5,
821821
/obj/item/stack/cable_coil = 10,

code/datums/status_effects/wound_effects.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
alert_type = /atom/movable/screen/alert/status_effect/limp
3232
var/msg_stage = 0//so you dont get the most intense messages immediately
3333
/// The left leg of the limping person
34-
var/obj/item/bodypart/l_leg/left
34+
var/obj/item/bodypart/leg/left/left
3535
/// The right leg of the limping person
36-
var/obj/item/bodypart/r_leg/right
36+
var/obj/item/bodypart/leg/right/right
3737
/// Which leg we're limping with next
3838
var/obj/item/bodypart/next_leg
3939
/// How many deciseconds we limp for on the left leg

code/datums/traits/negative.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,13 +297,13 @@
297297
prosthetic = new/obj/item/bodypart/r_arm/robot/surplus(quirk_holder)
298298
slot_string = "right arm"
299299
if(BODY_ZONE_L_LEG)
300-
var/obj/item/bodypart/l_leg/L = H.get_bodypart(BODY_ZONE_L_LEG)
301-
prosthetic = new/obj/item/bodypart/l_leg/robot/surplus(quirk_holder)
300+
var/obj/item/bodypart/leg/left/L = H.get_bodypart(BODY_ZONE_L_LEG)
301+
prosthetic = new/obj/item/bodypart/leg/left/robot/surplus(quirk_holder)
302302
prosthetic.set_digitigrade(L.use_digitigrade)
303303
slot_string = "left leg"
304304
if(BODY_ZONE_R_LEG)
305-
var/obj/item/bodypart/r_leg/R = H.get_bodypart(BODY_ZONE_R_LEG)
306-
prosthetic = new/obj/item/bodypart/r_leg/robot/surplus(quirk_holder)
305+
var/obj/item/bodypart/leg/right/R = H.get_bodypart(BODY_ZONE_R_LEG)
306+
prosthetic = new/obj/item/bodypart/leg/right/robot/surplus(quirk_holder)
307307
prosthetic.set_digitigrade(R.use_digitigrade)
308308
slot_string = "right leg"
309309
prosthetic.replace_limb(H)

code/game/objects/items/melee/misc.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
return
251251

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

code/game/objects/items/robot/robot_parts.dm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
/// Right arm part of the endoskeleton
1515
var/obj/item/bodypart/r_arm/robot/r_arm = null
1616
/// Left leg part of this endoskeleton
17-
var/obj/item/bodypart/l_leg/robot/l_leg = null
17+
var/obj/item/bodypart/leg/left/robot/l_leg = null
1818
/// Right leg part of this endoskeleton
19-
var/obj/item/bodypart/r_leg/robot/r_leg = null
19+
var/obj/item/bodypart/leg/right/robot/r_leg = null
2020
/// Chest part of this endoskeleton
2121
var/obj/item/bodypart/chest/robot/chest = null
2222
/// Head part of this endoskeleton
@@ -168,7 +168,7 @@
168168
else
169169
to_chat(user, span_warning("You need one sheet of metal to start building ED-209!"))
170170
return
171-
else if(istype(W, /obj/item/bodypart/l_leg/robot))
171+
else if(istype(W, /obj/item/bodypart/leg/left/robot))
172172
if(l_leg)
173173
return
174174
if(!user.transferItemToLoc(W, src))
@@ -178,8 +178,8 @@
178178
l_leg = W
179179
update_appearance(UPDATE_ICON)
180180

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

195195
else if(istype(W, /obj/item/bodypart/l_arm/robot))
196-
var/obj/item/bodypart/l_leg/robot/L = W
196+
var/obj/item/bodypart/leg/left/robot/L = W
197197
if(L.use_digitigrade)
198198
to_chat(user, span_warning("You can only install plantigrade legs on [src]!"))
199199
return

code/game/objects/structures/crates_lockers/crates.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@
173173
new /obj/item/bodypart/l_arm/robot/surplus(src)
174174
new /obj/item/bodypart/r_arm/robot/surplus(src)
175175
new /obj/item/bodypart/r_arm/robot/surplus(src)
176-
new /obj/item/bodypart/l_leg/robot/surplus(src)
177-
new /obj/item/bodypart/l_leg/robot/surplus(src)
178-
new /obj/item/bodypart/r_leg/robot/surplus(src)
179-
new /obj/item/bodypart/r_leg/robot/surplus(src)
176+
new /obj/item/bodypart/leg/left/robot/surplus(src)
177+
new /obj/item/bodypart/leg/left/robot/surplus(src)
178+
new /obj/item/bodypart/leg/right/robot/surplus(src)
179+
new /obj/item/bodypart/leg/right/robot/surplus(src)
180180

181181
/obj/structure/closet/crate/radiation
182182
desc = "A crate with a radiation sign on it."

0 commit comments

Comments
 (0)