From 1dc914063b92c30908a1bd83f0f4c0ba2bf4d7d2 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 3 Jul 2018 01:17:11 -0400 Subject: [PATCH 1/2] Fixes USDF Sprites Fixes #3967 for Ace (Unfortunately I have no idea how to fix the imperial weapon sound) --- code/modules/clothing/head/helmet_vr.dm | 4 ++-- code/modules/clothing/suits/armor_vr.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/head/helmet_vr.dm b/code/modules/clothing/head/helmet_vr.dm index fc71016f7e..8f7ec139ca 100644 --- a/code/modules/clothing/head/helmet_vr.dm +++ b/code/modules/clothing/head/helmet_vr.dm @@ -9,8 +9,8 @@ /obj/item/clothing/head/helmet/combat/USDF name = "marine helmet" desc = "If you wanna to keep your brain inside yo' head, you'd best put this on!" - icon_state = "UNSC_helm" - item_state = "UNSC_helm" + icon_state = "unsc_helm" + item_state = "unsc_helm" icon = 'icons/obj/clothing/hats_vr.dmi' icon_override = 'icons/mob/head_vr.dmi' diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 349b0e01e7..76d55dcc82 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -60,7 +60,7 @@ /obj/item/clothing/suit/armor/combat/USDF name = "marine body armor" desc = "When I joined the Corps, we didn't have any fancy-schmanzy armor. We had sticks! Two sticks, and a rock for the whole platoon–and we had to share the rock!" - icon_state = "UNSC_armor" + icon_state = "unsc_armor" icon = 'icons/obj/clothing/suits_vr.dmi' icon_override = 'icons/mob/suit_vr.dmi' body_parts_covered = UPPER_TORSO|LOWER_TORSO // ToDo: Break up the armor into smaller bits. From b80b736e16d1c8ac4c0f449646222359e93af076 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 3 Jul 2018 10:26:57 -0400 Subject: [PATCH 2/2] Fixes Imperial Laser too --- code/modules/vore/fluffstuff/custom_guns_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index c696182ae9..06d133c441 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -541,6 +541,7 @@ /obj/item/projectile/beam/imperial name = "laser beam" + fire_sound = 'sound/weapons/mandalorian.ogg' icon_state = "darkb" light_color = "#8837A3" muzzle_type = /obj/effect/projectile/darkmatter/muzzle