From 2c1ad0076fbebed7e4d1707d2561334c47a96a6d Mon Sep 17 00:00:00 2001
From: Unknown <RedKerensky@Gmail.com>
Date: Tue, 22 May 2018 12:49:41 -0400
Subject: [PATCH] Requested Fixes

---
 code/game/objects/items/weapons/material/knives.dm   |  2 ++
 code/modules/clothing/clothing.dm                    |  4 ++--
 .../clothing/under/accessories/accessory_vr.dm       |  2 +-
 code/modules/clothing/under/accessories/holster.dm   |  3 ++-
 code/modules/vore/fluffstuff/custom_guns_vr.dm       | 12 ++++++------
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm
index 94bc9e8f692..c5fd513dcd3 100644
--- a/code/game/objects/items/weapons/material/knives.dm
+++ b/code/game/objects/items/weapons/material/knives.dm
@@ -101,6 +101,7 @@
 	attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut")
 	can_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned.
 	slot_flags = SLOT_BELT
+	default_material = "plasteel"
 
 /obj/item/weapon/material/knife/tacknife/survival
 	name = "survival knife"
@@ -109,4 +110,5 @@
 	icon_state = "survivalknife"
 	item_state = "knife"
 	applies_material_colour = FALSE
+	default_material = "plasteel"
 	toolspeed = 2 // Use a real axe if you want to chop logs.
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index f0c7d86710b..28b5419e4cc 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -632,8 +632,8 @@
 	//convenience var for defining the icon state for the overlay used when the clothing is worn.
 	//Also used by rolling/unrolling.
 	var/worn_state = null
-	valid_accessory_slots = list("utility","armband","machete","decor","over") //VOREStation Edit - Adds Machete Sheath
-	restricted_accessory_slots = list("utility", "armband", "machete") //VOREStation Edit - Adds Machete Sheath
+	valid_accessory_slots = list("utility","armband","sheath","decor","over") //VOREStation Edit - Adds Machete Sheath
+	restricted_accessory_slots = list("utility", "armband", "sheath") //VOREStation Edit - Adds Machete Sheath
 
 	var/icon/rolled_down_icon = 'icons/mob/uniform_rolled_down.dmi'
 	var/icon/rolled_down_sleeves_icon = 'icons/mob/uniform_sleeves_rolled.dmi'
diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm
index 7077089b7b6..fe4e3e49b30 100644
--- a/code/modules/clothing/under/accessories/accessory_vr.dm
+++ b/code/modules/clothing/under/accessories/accessory_vr.dm
@@ -185,7 +185,7 @@
 	icon = 'icons/obj/clothing/ties_vr.dmi'
 	icon_override = 'icons/mob/ties_vr.dmi'
 	icon_state = "holster_machete"
-	slot = "machete"
+	slot = "sheath"
 	concealed_holster = 0
 	can_hold = list(/obj/item/weapon/material/knife/machete)
 	//sound_in = 'sound/effects/holster/sheathin.ogg'
diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm
index 62720d655fb..5a3b1e97d25 100644
--- a/code/modules/clothing/under/accessories/holster.dm
+++ b/code/modules/clothing/under/accessories/holster.dm
@@ -2,7 +2,7 @@
 	name = "shoulder holster"
 	desc = "A handgun holster."
 	icon_state = "holster"
-	slot = "utility"
+	slot = list("utility", "sheath") //VOREStation Edit
 	var/list/can_hold //VOREStation Edit
 	concealed_holster = 1
 	var/obj/item/holstered = null
@@ -18,6 +18,7 @@
 			return
 
 	else if (!(I.slot_flags & SLOT_HOLSTER))
+	//VOREStation Edit End
 		user << "<span class='warning'>[I] won't fit in [src]!</span>"
 		return
 
diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm
index c79fae576f0..ca73cbedd74 100644
--- a/code/modules/vore/fluffstuff/custom_guns_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm
@@ -520,11 +520,11 @@
 /obj/item/weapon/gun/energy/gun/martin/proc/update_mode()
 	var/datum/firemode/current_mode = firemodes[sel_mode]
 	switch(current_mode.name)
-		if("stun") overlays += "taser_pdw"
-		if("lethal") overlays += "lazer_pdw"
+		if("stun") add_overlay("taser_pdw")
+		if("lethal") add_overlay("lazer_pdw")
 
 /obj/item/weapon/gun/energy/gun/martin/update_icon()
-	overlays.Cut()
+	cut_overlays()
 	update_mode()
 
 /////////////////////////////////////////////////////
@@ -821,9 +821,9 @@
 /obj/item/weapon/gun/energy/frontier/locked/holdout/proc/update_mode()
 	var/datum/firemode/current_mode = firemodes[sel_mode]
 	switch(current_mode.name)
-		if("low-power") overlays += "taser_pdw"
-		if("normal") overlays += "lazer_pdw"
+		if("low-power") add_overlay("taser_pdw")
+		if("normal") add_overlay("lazer_pdw")
 
 /obj/item/weapon/gun/energy/frontier/locked/holdout/update_icon()
-	overlays.Cut()
+	cut_overlays()
 	update_mode()