goddamnit_again (#2511)

code/datums/action.dm

@@ -431,7 +431,7 @@
 	name = "Create Throwing Stars (1E)"
 	desc = "Creates some throwing stars"
 	button_icon_state = "throwingstar"
-	icon_icon = 'icons/obj/weapons.dmi'
+	icon_icon = 'icons/obj/items_and_weapons.dmi'
 
 /datum/action/item_action/ninjanet
 	name = "Energy Net (20E)"
@@ -443,7 +443,7 @@
 	name = "Recall Energy Katana (Variable Cost)"
 	desc = "Teleports the Energy Katana linked to this suit to its wearer, cost based on distance."
 	button_icon_state = "energy_katana"
-	icon_icon = 'icons/obj/weapons.dmi'
+	icon_icon = 'icons/obj/items_and_weapons.dmi'
 
 /datum/action/item_action/ninja_stealth
 	name = "Toggle Stealth"

code/datums/martial/sleeping_carp.dm

@@ -184,7 +184,7 @@
 	throwforce = 20
 	throw_speed = 2
 	attack_verb = list("smashed", "slammed", "whacked", "thwacked")
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "bostaff0"
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'

code/datums/riding.dm

@@ -416,7 +416,7 @@
 
 /obj/item/riding_offhand
 	name = "offhand"
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "offhand"
 	w_class = WEIGHT_CLASS_HUGE
 	flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1

code/datums/riding.dm.rej

@@ -1,6 +1,6 @@
 diff a/code/datums/riding.dm b/code/datums/riding.dm	(rejected hunks)
 @@ -419,7 +419,7 @@
- 	icon = 'icons/obj/items_and_weapons.dmi'
+ 	icon = 'icons/obj/items_and_weapons.dmi.dmi'
  	icon_state = "offhand"
  	w_class = WEIGHT_CLASS_HUGE
 -	flags = ABSTRACT | DROPDEL | NOBLUDGEON