From dc78d482798a69ce5019f5a313d0f9a8a0aa196c Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 5 Aug 2021 16:41:26 -0400 Subject: [PATCH] Merge pull request #11335 from VOREStation/Icons/srrack Skyrat rack sprite --- code/modules/tables/rack_vr.dm | 17 ++++++++++++++++- icons/obj/objects_vr.dmi | Bin 4685 -> 4976 bytes 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/code/modules/tables/rack_vr.dm b/code/modules/tables/rack_vr.dm index 137dc32fd0..af422bfb0a 100644 --- a/code/modules/tables/rack_vr.dm +++ b/code/modules/tables/rack_vr.dm @@ -1,3 +1,6 @@ +/obj/structure/table/rack + icon = 'icons/obj/objects_vr.dmi' + /obj/structure/table/rack/steel color = "#666666" @@ -8,7 +11,6 @@ /obj/structure/table/rack/shelf name = "shelving" desc = "Some nice metal shelves." - icon = 'icons/obj/objects_vr.dmi' icon_state = "shelf" /obj/structure/table/rack/shelf/steel @@ -17,3 +19,16 @@ /obj/structure/table/rack/shelf/steel/New() material = get_material_by_name(MAT_STEEL) ..() + +// SOMEONE should add cool overlay stuff to this +/obj/structure/table/rack/gun_rack + name = "gun rack" + desc = "Seems like you could prop up some rifles here." + icon_state = "gunrack" + +/obj/structure/table/rack/gun_rack/steel + color = "#666666" + +/obj/structure/table/rack/gun_rack/steel/New() + material = get_material_by_name(MAT_STEEL) + ..() \ No newline at end of file diff --git a/icons/obj/objects_vr.dmi b/icons/obj/objects_vr.dmi index 19c7947b4becb173fc5018b0f04f52e02692868b..467297775f4344f587b6751c52e672a20ef55a06 100644 GIT binary patch delta 4426 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