From 721b456eea9160d4e1ae2cacc38de7c1f3a21315 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Wed, 8 Jul 2020 22:30:12 +0100 Subject: [PATCH] renamed them balls --- code/game/objects/items/{balls.dm => balls_vr.dm} | 8 ++++---- .../{lefthand_balls.dmi => lefthand_balls_vr.dmi} | Bin .../{righthand_balls.dmi => righthand_balls_vr.dmi} | Bin icons/mob/{mouthball.dmi => mouthball_vr.dmi} | Bin icons/obj/{balls.dmi => balls_vr.dmi} | Bin vorestation.dme | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename code/game/objects/items/{balls.dm => balls_vr.dm} (86%) rename icons/mob/items/{lefthand_balls.dmi => lefthand_balls_vr.dmi} (100%) rename icons/mob/items/{righthand_balls.dmi => righthand_balls_vr.dmi} (100%) rename icons/mob/{mouthball.dmi => mouthball_vr.dmi} (100%) rename icons/obj/{balls.dmi => balls_vr.dmi} (100%) diff --git a/code/game/objects/items/balls.dm b/code/game/objects/items/balls_vr.dm similarity index 86% rename from code/game/objects/items/balls.dm rename to code/game/objects/items/balls_vr.dm index bae3bf2528..6c0b1c25a8 100644 --- a/code/game/objects/items/balls.dm +++ b/code/game/objects/items/balls_vr.dm @@ -1,12 +1,12 @@ /obj/item/toy/tennis name = "tennis ball" desc = "A classic tennis ball; a hollow rubber sphere covered in felt. This one has seen better days, and seems to have lost most of its bounce." - icon = 'icons/obj/balls.dmi' + icon = 'icons/obj/balls_vr.dmi' icon_state = "tennis_classic" item_icons = list( - slot_l_hand_str = 'icons/mob/items/righthand_balls.dmi', - slot_r_hand_str = 'icons/mob/items/lefthand_balls.dmi', - slot_wear_mask_str = 'icons/mob/mouthball.dmi', + slot_l_hand_str = 'icons/mob/items/righthand_balls_vr.dmi', + slot_r_hand_str = 'icons/mob/items/lefthand_balls_vr.dmi', + slot_wear_mask_str = 'icons/mob/mouthball_vr.dmi', ) item_state = "tennis_classic" slot_flags = SLOT_MASK diff --git a/icons/mob/items/lefthand_balls.dmi b/icons/mob/items/lefthand_balls_vr.dmi similarity index 100% rename from icons/mob/items/lefthand_balls.dmi rename to icons/mob/items/lefthand_balls_vr.dmi diff --git a/icons/mob/items/righthand_balls.dmi b/icons/mob/items/righthand_balls_vr.dmi similarity index 100% rename from icons/mob/items/righthand_balls.dmi rename to icons/mob/items/righthand_balls_vr.dmi diff --git a/icons/mob/mouthball.dmi b/icons/mob/mouthball_vr.dmi similarity index 100% rename from icons/mob/mouthball.dmi rename to icons/mob/mouthball_vr.dmi diff --git a/icons/obj/balls.dmi b/icons/obj/balls_vr.dmi similarity index 100% rename from icons/obj/balls.dmi rename to icons/obj/balls_vr.dmi diff --git a/vorestation.dme b/vorestation.dme index eacda29870..cb7cdd10cb 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1064,7 +1064,7 @@ #include "code\game\objects\effects\temporary_visuals\projectiles\tracer.dm" #include "code\game\objects\items\antag_spawners.dm" #include "code\game\objects\items\apc_frame.dm" -#include "code\game\objects\items\balls.dm" +#include "code\game\objects\items\balls_vr.dm" #include "code\game\objects\items\bells.dm" #include "code\game\objects\items\blueprints.dm" #include "code\game\objects\items\bodybag.dm"