diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm index 286acbd1118..fe3f158668b 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm @@ -108,7 +108,7 @@ /area/lavaland/surface/outdoors) "B" = ( /obj/effect/mapping_helpers/no_lava, -/obj/item/clockwork/weapon/ratvarian_spear, +/obj/item/spear/ratvarian_spear, /turf/simulated/floor/clockwork/lavaland_air, /area/lavaland/surface/outdoors) "C" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm b/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm index ce2b2de53b7..6d637e50469 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm @@ -481,8 +481,8 @@ /area/ruin/space/clockwork_monastery) "NC" = ( /obj/structure/gunrack/clockwork, -/obj/item/clockwork/weapon/ratvarian_spear, -/obj/item/clockwork/weapon/ratvarian_spear, +/obj/item/spear/ratvarian_spear, +/obj/item/spear/ratvarian_spear, /turf/simulated/floor/clockwork, /area/ruin/space/clockwork_monastery) "NF" = ( diff --git a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm index 498f2425429..b27c2b60d45 100644 --- a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm +++ b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm @@ -291,17 +291,15 @@ w_class = WEIGHT_CLASS_NORMAL //Ratvarian spear -/obj/item/clockwork/weapon/ratvarian_spear +/obj/item/spear/ratvarian_spear name = "ratvarian spear" desc = "A razor-sharp spear made of brass. It thrums with barely-contained energy." - icon = 'icons/obj/clockwork_objects.dmi' - icon_state = "ratvarian_spear" - item_state = "ratvarian_spear" - force = 15 //Extra damage is dealt to targets in attack() + base_icon_state = "ratvarian_spear" + icon_state = "ratvarian_spear0" + force = 12 + force_unwielded = 12 + force_wielded = 22 throwforce = 25 armour_penetration_percentage = 15 - sharp = TRUE - attack_verb = list("stabbed", "poked", "slashed") - hitsound = 'sound/weapons/bladeslice.ogg' - w_class = WEIGHT_CLASS_BULKY - var/bonus_burn = 5 + embed_chance = 0 // would suck to lose this after one throw + var/bonus_burn = 5 // currently does nothing diff --git a/icons/mob/inhands/weapons_lefthand.dmi b/icons/mob/inhands/weapons_lefthand.dmi index f48cebabee7..3bb9588110f 100644 Binary files a/icons/mob/inhands/weapons_lefthand.dmi and b/icons/mob/inhands/weapons_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons_righthand.dmi b/icons/mob/inhands/weapons_righthand.dmi index 4cdfa9234e7..ed5c19fddbe 100644 Binary files a/icons/mob/inhands/weapons_righthand.dmi and b/icons/mob/inhands/weapons_righthand.dmi differ diff --git a/icons/obj/weapons/spears.dmi b/icons/obj/weapons/spears.dmi index b4354cfd0c8..6c3218a0e1f 100644 Binary files a/icons/obj/weapons/spears.dmi and b/icons/obj/weapons/spears.dmi differ