diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 75432a86da2..49f737a29db 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -15,6 +15,23 @@
attack_verb = list("hit", "bludgeoned", "whacked")
hitsound = 'sound/weapons/grenadelaunch.ogg'
+/obj/item/stack/rods/cyborg
+ name = "metal rod"
+ desc = "Some rods. Can be used for building, or something."
+ singular_name = "metal rod"
+ icon_state = "rods"
+ item_state = "rods"
+ flags = CONDUCT
+ w_class = 3.0
+ force = 9.0
+ throwforce = 10.0
+ throw_speed = 3
+ throw_range = 7
+ materials = list()
+ max_amount = 60
+ attack_verb = list("hit", "bludgeoned", "whacked")
+ hitsound = 'sound/weapons/grenadelaunch.ogg'
+
/obj/item/stack/rods/New(var/loc, var/amount=null)
..()
@@ -41,11 +58,11 @@
if(new_item.get_amount() <= 0)
// stack was moved into another one on the pile
new_item = locate() in user.loc
-
+
user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \
"You shaped [src] into metal with the weldingtool.", \
"You hear welding.")
-
+
var/replace = user.get_inactive_hand() == src
use(2)
if (get_amount() <= 0 && replace)
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index da5d36327f0..c6af5c5beee 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -49,6 +49,14 @@
icon_state = "tile-wood"
turf_type = /turf/simulated/floor/wood
+/obj/item/stack/tile/wood/cyborg
+ name = "wood floor tiles"
+ gender = PLURAL
+ singular_name = "wood floor tile"
+ desc = "an easy to fit wood floor tile"
+ icon_state = "tile-wood"
+ turf_type = /turf/simulated/floor/wood
+
/*
* Carpets
*/
@@ -77,6 +85,21 @@
turf_type = /turf/simulated/floor/plasteel
mineralType = "metal"
+/obj/item/stack/tile/plasteel/cyborg
+ name = "floor tiles"
+ gender = PLURAL
+ singular_name = "floor tile"
+ desc = "Those could work as a pretty decent throwing weapon."
+ icon_state = "tile"
+ force = 6
+ materials = list(MAT_METAL=500)
+ throwforce = 10
+ throw_speed = 3
+ throw_range = 7
+ flags = CONDUCT
+ turf_type = /turf/simulated/floor/plasteel
+ mineralType = "metal"
+
/*
* Light
*/
@@ -124,4 +147,4 @@
origin_tech = "materials=1"
turf_type = /turf/simulated/floor/silent
mineralType = "tranquillite"
- materials = list(MAT_TRANQUILLITE=500)
\ No newline at end of file
+ materials = list(MAT_TRANQUILLITE=500)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 104ef75a0dc..2e69b38c18b 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -175,8 +175,8 @@
/obj/item/stack/sheet/glass/cyborg = 50,
/obj/item/stack/sheet/rglass/cyborg = 50,
/obj/item/stack/cable_coil/cyborg = 50,
- /obj/item/stack/rods = 30,
- /obj/item/stack/tile/plasteel = 20
+ /obj/item/stack/rods/cyborg = 60,
+ /obj/item/stack/tile/plasteel/cyborg = 20
)
/obj/item/weapon/robot_module/engineering/New()
@@ -462,9 +462,9 @@
stacktypes = list(
/obj/item/stack/sheet/wood/cyborg = 10,
/obj/item/stack/sheet/rglass/cyborg = 50,
- /obj/item/stack/tile/wood = 20,
- /obj/item/stack/rods = 30,
- /obj/item/stack/tile/plasteel = 20,
+ /obj/item/stack/tile/wood/cyborg = 20,
+ /obj/item/stack/rods/cyborg/ = 60,
+ /obj/item/stack/tile/plasteel/cyborg = 20,
/obj/item/stack/sheet/metal/cyborg = 50,
/obj/item/stack/sheet/glass/cyborg = 50,
/obj/item/stack/cable_coil/cyborg = 30