VOREStation Specific Merge Changes

* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.

code/modules/clothing/suits/miscellaneous.dm

@@ -798,6 +798,7 @@ obj/item/clothing/suit/storage/toggle/peacoat
 	name = "explorer hood"
 	desc = "An armoured hood for exploring harsh environments."
 	icon_state = "explorer"
+	brightness_on = 3 // VOREStation Edit - Keep hood light for now - TODO Drain power
 	body_parts_covered = HEAD
 	cold_protection = HEAD
 	flags = THICKMATERIAL

code/modules/mob/living/carbon/human/update_icons.dm

@@ -265,7 +265,7 @@ Please contact me on #coderbus IRC. ~Carn x
 
 		else if(!typing_indicator && hud_typing) //Are they in their body, NOT dead, have hud_typing, do NOT have a typing indicator. and have it enabled?
 			typing_indicator = new
-			typing_indicator.icon = 'icons/mob/talk.dmi'
+			typing_indicator.icon = 'icons/mob/talk_vr.dmi' //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons
 			typing_indicator.icon_state = "[speech_bubble_appearance()]_typing"
 			overlays += typing_indicator
 			list_huds += typing_indicator

code/modules/mob/living/silicon/robot/robot_modules/station.dm

@@ -512,7 +512,7 @@ var/global/list/robot_modules = list(
 	src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
 	src.modules += new /obj/item/weapon/melee/baton/robot(src)
 	src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src)
-	src.modules += new /obj/item/weapon/gun/energy/taser/xeno/sec/robot(src)
+	// src.modules += new /obj/item/weapon/gun/energy/taser/xeno/sec/robot(src) // VOREStation Edit - We don't need these
 	src.modules += new /obj/item/taperoll/police(src)
 	src.modules += new /obj/item/weapon/reagent_containers/spray/pepper(src)
 	src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src)

code/modules/organs/internal/eyes.dm

@@ -95,5 +95,7 @@
 	return -1
 
 /obj/item/organ/internal/eyes/emp_act(severity)
-	..()	//Returns if the organ isn't robotic
-	owner.eye_blurry += (4/severity)
+	// ..()	//Returns if the organ isn't robotic // VOREStation Edit - Don't take damage
+	if(!(robotic >= ORGAN_ASSISTED))
+		return
+	owner.eye_blurry += (4/severity)

code/modules/organs/internal/organ_internal_vr.dm

@@ -1,11 +0,0 @@
-/obj/item/organ/internal/eyes/emp_act(severity)
-	if(!(robotic >= ORGAN_ASSISTED))
-		return
-	owner.eye_blurry += (4/severity)
-
-/obj/item/organ/internal/cell/emp_act(severity)
-	owner.nutrition = max(0, owner.nutrition - rand(10/severity, 50/severity))
-
-/obj/item/organ/internal/mmi_holder/emp_act(severity)
-	owner.adjustToxLoss(rand(6/severity, 12/severity))
-

code/modules/organs/subtypes/machine.dm

@@ -18,7 +18,7 @@
 		owner.visible_message("<span class='danger'>\The [owner] twitches visibly!</span>")
 
 /obj/item/organ/internal/cell/emp_act(severity)
-	..()
+	// ..() // VOREStation Edit - Don't take damage
 	owner.nutrition = max(0, owner.nutrition - rand(10/severity, 50/severity))
 
 // Used for an MMI or posibrain being installed into a human.
@@ -88,7 +88,7 @@
 	qdel(src)
 
 /obj/item/organ/internal/mmi_holder/emp_act(severity)
-	..()
+	// ..() // VOREStation Edit - Don't take damage
 	owner.adjustToxLoss(rand(6/severity, 12/severity))
 
 /obj/item/organ/internal/mmi_holder/posibrain

code/modules/projectiles/guns/energy/special.dm

@@ -22,7 +22,7 @@
 	force = 5
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	charge_cost = 480
-	projectile_type = /obj/item/projectile/ion/pistol
+	projectile_type = /obj/item/projectile/ion/pistol // still packs a punch but no AoE
 
 /obj/item/weapon/gun/energy/phasegun
 	name = "phase pistol"