diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm
index 944b4c01e16..75e3cdb6200 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm
@@ -97,12 +97,12 @@
/obj/item/stock_parts/micro_laser/quadultra,
/obj/item/stock_parts/micro_laser/quadultra,
/obj/item/stock_parts/micro_laser/quadultra,
-/obj/item/stock_parts/manipulator/femto,
-/obj/item/stock_parts/manipulator/femto,
-/obj/item/stock_parts/manipulator/femto,
-/obj/item/stock_parts/manipulator/femto,
-/obj/item/stock_parts/manipulator/femto,
-/obj/item/stock_parts/manipulator/femto,
+/obj/item/stock_parts/servo/femto,
+/obj/item/stock_parts/servo/femto,
+/obj/item/stock_parts/servo/femto,
+/obj/item/stock_parts/servo/femto,
+/obj/item/stock_parts/servo/femto,
+/obj/item/stock_parts/servo/femto,
/obj/structure/rack,
/obj/effect/mapping_helpers/airalarm/syndicate_access,
/obj/machinery/airalarm/directional/north,
diff --git a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
index 10bfee1222c..bfc2ce33e04 100644
--- a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
+++ b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
@@ -1190,7 +1190,7 @@
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/table,
/obj/item/stock_parts/micro_laser/ultra,
-/obj/item/stock_parts/manipulator/pico,
+/obj/item/stock_parts/servo/pico,
/turf/open/floor/iron/white,
/area/misc/anomaly_research)
"Fs" = (
diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
index 174755f0287..60e12bfecd2 100644
--- a/_maps/RandomRuins/SpaceRuins/bus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -265,7 +265,7 @@
/area/ruin/space)
"Ds" = (
/obj/item/stack/rods/fifty,
-/obj/item/stock_parts/manipulator/femto,
+/obj/item/stock_parts/servo/femto,
/turf/open/misc/asteroid/airless,
/area/ruin/space)
"ER" = (
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 6d2d44e03a9..8320f9dac78 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -4173,7 +4173,7 @@
/area/ruin/space/ancientstation/delta/rnd)
"oj" = (
/obj/structure/table,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/micro_laser,
/obj/item/stack/cable_coil,
diff --git a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
index 8f251fa24d3..f94a92e06b0 100644
--- a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
@@ -53,7 +53,7 @@
"an" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
/obj/effect/mapping_helpers/broken_floor,
/obj/structure/cable,
/turf/open/floor/iron/airless,
@@ -1018,7 +1018,7 @@
/turf/open/floor/wood,
/area/ruin/space/ks13/service/chapel_office)
"oD" = (
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
/obj/item/stock_parts/scanning_module{
pixel_x = -11
},
@@ -3879,7 +3879,7 @@
/obj/item/stock_parts/capacitor{
pixel_y = 4
},
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/engineering/secure_storage)
"DM" = (
@@ -5589,7 +5589,7 @@
/area/ruin/space/ks13/command/bridge_hall)
"Nc" = (
/obj/structure/frame/machine,
-/obj/item/stock_parts/manipulator{
+/obj/item/stock_parts/servo{
pixel_x = -5
},
/obj/effect/mapping_helpers/broken_floor,
@@ -5605,7 +5605,7 @@
/area/ruin/space/ks13/engineering/atmos)
"Nh" = (
/obj/structure/table,
-/obj/item/stock_parts/manipulator{
+/obj/item/stock_parts/servo{
pixel_x = 3
},
/obj/item/stock_parts/matter_bin{
@@ -5764,7 +5764,7 @@
"NZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/manipulator{
+/obj/item/stock_parts/servo{
pixel_x = -8;
pixel_y = 7
},
@@ -7490,7 +7490,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/medical/medbay)
"WF" = (
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/engineering/grav_gen)
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 1586d6d5a9a..292347baa98 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -2759,8 +2759,8 @@
/area/awaymission/undergroundoutpost45/research)
"hG" = (
/obj/structure/table/glass,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/micro_laser,
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
index 5fdc0103009..02a78ddcfb3 100644
--- a/_maps/map_files/Birdshot/birdshot.dmm
+++ b/_maps/map_files/Birdshot/birdshot.dmm
@@ -9225,10 +9225,10 @@
"dhf" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/table,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
/obj/item/stock_parts/micro_laser/high,
/obj/item/stock_parts/micro_laser/high,
/obj/item/stock_parts/micro_laser/high,
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 03b5f59ceb3..1605bf11197 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -6079,8 +6079,8 @@
pixel_y = 3
},
/obj/item/stock_parts/capacitor,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
/obj/machinery/light_switch/directional/east,
/obj/effect/turf_decal/siding/purple{
dir = 8
@@ -77728,8 +77728,8 @@
pixel_y = 3
},
/obj/item/stock_parts/capacitor,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
/obj/machinery/airalarm/directional/east,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 4a30c5df9e8..e9c5c5ad3ff 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -18843,10 +18843,10 @@
"fWl" = (
/obj/structure/table,
/obj/item/stock_parts/micro_laser,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/micro_laser/high,
/obj/item/stock_parts/micro_laser/high,
@@ -22228,7 +22228,7 @@
"gZF" = (
/obj/structure/table/glass,
/obj/item/hemostat,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
/obj/item/storage/bag/trash,
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
@@ -51512,8 +51512,8 @@
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/capacitor,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
/turf/open/floor/iron/white/side{
dir = 5
},
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index a1ff2356821..f3797864d8a 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -49857,10 +49857,10 @@
"rTg" = (
/obj/structure/table,
/obj/item/stock_parts/micro_laser,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/micro_laser/high,
/obj/item/stock_parts/micro_laser/high,
@@ -57736,8 +57736,8 @@
pixel_x = 3;
pixel_y = 3
},
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
/turf/open/floor/iron,
/area/station/science/lab)
"uDP" = (
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index e93563b0c36..8d1196dd826 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -260,7 +260,7 @@
pixel_y = 6
},
/obj/item/stock_parts/matter_bin,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
/obj/item/stack/cable_coil,
/obj/item/stack/sheet/glass/fifty,
/turf/open/floor/iron,
@@ -3165,7 +3165,7 @@
"aOi" = (
/obj/structure/table,
/obj/item/stock_parts/micro_laser,
-/obj/item/stock_parts/manipulator{
+/obj/item/stock_parts/servo{
pixel_x = 15;
pixel_y = 4
},
@@ -36718,7 +36718,7 @@
/area/station/maintenance/floor3/starboard/fore)
"jNR" = (
/obj/structure/table,
-/obj/item/stock_parts/manipulator{
+/obj/item/stock_parts/servo{
pixel_x = 2;
pixel_y = -4
},
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index 61daa4c0a1c..e1d6c55cc0b 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -19901,8 +19901,8 @@
pixel_y = 3
},
/obj/item/stock_parts/capacitor,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/servo,
+/obj/item/stock_parts/servo,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/turf/open/floor/iron/white,
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 4ab5a5b6c0e..84e56679354 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c
list(//tier 1 stock parts
/obj/item/stock_parts/capacitor = 1,
- /obj/item/stock_parts/manipulator = 1,
+ /obj/item/stock_parts/servo = 1,
/obj/item/stock_parts/matter_bin = 1,
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/scanning_module = 1,
diff --git a/code/datums/components/crafting/equipment.dm b/code/datums/components/crafting/equipment.dm
index f7149d56ec9..9724e07da49 100644
--- a/code/datums/components/crafting/equipment.dm
+++ b/code/datums/components/crafting/equipment.dm
@@ -46,11 +46,11 @@
reqs = list(
/obj/item/stack/sheet/iron = 10,
/obj/item/stack/rods = 8,
- /obj/item/stock_parts/manipulator = 2,
+ /obj/item/stock_parts/servo = 2,
/obj/item/stock_parts/capacitor = 1,
)
parts = list(
- /obj/item/stock_parts/manipulator = 2,
+ /obj/item/stock_parts/servo = 2,
/obj/item/stock_parts/capacitor = 1,
)
tool_behaviors = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WRENCH)
@@ -74,7 +74,7 @@
/obj/item/stack/sheet/iron = 4,
/obj/item/stack/rods = 4,
/obj/item/stack/cable_coil = 10,
- /obj/item/stock_parts/manipulator = 2,
+ /obj/item/stock_parts/servo = 2,
/obj/item/assembly/signaler = 1,
)
tool_behaviors = list(TOOL_WELDER, TOOL_SCREWDRIVER)
diff --git a/code/datums/components/crafting/weapon_ammo.dm b/code/datums/components/crafting/weapon_ammo.dm
index e7ad919c1de..912c3358ee7 100644
--- a/code/datums/components/crafting/weapon_ammo.dm
+++ b/code/datums/components/crafting/weapon_ammo.dm
@@ -6,7 +6,7 @@
/obj/item/rcd_ammo = 1,
/datum/reagent/gunpowder = 10,
/datum/reagent/consumable/ethanol/rum = 10,
- /obj/item/stock_parts/manipulator = 2,
+ /obj/item/stock_parts/servo = 2,
)
tool_behaviors = list(TOOL_SCREWDRIVER)
time = 0.5 SECONDS
diff --git a/code/datums/components/riding/riding_vehicle.dm b/code/datums/components/riding/riding_vehicle.dm
index f7a16ce7481..5f0fe3c84e2 100644
--- a/code/datums/components/riding/riding_vehicle.dm
+++ b/code/datums/components/riding/riding_vehicle.dm
@@ -267,8 +267,8 @@
var/delay_multiplier = 6.7 // magic number from wheelchair code
var/obj/vehicle/ridden/wheelchair/motorized/our_chair = parent
- for(var/datum/stock_part/manipulator/manipulator in our_chair.component_parts)
- speed += manipulator.tier
+ for(var/datum/stock_part/servo/servo in our_chair.component_parts)
+ speed += servo.tier
vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * delay_multiplier) / speed
return ..()
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index e4c26ef0073..60fd0711426 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -346,9 +346,9 @@
materials.max_amount = mat_capacity
var/efficiency=1.8
- for(var/datum/stock_part/manipulator/new_manipulator in component_parts)
- efficiency -= new_manipulator.tier * 0.2
- creation_efficiency = max(1,efficiency) // creation_efficiency goes 1.6 -> 1.4 -> 1.2 -> 1 per level of manipulator efficiency
+ for(var/datum/stock_part/servo/new_servo in component_parts)
+ efficiency -= new_servo.tier * 0.2
+ creation_efficiency = max(1,efficiency) // creation_efficiency goes 1.6 -> 1.4 -> 1.2 -> 1 per level of servo efficiency
/obj/machinery/autolathe/examine(mob/user)
. += ..()
diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm
index 067a6b990a7..36f8048ea1f 100644
--- a/code/game/machinery/gulag_teleporter.dm
+++ b/code/game/machinery/gulag_teleporter.dm
@@ -176,7 +176,7 @@ The console is located at computer/gulag_teleporter.dm
req_components = list(
/obj/item/stack/ore/bluespace_crystal = 2,
/datum/stock_part/scanning_module = 1,
- /obj/item/stock_parts/manipulator = 1,
+ /obj/item/stock_parts/servo = 1,
)
def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial)
diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm
index 94c4b6590e4..c1d87cc2605 100644
--- a/code/game/machinery/launch_pad.dm
+++ b/code/game/machinery/launch_pad.dm
@@ -26,8 +26,8 @@
/obj/machinery/launchpad/RefreshParts()
. = ..()
var/max_range_multiplier = 0
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- max_range_multiplier += manipulator.tier
+ for(var/datum/stock_part/servo/servo in component_parts)
+ max_range_multiplier += servo.tier
range = initial(range)
range *= max_range_multiplier
diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm
index 6c751fe9c63..6f9332cca95 100644
--- a/code/game/machinery/limbgrower.dm
+++ b/code/game/machinery/limbgrower.dm
@@ -254,8 +254,8 @@
reagents.maximum_volume += our_beaker.volume
our_beaker.reagents.trans_to(src, our_beaker.reagents.total_volume)
production_coefficient = 1.25
- for(var/datum/stock_part/manipulator/our_manipulator in component_parts)
- production_coefficient -= our_manipulator.tier * 0.25
+ for(var/datum/stock_part/servo/our_servo in component_parts)
+ production_coefficient -= our_servo.tier * 0.25
production_coefficient = clamp(production_coefficient, 0, 1) // coefficient goes from 1 -> 0.75 -> 0.5 -> 0.25
/obj/machinery/limbgrower/examine(mob/user)
diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm
index 014022ce1a1..4fdf26e2817 100644
--- a/code/game/machinery/quantum_pad.dm
+++ b/code/game/machinery/quantum_pad.dm
@@ -46,8 +46,8 @@
E += capacitor.tier
power_efficiency = E
E = 0
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- E += manipulator.tier
+ for(var/datum/stock_part/servo/servo in component_parts)
+ E += servo.tier
teleport_speed = initial(teleport_speed)
teleport_speed -= (E*10)
teleport_cooldown = initial(teleport_cooldown)
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 71903cbf543..0eaf8e4c163 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -48,8 +48,8 @@
repairs = 0
for(var/datum/stock_part/capacitor/capacitor in component_parts)
recharge_speed += capacitor.tier * 100
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- repairs += manipulator.tier - 1
+ for(var/datum/stock_part/servo/servo in component_parts)
+ repairs += servo.tier - 1
for(var/obj/item/stock_parts/cell/cell in component_parts)
recharge_speed *= cell.maxcharge / 10000
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 92440c95b65..bcb6d4b3f65 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -53,8 +53,8 @@
/obj/machinery/recycler/RefreshParts()
. = ..()
var/amt_made = 0
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- amt_made = 12.5 * manipulator.tier //% of materials salvaged
+ for(var/datum/stock_part/servo/servo in component_parts)
+ amt_made = 12.5 * servo.tier //% of materials salvaged
amount_produced = min(50, amt_made) + 50
var/datum/component/butchering/butchering = GetComponent(/datum/component/butchering/recycler)
butchering.effectiveness = amount_produced
diff --git a/code/game/machinery/sleepers.dm b/code/game/machinery/sleepers.dm
index 377fc71abc7..6f7cee63d87 100644
--- a/code/game/machinery/sleepers.dm
+++ b/code/game/machinery/sleepers.dm
@@ -70,8 +70,8 @@
min_health = initial(min_health) * matterbin_rating
available_chems.Cut()
- for(var/datum/stock_part/manipulator/manipulators in component_parts)
- for(var/i in 1 to manipulators.tier)
+ for(var/datum/stock_part/servo/servos in component_parts)
+ for(var/i in 1 to servos.tier)
available_chems |= possible_chems[i]
reset_chem_buttons()
diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
index 747ea1784f9..db1c9612f99 100644
--- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
@@ -15,7 +15,7 @@
build_path = /obj/machinery/bsa/front
specific_parts = TRUE
req_components = list(
- /datum/stock_part/manipulator/tier4 = 5,
+ /datum/stock_part/servo/tier4 = 5,
/obj/item/stack/cable_coil = 2)
/obj/item/circuitboard/machine/bsa/middle
@@ -33,7 +33,7 @@
specific_parts = TRUE
req_components = list(
/datum/stock_part/capacitor/tier3 = 5,
- /datum/stock_part/manipulator/tier3 = 5,
+ /datum/stock_part/servo/tier3 = 5,
/obj/item/stack/cable_coil = 2)
//Engineering
@@ -61,7 +61,7 @@
build_path = /obj/machinery/autolathe
req_components = list(
/datum/stock_part/matter_bin = 3,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/machine/grounding_rod
@@ -77,7 +77,7 @@
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
build_path = /obj/machinery/telecomms/broadcaster
req_components = list(
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/obj/item/stack/cable_coil = 1,
/datum/stock_part/filter = 1,
/datum/stock_part/crystal = 1,
@@ -88,7 +88,7 @@
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
build_path = /obj/machinery/telecomms/bus
req_components = list(
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/obj/item/stack/cable_coil = 1,
/datum/stock_part/filter = 1)
@@ -97,7 +97,7 @@
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
build_path = /obj/machinery/telecomms/hub
req_components = list(
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/obj/item/stack/cable_coil = 2,
/datum/stock_part/filter = 2)
@@ -106,7 +106,7 @@
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
build_path = /obj/machinery/telecomms/message_server
req_components = list(
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/obj/item/stack/cable_coil = 1,
/datum/stock_part/filter = 3)
@@ -115,7 +115,7 @@
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
build_path = /obj/machinery/telecomms/processor
req_components = list(
- /datum/stock_part/manipulator = 3,
+ /datum/stock_part/servo = 3,
/datum/stock_part/filter = 1,
/datum/stock_part/treatment = 2,
/datum/stock_part/analyzer = 1,
@@ -129,7 +129,7 @@
req_components = list(
/datum/stock_part/ansible = 1,
/datum/stock_part/filter = 1,
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/datum/stock_part/micro_laser = 1)
/obj/item/circuitboard/machine/telecomms/relay
@@ -137,7 +137,7 @@
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
build_path = /obj/machinery/telecomms/relay
req_components = list(
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/obj/item/stack/cable_coil = 2,
/datum/stock_part/filter = 2)
@@ -146,7 +146,7 @@
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
build_path = /obj/machinery/telecomms/server
req_components = list(
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/obj/item/stack/cable_coil = 1,
/datum/stock_part/filter = 1)
@@ -177,7 +177,7 @@
build_path = /obj/machinery/power/emitter
req_components = list(
/datum/stock_part/micro_laser = 1,
- /datum/stock_part/manipulator = 1)
+ /datum/stock_part/servo = 1)
needs_anchored = FALSE
/obj/item/circuitboard/machine/generator
@@ -380,7 +380,7 @@
build_path = /obj/machinery/component_printer
req_components = list(
/datum/stock_part/matter_bin = 2,
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
)
/obj/item/circuitboard/machine/module_duplicator
@@ -389,7 +389,7 @@
build_path = /obj/machinery/module_duplicator
req_components = list(
/datum/stock_part/matter_bin = 2,
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
)
/obj/item/circuitboard/machine/circuit_imprinter
@@ -398,7 +398,7 @@
build_path = /obj/machinery/rnd/production/circuit_imprinter
req_components = list(
/datum/stock_part/matter_bin = 1,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/obj/item/reagent_containers/cup/beaker = 2)
/obj/item/circuitboard/machine/circuit_imprinter/offstation
@@ -440,7 +440,7 @@
build_path = /obj/machinery/launchpad
req_components = list(
/obj/item/stack/ore/bluespace_crystal = 1,
- /datum/stock_part/manipulator = 1)
+ /datum/stock_part/servo = 1)
def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial)
/obj/item/circuitboard/machine/protolathe
@@ -449,7 +449,7 @@
build_path = /obj/machinery/rnd/production/protolathe
req_components = list(
/datum/stock_part/matter_bin = 2,
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/obj/item/reagent_containers/cup/beaker = 2)
/obj/item/circuitboard/machine/protolathe/offstation
@@ -466,7 +466,7 @@
greyscale_colors = CIRCUIT_COLOR_GENERIC
build_path = /obj/machinery/reagentgrinder/constructed
req_components = list(
- /datum/stock_part/manipulator = 1)
+ /datum/stock_part/servo = 1)
needs_anchored = FALSE
/obj/item/circuitboard/machine/smartfridge
@@ -523,7 +523,7 @@
greyscale_colors = CIRCUIT_COLOR_GENERIC
build_path = /obj/machinery/electrolyzer
req_components = list(
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/datum/stock_part/capacitor = 2,
/obj/item/stack/cable_coil = 5,
/obj/item/stack/sheet/glass = 1)
@@ -537,7 +537,7 @@
build_path = /obj/machinery/rnd/production/techfab
req_components = list(
/datum/stock_part/matter_bin = 2,
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/obj/item/reagent_containers/cup/beaker = 2)
/obj/item/circuitboard/machine/techfab/department
@@ -654,7 +654,7 @@
/datum/stock_part/crystal = 1,
/datum/stock_part/scanning_module = 1,
/datum/stock_part/micro_laser = 1,
- /datum/stock_part/manipulator = 1,)
+ /datum/stock_part/servo = 1,)
//Medical
@@ -665,7 +665,7 @@
req_components = list(
/datum/stock_part/matter_bin = 2,
/datum/stock_part/capacitor = 1,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/cell = 1)
def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high)
@@ -677,7 +677,7 @@
req_components = list(
/datum/stock_part/matter_bin/tier4 = 2,
/datum/stock_part/capacitor/tier4 = 2,
- /datum/stock_part/manipulator/tier4 = 2,
+ /datum/stock_part/servo/tier4 = 2,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/cell/bluespace = 1,
)
@@ -688,7 +688,7 @@
req_components = list(
/datum/stock_part/matter_bin/tier4 = 2,
/datum/stock_part/capacitor/tier4 = 2,
- /datum/stock_part/manipulator/tier4 = 2,
+ /datum/stock_part/servo/tier4 = 2,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/cell/bluespace = 1,
)
@@ -702,7 +702,7 @@
req_components = list(
/datum/stock_part/matter_bin/tier4 = 2,
/datum/stock_part/capacitor/tier4 = 2,
- /datum/stock_part/manipulator/tier4 = 2,
+ /datum/stock_part/servo/tier4 = 2,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/cell/bluespace = 1,
)
@@ -731,7 +731,7 @@
desc = "You can turn the \"mode selection\" dial using a screwdriver."
req_components = list(
/obj/item/reagent_containers/cup/beaker = 2,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/obj/item/stack/sheet/glass = 1)
needs_anchored = FALSE
@@ -799,7 +799,7 @@
greyscale_colors = CIRCUIT_COLOR_MEDICAL
build_path = /obj/machinery/limbgrower
req_components = list(
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/obj/item/reagent_containers/cup/beaker = 2,
/obj/item/stack/sheet/glass = 1)
@@ -808,7 +808,7 @@
greyscale_colors = CIRCUIT_COLOR_MEDICAL
build_path = /obj/machinery/limbgrower
req_components = list(
- /datum/stock_part/manipulator/tier4 = 1,
+ /datum/stock_part/servo/tier4 = 1,
/obj/item/reagent_containers/cup/beaker/bluespace = 2,
/obj/item/stack/sheet/glass = 1)
@@ -823,7 +823,7 @@
build_path = /obj/machinery/sleeper
req_components = list(
/datum/stock_part/matter_bin = 1,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/stack/sheet/glass = 2)
@@ -831,7 +831,7 @@
build_path = /obj/machinery/sleeper/syndie/fullupgrade
req_components = list(
/datum/stock_part/matter_bin/tier4 = 1,
- /datum/stock_part/manipulator/tier4 = 1,
+ /datum/stock_part/servo/tier4 = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/stack/sheet/glass = 2)
@@ -846,7 +846,7 @@
req_components = list(
/datum/stock_part/matter_bin = 2,
/datum/stock_part/capacitor = 1,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/cell = 1)
needs_anchored = FALSE
@@ -857,7 +857,7 @@
build_path = /obj/machinery/stasis
req_components = list(
/obj/item/stack/cable_coil = 3,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/datum/stock_part/capacitor = 1)
/obj/item/circuitboard/machine/medipen_refiller
@@ -886,7 +886,7 @@
req_components = list(
/datum/stock_part/capacitor = 2,
/obj/item/stock_parts/cell = 1,
- /datum/stock_part/manipulator = 1)
+ /datum/stock_part/servo = 1)
def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high)
/obj/item/circuitboard/machine/destructive_analyzer
@@ -895,7 +895,7 @@
build_path = /obj/machinery/rnd/destructive_analyzer
req_components = list(
/datum/stock_part/scanning_module = 1,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/datum/stock_part/micro_laser = 1)
/obj/item/circuitboard/machine/experimentor
@@ -904,7 +904,7 @@
build_path = /obj/machinery/rnd/experimentor
req_components = list(
/datum/stock_part/scanning_module = 1,
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/datum/stock_part/micro_laser = 2)
/obj/item/circuitboard/machine/mech_recharger
@@ -921,7 +921,7 @@
build_path = /obj/machinery/mecha_part_fabricator
req_components = list(
/datum/stock_part/matter_bin = 2,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/datum/stock_part/micro_laser = 1,
/obj/item/stack/sheet/glass = 1)
@@ -931,7 +931,7 @@
build_path = /obj/machinery/monkey_recycler
req_components = list(
/datum/stock_part/matter_bin = 1,
- /datum/stock_part/manipulator = 1)
+ /datum/stock_part/servo = 1)
needs_anchored = FALSE
/obj/item/circuitboard/machine/processor/slime
@@ -951,7 +951,7 @@
req_components = list(
/obj/item/stack/ore/bluespace_crystal = 1,
/datum/stock_part/capacitor = 1,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/obj/item/stack/cable_coil = 1)
def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial)
@@ -1049,7 +1049,7 @@
build_path = /obj/machinery/biogenerator
req_components = list(
/datum/stock_part/matter_bin = 1,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/stack/sheet/glass = 1)
@@ -1063,7 +1063,7 @@
req_components = list(
/datum/stock_part/matter_bin/tier4 = 2,
/datum/stock_part/capacitor/tier4 = 2,
- /datum/stock_part/manipulator/tier4 = 2,
+ /datum/stock_part/servo/tier4 = 2,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/cell/bluespace = 1,
)
@@ -1078,7 +1078,7 @@
req_components = list(
/datum/stock_part/matter_bin/tier4 = 2,
/datum/stock_part/capacitor/tier4 = 2,
- /datum/stock_part/manipulator/tier4 = 2,
+ /datum/stock_part/servo/tier4 = 2,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/cell/bluespace = 1,
)
@@ -1129,7 +1129,7 @@
build_path = /obj/machinery/dish_drive
req_components = list(
/obj/item/stack/sheet/glass = 1,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/datum/stock_part/matter_bin = 2)
var/suction = TRUE
var/transmit = TRUE
@@ -1156,7 +1156,7 @@
build_path = /obj/machinery/gibber
req_components = list(
/datum/stock_part/matter_bin = 1,
- /datum/stock_part/manipulator = 1)
+ /datum/stock_part/servo = 1)
needs_anchored = FALSE
/obj/item/circuitboard/machine/hydroponics
@@ -1165,7 +1165,7 @@
build_path = /obj/machinery/hydroponics/constructable
req_components = list(
/datum/stock_part/matter_bin = 2,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/obj/item/stack/sheet/glass = 1)
needs_anchored = FALSE
@@ -1186,7 +1186,7 @@
build_path = /obj/machinery/processor
req_components = list(
/datum/stock_part/matter_bin = 1,
- /datum/stock_part/manipulator = 1)
+ /datum/stock_part/servo = 1)
needs_anchored = FALSE
/obj/item/circuitboard/machine/processor/screwdriver_act(mob/living/user, obj/item/tool)
@@ -1210,7 +1210,7 @@
greyscale_colors = CIRCUIT_COLOR_SERVICE
build_path = /obj/machinery/recycler
req_components = list(
- /datum/stock_part/manipulator = 1)
+ /datum/stock_part/servo = 1)
needs_anchored = FALSE
/obj/item/circuitboard/machine/seed_extractor
@@ -1219,7 +1219,7 @@
build_path = /obj/machinery/seed_extractor
req_components = list(
/datum/stock_part/matter_bin = 1,
- /datum/stock_part/manipulator = 1)
+ /datum/stock_part/servo = 1)
needs_anchored = FALSE
/obj/item/circuitboard/machine/techfab/department/service
@@ -1243,7 +1243,7 @@
/obj/item/stack/sheet/glass = 1,
/datum/stock_part/matter_bin = 1,
/datum/stock_part/micro_laser = 1,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/obj/item/assembly/igniter = 1)
needs_anchored = FALSE
@@ -1266,7 +1266,7 @@
greyscale_colors = CIRCUIT_COLOR_SUPPLY
build_path = /obj/machinery/mineral/stacking_machine
req_components = list(
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/datum/stock_part/matter_bin = 2)
/obj/item/circuitboard/machine/stacking_unit_console
@@ -1289,7 +1289,7 @@
req_components = list(
/obj/item/stack/cable_coil = 5,
/datum/stock_part/capacitor = 1,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
/datum/stock_part/micro_laser = 1,
/datum/stock_part/scanning_module = 1)
@@ -1299,7 +1299,7 @@
greyscale_colors = CIRCUIT_COLOR_SUPPLY
build_path = /obj/machinery/sheetifier
req_components = list(
- /datum/stock_part/manipulator = 2,
+ /datum/stock_part/servo = 2,
/datum/stock_part/matter_bin = 2)
needs_anchored = FALSE
@@ -1361,7 +1361,7 @@
req_components = list(
/datum/stock_part/micro_laser = 2,
/datum/stock_part/matter_bin = 1,
- /datum/stock_part/manipulator = 2)
+ /datum/stock_part/servo = 2)
/obj/item/circuitboard/machine/doppler_array
name = "Tachyon-Doppler Research Array"
@@ -1401,7 +1401,7 @@
req_components = list(
/obj/item/stack/sheet/plasteel = 15,
/datum/stock_part/scanning_module = 1,
- /datum/stock_part/manipulator = 1,
+ /datum/stock_part/servo = 1,
)
/obj/item/circuitboard/machine/tank_compressor
diff --git a/code/game/objects/items/storage/boxes/science_boxes.dm b/code/game/objects/items/storage/boxes/science_boxes.dm
index 754a0cb2f5b..871b80cc298 100644
--- a/code/game/objects/items/storage/boxes/science_boxes.dm
+++ b/code/game/objects/items/storage/boxes/science_boxes.dm
@@ -75,7 +75,7 @@
/obj/item/storage/box/stockparts/basic/PopulateContents()
var/static/items_inside = list(
/obj/item/stock_parts/capacitor = 3,
- /obj/item/stock_parts/manipulator = 3,
+ /obj/item/stock_parts/servo = 3,
/obj/item/stock_parts/matter_bin = 3,
/obj/item/stock_parts/micro_laser = 3,
/obj/item/stock_parts/scanning_module = 3,
@@ -91,7 +91,7 @@
var/static/items_inside = list(
/obj/item/stock_parts/capacitor/quadratic = 3,
/obj/item/stock_parts/scanning_module/triphasic = 3,
- /obj/item/stock_parts/manipulator/femto = 3,
+ /obj/item/stock_parts/servo/femto = 3,
/obj/item/stock_parts/micro_laser/quadultra = 3,
/obj/item/stock_parts/matter_bin/bluespace = 3,
)
diff --git a/code/game/objects/items/storage/boxes/service_boxes.dm b/code/game/objects/items/storage/boxes/service_boxes.dm
index 3ff3480817e..56f59b5572e 100644
--- a/code/game/objects/items/storage/boxes/service_boxes.dm
+++ b/code/game/objects/items/storage/boxes/service_boxes.dm
@@ -170,7 +170,7 @@
/obj/item/stack/cable_coil/five = 1,
/obj/item/stack/sheet/glass = 1,
/obj/item/stack/sheet/iron/five = 1,
- /obj/item/stock_parts/manipulator = 1,
+ /obj/item/stock_parts/servo = 1,
/obj/item/stock_parts/matter_bin = 2,
/obj/item/wrench = 1,
)
diff --git a/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm b/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
index e934ea5a769..6ca66620997 100644
--- a/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
+++ b/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
@@ -144,8 +144,8 @@
. = ..()
var/power = 0
var/cap = 0
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- power += manipulator.tier
+ for(var/datum/stock_part/servo/servo in component_parts)
+ power += servo.tier
for(var/datum/stock_part/capacitor/capacitor in component_parts)
cap += capacitor.tier
diff --git a/code/modules/explorer_drone/exploration_events/trader.dm b/code/modules/explorer_drone/exploration_events/trader.dm
index 2921d0bdaf7..8a0171c344c 100644
--- a/code/modules/explorer_drone/exploration_events/trader.dm
+++ b/code/modules/explorer_drone/exploration_events/trader.dm
@@ -70,7 +70,7 @@
deep_scan_description = "You detect a spot with unusal concentraction of edibles on the site."
required_site_traits = list(EXPLORATION_SITE_HABITABLE,EXPLORATION_SITE_SURFACE)
band_values = list(EXOSCANNER_BAND_LIFE=2)
- required_path = /obj/item/stock_parts/manipulator/nano
+ required_path = /obj/item/stock_parts/servo/nano
traded_path = list(/obj/item/seeds/tomato/killer,/obj/item/seeds/orange_3d,/obj/item/seeds/firelemon,/obj/item/seeds/gatfruit)
amount = 1
diff --git a/code/modules/food_and_drinks/machinery/gibber.dm b/code/modules/food_and_drinks/machinery/gibber.dm
index 3b474d0ff6f..5bf49c0778c 100644
--- a/code/modules/food_and_drinks/machinery/gibber.dm
+++ b/code/modules/food_and_drinks/machinery/gibber.dm
@@ -29,17 +29,17 @@
meat_produced = initial(meat_produced)
for(var/datum/stock_part/matter_bin/matter_bin in component_parts)
meat_produced += matter_bin.tier
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- gibtime -= 5 * manipulator.tier
- if(manipulator.tier >= 2)
+ for(var/datum/stock_part/servo/servo in component_parts)
+ gibtime -= 5 * servo.tier
+ if(servo.tier >= 2)
ignore_clothing = TRUE
/obj/machinery/gibber/examine(mob/user)
. = ..()
if(in_range(user, src) || isobserver(user))
. += span_notice("The status display reads: Outputting [meat_produced] meat slab(s) after [gibtime*0.1] seconds of processing.")
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- if(manipulator.tier >= 2)
+ for(var/datum/stock_part/servo/servo in component_parts)
+ if(servo.tier >= 2)
. += span_notice("[src] has been upgraded to process inorganic materials.")
/obj/machinery/gibber/update_overlays()
diff --git a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/machinery/monkeyrecycler.dm
index fa5418d3030..1a9c8db1bb0 100644
--- a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm
+++ b/code/modules/food_and_drinks/machinery/monkeyrecycler.dm
@@ -28,8 +28,8 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
/obj/machinery/monkey_recycler/RefreshParts() //Ranges from 0.2 to 0.8 per monkey recycled
. = ..()
cube_production = 0
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- cube_production += manipulator.tier * 0.1
+ for(var/datum/stock_part/servo/servo in component_parts)
+ cube_production += servo.tier * 0.1
for(var/datum/stock_part/matter_bin/matter_bin in component_parts)
cube_production += matter_bin.tier * 0.1
diff --git a/code/modules/food_and_drinks/machinery/processor.dm b/code/modules/food_and_drinks/machinery/processor.dm
index b8e5f9dfebe..ad397958e9d 100644
--- a/code/modules/food_and_drinks/machinery/processor.dm
+++ b/code/modules/food_and_drinks/machinery/processor.dm
@@ -45,8 +45,8 @@
. = ..()
for(var/datum/stock_part/matter_bin/matter_bin in component_parts)
rating_amount = matter_bin.tier
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- rating_speed = manipulator.tier
+ for(var/datum/stock_part/servo/servo in component_parts)
+ rating_speed = servo.tier
/obj/machinery/processor/examine(mob/user)
. = ..()
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index fc35ffc1014..e1970f3d024 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -89,10 +89,10 @@
for(var/datum/stock_part/matter_bin/bin in component_parts)
new_max_items += MAX_ITEMS_PER_RATING * bin.tier
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- new_productivity += manipulator.tier
- new_efficiency += manipulator.tier
- new_processed_items_per_cycle += PROCESSED_ITEMS_PER_RATING * manipulator.tier
+ for(var/datum/stock_part/servo/servo in component_parts)
+ new_productivity += servo.tier
+ new_efficiency += servo.tier
+ new_processed_items_per_cycle += PROCESSED_ITEMS_PER_RATING * servo.tier
max_items = new_max_items
efficiency = new_efficiency
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 38010c18075..80f48a2c615 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -167,8 +167,8 @@
var/tmp_capacity = 0
for (var/datum/stock_part/matter_bin/matter_bin in component_parts)
tmp_capacity += matter_bin.tier
- for (var/datum/stock_part/manipulator/manipulator in component_parts)
- rating = manipulator.tier
+ for (var/datum/stock_part/servo/servo in component_parts)
+ rating = servo.tier
maxwater = tmp_capacity * 50 // Up to 300
maxnutri = (tmp_capacity * 5) + STATIC_NUTRIENT_CAPACITY // Up to 50 Maximum
reagents.maximum_volume = maxnutri
diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm
index d9c445cde33..a6c4ccee2a1 100644
--- a/code/modules/hydroponics/seed_extractor.dm
+++ b/code/modules/hydroponics/seed_extractor.dm
@@ -80,8 +80,8 @@
. = ..()
for(var/datum/stock_part/matter_bin/matter_bin in component_parts)
max_seeds = initial(max_seeds) * matter_bin.tier
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- seed_multiplier = initial(seed_multiplier) * manipulator.tier
+ for(var/datum/stock_part/servo/servo in component_parts)
+ seed_multiplier = initial(seed_multiplier) * servo.tier
/obj/machinery/seed_extractor/examine(mob/user)
. = ..()
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 5333450b1fe..d165bf237f2 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -94,8 +94,8 @@
maximum_fire_delay = max_fire_delay
minimum_fire_delay = min_fire_delay
fire_delay = fire_shoot_delay
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- power_usage -= 50 * manipulator.tier
+ for(var/datum/stock_part/servo/servo in component_parts)
+ power_usage -= 50 * servo.tier
update_mode_power_usage(ACTIVE_POWER_USE, power_usage)
/obj/machinery/power/emitter/examine(mob/user)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index c66dee0fbaa..f00468d02fa 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -423,12 +423,12 @@
for(var/datum/stock_part/capacitor/capacitor in component_parts)
recharge_amount *= capacitor.tier
parts_rating += capacitor.tier
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- if (manipulator.tier > 3)
+ for(var/datum/stock_part/servo/servo in component_parts)
+ if (servo.tier > 3)
dispensable_reagents |= upgrade_reagents
else
dispensable_reagents -= upgrade_reagents
- parts_rating += manipulator.tier
+ parts_rating += servo.tier
powerefficiency = round(newpowereff, 0.01)
/obj/machinery/chem_dispenser/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index e960587042a..8e5c0101594 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -67,8 +67,8 @@
/obj/machinery/reagentgrinder/RefreshParts()
. = ..()
speed = 1
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- speed = manipulator.tier
+ for(var/datum/stock_part/servo/servo in component_parts)
+ speed = servo.tier
/obj/machinery/reagentgrinder/examine(mob/user)
. = ..()
diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
index 160e0aa1788..0271c17d18b 100644
--- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm
+++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
@@ -54,8 +54,8 @@
/obj/machinery/smoke_machine/RefreshParts()
. = ..()
var/new_volume = REAGENTS_BASE_VOLUME
- for(var/datum/stock_part/matter_bin/B in component_parts)
- new_volume += REAGENTS_BASE_VOLUME * B.tier
+ for(var/datum/stock_part/matter_bin/matter_bin in component_parts)
+ new_volume += REAGENTS_BASE_VOLUME * matter_bin.tier
if(!reagents)
create_reagents(new_volume, INJECTABLE)
reagents.maximum_volume = new_volume
@@ -63,11 +63,11 @@
reagents.expose(loc, TOUCH) // if someone manages to downgrade it without deconstructing
reagents.clear_reagents()
efficiency = 18
- for(var/datum/stock_part/capacitor/C in component_parts)
- efficiency += 2 * C.tier
+ for(var/datum/stock_part/capacitor/capacitor in component_parts)
+ efficiency += 2 * capacitor.tier
max_range = 1
- for(var/datum/stock_part/manipulator/M in component_parts)
- max_range += M.tier
+ for(var/datum/stock_part/servo/servo in component_parts)
+ max_range += servo.tier
max_range = max(3, max_range)
/obj/machinery/smoke_machine/on_set_is_operational(old_value)
diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm
index fab66268f94..2f038b27511 100644
--- a/code/modules/research/bepis.dm
+++ b/code/modules/research/bepis.dm
@@ -94,8 +94,8 @@
for(var/datum/stock_part/capacitor/capacitor in component_parts)
C += ((capacitor.tier - 1) * 0.1)
power_saver = 1 - C
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- M += ((manipulator.tier - 1) * PART_CASH_OFFSET_AMOUNT)
+ for(var/datum/stock_part/servo/servo in component_parts)
+ M += ((servo.tier - 1) * PART_CASH_OFFSET_AMOUNT)
positive_cash_offset = M
for(var/datum/stock_part/micro_laser/Laser in component_parts)
L += ((Laser.tier - 1) * PART_CASH_OFFSET_AMOUNT)
diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm
index 8436cc8c9a6..82640246391 100644
--- a/code/modules/research/designs/stock_parts_designs.dm
+++ b/code/modules/research/designs/stock_parts_designs.dm
@@ -133,52 +133,52 @@
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
//Maipulators
-/datum/design/micro_mani
- name = "Micro Manipulator"
+/datum/design/micro_servo
+ name = "Micro Servo"
desc = "A stock part used in the construction of various devices."
- id = "micro_mani"
+ id = "micro_servo"
build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE
materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT)
- build_path = /obj/item/stock_parts/manipulator
+ build_path = /obj/item/stock_parts/servo
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1
)
lathe_time_factor = 0.2
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
-/datum/design/nano_mani
- name = "Nano Manipulator"
+/datum/design/nano_servo
+ name = "Nano Servo"
desc = "A stock part used in the construction of various devices."
- id = "nano_mani"
+ id = "nano_servo"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 150)
- build_path = /obj/item/stock_parts/manipulator/nano
+ build_path = /obj/item/stock_parts/servo/nano
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2
)
lathe_time_factor = 0.2
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
-/datum/design/pico_mani
- name = "Pico Manipulator"
+/datum/design/pico_servo
+ name = "Pico Servo"
desc = "A stock part used in the construction of various devices."
- id = "pico_mani"
+ id = "pico_servo"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2)
- build_path = /obj/item/stock_parts/manipulator/pico
+ build_path = /obj/item/stock_parts/servo/pico
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3
)
lathe_time_factor = 0.2
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
-/datum/design/femto_mani
- name = "Femto Manipulator"
+/datum/design/femto_servo
+ name = "Femto Servo"
desc = "A stock part used in the construction of various devices."
- id = "femto_mani"
+ id = "femto_servo"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/diamond = 30, /datum/material/titanium = 30)
- build_path = /obj/item/stock_parts/manipulator/femto
+ build_path = /obj/item/stock_parts/servo/femto
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4
)
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index a02e9d211b4..25169292919 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -110,8 +110,8 @@
. = ..()
malfunction_probability_coeff = malfunction_probability_coeff_modifier
resetTime = initial(resetTime)
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- resetTime = max(1, resetTime - manipulator.tier)
+ for(var/datum/stock_part/servo/servo in component_parts)
+ resetTime = max(1, resetTime - servo.tier)
for(var/datum/stock_part/scanning_module/scanning_module in component_parts)
malfunction_probability_coeff += scanning_module.tier * 2
for(var/datum/stock_part/micro_laser/micro_laser in component_parts)
diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm
index 574b4d1c57f..fd3c4d7178b 100644
--- a/code/modules/research/machinery/_production.dm
+++ b/code/modules/research/machinery/_production.dm
@@ -207,8 +207,8 @@
var/total_rating = 1.2
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- total_rating -= manipulator.tier * 0.1
+ for(var/datum/stock_part/servo/servo in component_parts)
+ total_rating -= servo.tier * 0.1
efficiency_coeff = max(total_rating, 0)
diff --git a/code/modules/research/machinery/circuit_imprinter.dm b/code/modules/research/machinery/circuit_imprinter.dm
index 850393eb85f..8127bc45d0a 100644
--- a/code/modules/research/machinery/circuit_imprinter.dm
+++ b/code/modules/research/machinery/circuit_imprinter.dm
@@ -11,8 +11,8 @@
var/rating = 0
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- rating += manipulator.tier // There is only one.
+ for(var/datum/stock_part/servo/servo in component_parts)
+ rating += servo.tier // There is only one.
efficiency_coeff = 0.5 ** max(rating - 1, 0) // One sheet, half sheet, quarter sheet, eighth sheet.
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index 7f14aa37ec0..1b64d613297 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -163,7 +163,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
for(var/i in 1 to 10)
new /obj/item/stock_parts/capacitor(src)
new /obj/item/stock_parts/scanning_module(src)
- new /obj/item/stock_parts/manipulator(src)
+ new /obj/item/stock_parts/servo(src)
new /obj/item/stock_parts/micro_laser(src)
new /obj/item/stock_parts/matter_bin(src)
new /obj/item/stock_parts/cell/high(src)
@@ -174,7 +174,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
for(var/i in 1 to 10)
new /obj/item/stock_parts/capacitor/adv(src)
new /obj/item/stock_parts/scanning_module/adv(src)
- new /obj/item/stock_parts/manipulator/nano(src)
+ new /obj/item/stock_parts/servo/nano(src)
new /obj/item/stock_parts/micro_laser/high(src)
new /obj/item/stock_parts/matter_bin/adv(src)
new /obj/item/stock_parts/cell/super(src)
@@ -185,7 +185,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
for(var/i in 1 to 10)
new /obj/item/stock_parts/capacitor/super(src)
new /obj/item/stock_parts/scanning_module/phasic(src)
- new /obj/item/stock_parts/manipulator/pico(src)
+ new /obj/item/stock_parts/servo/pico(src)
new /obj/item/stock_parts/micro_laser/ultra(src)
new /obj/item/stock_parts/matter_bin/super(src)
new /obj/item/stock_parts/cell/hyper(src)
@@ -196,7 +196,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
for(var/i in 1 to 10)
new /obj/item/stock_parts/capacitor/quadratic(src)
new /obj/item/stock_parts/scanning_module/triphasic(src)
- new /obj/item/stock_parts/manipulator/femto(src)
+ new /obj/item/stock_parts/servo/femto(src)
new /obj/item/stock_parts/micro_laser/quadultra(src)
new /obj/item/stock_parts/matter_bin/bluespace(src)
new /obj/item/stock_parts/cell/bluespace(src)
@@ -207,7 +207,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
for(var/i in 1 to 10)
new /obj/item/stock_parts/capacitor(src)
new /obj/item/stock_parts/scanning_module(src)
- new /obj/item/stock_parts/manipulator(src)
+ new /obj/item/stock_parts/servo(src)
new /obj/item/stock_parts/micro_laser(src)
new /obj/item/stock_parts/matter_bin(src)
@@ -243,7 +243,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
icon = 'icons/obj/stock_parts.dmi'
w_class = WEIGHT_CLASS_SMALL
var/rating = 1
- ///Used when a base part has a different name to higher tiers of part. For example, machine frames want any manipulator and not just a micro-manipulator.
+ ///Used when a base part has a different name to higher tiers of part. For example, machine frames want any servo and not just a micro-servo.
var/base_name
var/energy_rating = 1
@@ -269,12 +269,12 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
icon_state = "scan_module"
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2)
-/obj/item/stock_parts/manipulator
- name = "micro-manipulator"
- desc = "A tiny little manipulator used in the construction of certain devices."
- icon_state = "micro_mani"
+/obj/item/stock_parts/servo
+ name = "micro-servo"
+ desc = "A tiny little servo motor used in the construction of certain devices."
+ icon_state = "micro_servo"
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3)
- base_name = "manipulator"
+ base_name = "servo"
/obj/item/stock_parts/micro_laser
name = "micro-laser"
@@ -306,10 +306,10 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
energy_rating = 3
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2)
-/obj/item/stock_parts/manipulator/nano
- name = "nano-manipulator"
- desc = "A tiny little manipulator used in the construction of certain devices."
- icon_state = "nano_mani"
+/obj/item/stock_parts/servo/nano
+ name = "nano-servo"
+ desc = "A tiny little servo motor used in the construction of certain devices."
+ icon_state = "nano_servo"
rating = 2
energy_rating = 3
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3)
@@ -348,10 +348,10 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
energy_rating = 5
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2)
-/obj/item/stock_parts/manipulator/pico
- name = "pico-manipulator"
- desc = "A tiny little manipulator used in the construction of certain devices."
- icon_state = "pico_mani"
+/obj/item/stock_parts/servo/pico
+ name = "pico-servo"
+ desc = "A tiny little servo motor used in the construction of certain devices."
+ icon_state = "pico_servo"
rating = 3
energy_rating = 5
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3)
@@ -390,10 +390,10 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
energy_rating = 10
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.2)
-/obj/item/stock_parts/manipulator/femto
- name = "femto-manipulator"
- desc = "A tiny little manipulator used in the construction of certain devices."
- icon_state = "femto_mani"
+/obj/item/stock_parts/servo/femto
+ name = "femto-servo"
+ desc = "A tiny little servo motor used in the construction of certain devices."
+ icon_state = "femto_servo"
rating = 4
energy_rating = 10
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3)
diff --git a/code/modules/research/stock_parts/stock_part_datum.dm b/code/modules/research/stock_parts/stock_part_datum.dm
index bb787bf6115..01b523e54b4 100644
--- a/code/modules/research/stock_parts/stock_part_datum.dm
+++ b/code/modules/research/stock_parts/stock_part_datum.dm
@@ -101,22 +101,22 @@ GLOBAL_LIST_INIT(stock_part_datums, generate_stock_part_datums())
tier = 4
physical_object_type = /obj/item/stock_parts/capacitor/quadratic
-/datum/stock_part/manipulator
+/datum/stock_part/servo
tier = 1
- physical_object_type = /obj/item/stock_parts/manipulator
- physical_object_base_type = /obj/item/stock_parts/manipulator
+ physical_object_type = /obj/item/stock_parts/servo
+ physical_object_base_type = /obj/item/stock_parts/servo
-/datum/stock_part/manipulator/tier2
+/datum/stock_part/servo/tier2
tier = 2
- physical_object_type = /obj/item/stock_parts/manipulator/nano
+ physical_object_type = /obj/item/stock_parts/servo/nano
-/datum/stock_part/manipulator/tier3
+/datum/stock_part/servo/tier3
tier = 3
- physical_object_type = /obj/item/stock_parts/manipulator/pico
+ physical_object_type = /obj/item/stock_parts/servo/pico
-/datum/stock_part/manipulator/tier4
+/datum/stock_part/servo/tier4
tier = 4
- physical_object_type = /obj/item/stock_parts/manipulator/femto
+ physical_object_type = /obj/item/stock_parts/servo/femto
/datum/stock_part/micro_laser
tier = 1
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index bcfe3317c9d..720b06429fd 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -68,7 +68,7 @@
"light_replacer",
"light_tube",
"mechfab",
- "micro_mani",
+ "micro_servo",
"miniature_power_cell",
"newscaster_frame",
"oven_tray",
@@ -575,7 +575,7 @@
"high_cell",
"high_micro_laser",
"mesons",
- "nano_mani",
+ "nano_servo",
"oxygen_tank",
"pacman",
"plasma_tank",
@@ -646,7 +646,7 @@
description = "Finely-tooled manufacturing techniques allowing for picometer-perfect precision levels."
prereq_ids = list("engineering", "datatheory")
design_ids = list(
- "pico_mani",
+ "pico_servo",
"super_matter_bin",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
@@ -709,7 +709,7 @@
design_ids = list(
"bluespace_matter_bin",
"bluespacebodybag",
- "femto_mani",
+ "femto_servo",
"quantum_keycard",
"swapper",
"triphasic_scanning",
@@ -944,7 +944,7 @@
. = ..()
if(!CONFIG_GET(flag/disable_secborg))
design_ids += "borg_upgrade_disablercooler"
-
+
/datum/techweb_node/cyborg_upg_serv
id = "cyborg_upg_serv"
display_name = "Cyborg Upgrades: Service"
diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm
index d38b1909ad3..7ae78576493 100644
--- a/code/modules/vehicles/mecha/mech_fabricator.dm
+++ b/code/modules/vehicles/mecha/mech_fabricator.dm
@@ -102,8 +102,8 @@
//building time adjustment coefficient (1 -> 0.8 -> 0.6)
T = -1
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- T += manipulator.tier
+ for(var/datum/stock_part/servo/servo in component_parts)
+ T += servo.tier
time_coeff = round(initial(time_coeff) - (initial(time_coeff)*(T))/5,0.01)
// Adjust the build time of any item currently being built.
diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm
index 32c0c9ec9d1..21b3ec1b51c 100644
--- a/code/modules/vehicles/motorized_wheelchair.dm
+++ b/code/modules/vehicles/motorized_wheelchair.dm
@@ -15,8 +15,8 @@
var/panel_open = FALSE
///Parts used in building the wheelchair
var/list/required_parts = list(
- /datum/stock_part/manipulator,
- /datum/stock_part/manipulator,
+ /datum/stock_part/servo,
+ /datum/stock_part/servo,
/datum/stock_part/capacitor,
)
///power cell we draw power from
@@ -41,8 +41,8 @@
/obj/vehicle/ridden/wheelchair/motorized/proc/refresh_parts()
speed = 1 // Should never be under 1
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
- speed += manipulator.tier
+ for(var/datum/stock_part/servo/servo in component_parts)
+ speed += servo.tier
var/chair_icon = "motorized_wheelchair[speed > delay_multiplier ? "_fast" : ""]"
if(icon_state != chair_icon)
wheels_overlay = image(icon, chair_icon + "_overlay", ABOVE_MOB_LAYER)
diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm
index 012b2aea51e..229b19aeadb 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -10,7 +10,7 @@
/obj/item/assembly/signaler = 4,
/obj/item/computer_disk/ordnance = 4,
/obj/item/stock_parts/capacitor = 3,
- /obj/item/stock_parts/manipulator = 3,
+ /obj/item/stock_parts/servo = 3,
/obj/item/stock_parts/matter_bin = 3,
/obj/item/stock_parts/micro_laser = 3,
/obj/item/stock_parts/scanning_module = 3,
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index bf6ad0a7133..801a44e0f20 100644
--- a/code/modules/vending/engineering.dm
+++ b/code/modules/vending/engineering.dm
@@ -28,7 +28,7 @@
/obj/item/stock_parts/scanning_module = 5,
/obj/item/stock_parts/micro_laser = 5,
/obj/item/stock_parts/matter_bin = 5,
- /obj/item/stock_parts/manipulator = 5,
+ /obj/item/stock_parts/servo = 5,
)
refill_canister = /obj/item/vending_refill/engineering
default_price = PAYCHECK_CREW
diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm
index aad610adf43..c161239e8af 100644
--- a/code/modules/wiremod/core/component_printer.dm
+++ b/code/modules/wiremod/core/component_printer.dm
@@ -77,9 +77,9 @@
/obj/machinery/component_printer/proc/calculate_efficiency()
var/rating = 0
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
+ for(var/datum/stock_part/servo/servo in component_parts)
///we do -1 because normal manipulators rating of 1 gives us 1-1=0 i.e no decrement in cost
- rating += manipulator.tier-1
+ rating += servo.tier-1
///linear interpolation between full cost i.e 1 & 1/8th the cost i.e 0.125
///we do it in 6 steps because maximum rating of 2 manipulators is 8 but -1 gives us 6
@@ -348,9 +348,9 @@
var/rating = 0
- for(var/datum/stock_part/manipulator/manipulator in component_parts)
+ for(var/datum/stock_part/servo/servo in component_parts)
///we do -1 because normal manipulators rating of 1 gives us 1-1=0 i.e no decrement in cost
- rating += manipulator.tier - 1
+ rating += servo.tier - 1
///linear interpolation between full cost i.e 1 & 1/8th the cost i.e 0.125
///we do it in 6 steps because maximum rating of 2 manipulators is 8 but -1 gives us 6
diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm
index a9e718bbbbc..8b9a825ba48 100644
--- a/code/modules/wiremod/shell/brain_computer_interface.dm
+++ b/code/modules/wiremod/shell/brain_computer_interface.dm
@@ -525,5 +525,5 @@
build_path = /obj/machinery/bci_implanter
req_components = list(
/obj/item/stock_parts/micro_laser = 2,
- /obj/item/stock_parts/manipulator = 1,
+ /obj/item/stock_parts/servo = 1,
)
diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi
index f39c5915c65..d5d5475f323 100644
Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ
diff --git a/tools/UpdatePaths/Scripts/75149_stock_part_resprite.txt b/tools/UpdatePaths/Scripts/75149_stock_part_resprite.txt
new file mode 100644
index 00000000000..45ca533d0c1
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/75149_stock_part_resprite.txt
@@ -0,0 +1,3 @@
+#comment This replaces all references to manipulator stock parts with servos https://github.com/tgstation/tgstation/pull/75149
+
+/obj/item/stock_parts/manipulator/@SUBTYPES : /obj/item/stock_parts/servo/@SUBTYPES