Xenomorph Protean Suit 2, Gloves Readjustment (#7423)

code/modules/clothing/clothing.dm

@@ -325,12 +325,6 @@
 		)
 	drop_sound = 'sound/items/drop/gloves.ogg'
 	pickup_sound = 'sound/items/pickup/gloves.ogg'
-// CHOMPedit start: All gloves give cold/heat protection.
-	cold_protection = HANDS
-	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
-	heat_protection = HANDS
-	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
-// CHOMPedit end.
 
 /obj/item/clothing/proc/set_clothing_index()
 	return

code/modules/clothing/gloves/color.dm

@@ -9,6 +9,13 @@
 	drop_sound = 'sound/items/drop/rubber.ogg'
 	pickup_sound = 'sound/items/pickup/rubber.ogg'
 
+// CHOMPedit start: More gloves give cold/heat protection.
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+// CHOMPedit end.
+
 /obj/item/clothing/gloves/fyellow                             //Cheap Chinese Crap
 	desc = "These gloves are cheap copies of proper insulated gloves. No way this can end badly."
 	name = "budget insulated gloves"
@@ -37,49 +44,112 @@
 
 /obj/item/clothing/gloves/orange
 	name = "orange gloves"
-	desc = "A pair of gloves, they don't look special in any way."
+	desc = "A pair of gloves. They look heat-resistant." // CHOMPedit: Updated description for temp changes.
 	icon_state = "orange"
 
+// CHOMPedit start: More gloves give cold/heat protection.
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+// CHOMPedit end.
+
 /obj/item/clothing/gloves/red
 	name = "red gloves"
-	desc = "A pair of gloves, they don't look special in any way."
+	desc = "A pair of gloves. They look heat-resistant." // CHOMPedit: Updated description for temp changes.
 	icon_state = "red"
 
+// CHOMPedit start: More gloves give cold/heat protection.
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+// CHOMPedit end.
+
 /obj/item/clothing/gloves/rainbow
 	name = "rainbow gloves"
-	desc = "A pair of gloves, they don't look special in any way."
+	desc = "A pair of gloves. They look heat-resistant." // CHOMPedit: Updated description for temp changes.
 	icon_state = "rainbow"
 
+// CHOMPedit start: More gloves give cold/heat protection.
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+// CHOMPedit end.
+
 /obj/item/clothing/gloves/blue
 	name = "blue gloves"
-	desc = "A pair of gloves, they don't look special in any way."
+	desc = "A pair of gloves. They look heat-resistant." // CHOMPedit: Updated description for temp changes.
 	icon_state = "blue"
 
+// CHOMPedit start: More gloves give cold/heat protection.
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+// CHOMPedit end.
+
 /obj/item/clothing/gloves/purple
 	name = "purple gloves"
-	desc = "A pair of gloves, they don't look special in any way."
+	desc = "A pair of gloves. They look heat-resistant." // CHOMPedit: Updated description for temp changes.
 	icon_state = "purple"
 
+// CHOMPedit start: More gloves give cold/heat protection.
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+// CHOMPedit end.
+
 /obj/item/clothing/gloves/green
 	name = "green gloves"
-	desc = "A pair of gloves, they don't look special in any way."
+	desc = "A pair of gloves. They look heat-resistant." // CHOMPedit: Updated description for temp changes.
 	icon_state = "green"
 
+// CHOMPedit start: More gloves give cold/heat protection.
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+// CHOMPedit end.
+
 /obj/item/clothing/gloves/grey
 	name = "grey gloves"
-	desc = "A pair of gloves, they don't look special in any way."
+	desc = "A pair of gloves. They look heat-resistant." // CHOMPedit: Updated description for temp changes.
 	icon_state = "gray"
 
+// CHOMPedit start: More gloves give cold/heat protection.
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+// CHOMPedit end.
+
 /obj/item/clothing/gloves/light_brown
 	name = "light brown gloves"
-	desc = "A pair of gloves, they don't look special in any way."
+	desc = "A pair of gloves. They look heat-resistant." // CHOMPedit: Updated description for temp changes.
 	icon_state = "lightbrown"
 
+// CHOMPedit start: More gloves give cold/heat protection.
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+// CHOMPedit end.
+
 /obj/item/clothing/gloves/brown
 	name = "brown gloves"
-	desc = "A pair of gloves, they don't look special in any way."
+	desc = "A pair of gloves. They look heat-resistant." // CHOMPedit: Updated description for temp changes.
 	icon_state = "brown"
 
+// CHOMPedit start: More gloves give cold/heat protection.
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+// CHOMPedit end.
+
 /obj/item/clothing/gloves/evening
 	desc = "A pair of gloves that reach past the elbow.  Fancy!"
 	name = "evening gloves"

code/modules/clothing/gloves/miscellaneous.dm

@@ -34,9 +34,10 @@
 	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+	armor = list(melee = 15, bullet = 10, laser = 10, energy = 10, bomb = 5, bio = 0, rad = 0) // CHOMPedit: Now protective.
 
-/obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves
-	desc = "These tactical gloves are somewhat fire and impact resistant."
+/obj/item/clothing/gloves/combat //CHOMPedit: Combined effect of SWAT gloves and insulated gloves, with better protective stats.
+	desc = "These military-grade tactical gloves protect the user from electrical shocks, fire, high-velocity impacts and varying temperatures." // CHOMPedit: Updated description.
 	name = "combat gloves"
 	icon_state = "swat"
 	item_state = "swat"
@@ -46,6 +47,7 @@
 	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+	armor = list(melee = 20, bullet = 15, laser = 15, energy = 15, bomb = 10, bio = 0, rad = 0) // CHOMPedit: Now protective.
 
 /obj/item/clothing/gloves/sterile
 	name = "sterile gloves"

modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm

@@ -162,7 +162,7 @@
 		SPECIES_TESHARI 		 = 'modular_chomp/icons/mob/species/teshari/hands_ch.dmi',
 		SPECIES_VASILISSAN		 = 'modular_chomp/icons/mob/hands_ch.dmi',
 		SPECIES_VOX				 = 'modular_chomp/icons/mob/species/vox/gloves_ch.dmi',
-		SPECIES_XENOMORPH_HYBRID = 'modular_chomp/icons/mob/hands_ch.dmi'
+		SPECIES_XENOMORPH_HYBRID = 'modular_chomp/icons/mob/species/xenomorph_hybrid/gloves_ch.dmi'
 		)
 
 	sprite_sheets_obj = list(
@@ -191,8 +191,9 @@
 	desc = "Boot-shaped clusters of nanomachines."
 	species_restricted = list(SPECIES_PROTEAN, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_XENOMORPH_HYBRID)
 	sprite_sheets = list(
-		SPECIES_TESHARI 		= 'modular_chomp/icons/mob/species/teshari/feet_ch.dmi',
-		SPECIES_VOX				= 'modular_chomp/icons/mob/species/vox/shoes_ch.dmi'
+		SPECIES_TESHARI 		 = 'modular_chomp/icons/mob/species/teshari/feet_ch.dmi',
+		SPECIES_VOX				 = 'modular_chomp/icons/mob/species/vox/shoes_ch.dmi',
+		SPECIES_XENOMORPH_HYBRID = 'modular_chomp/icons/mob/species/xenomorph_hybrid/shoes_ch.dmi'
 		)
 	sprite_sheets_obj = list()
 	icon = 'modular_chomp/icons/mob/feet_ch.dmi'
@@ -212,8 +213,9 @@
 		/obj/item/weapon/storage/backpack,
 		)
 	sprite_sheets = list(
-		SPECIES_TESHARI 		= 'modular_chomp/icons/mob/species/teshari/suit_ch.dmi',
-		SPECIES_VOX				= 'modular_chomp/icons/mob/species/vox/suit_ch.dmi'
+		SPECIES_TESHARI 		 = 'modular_chomp/icons/mob/species/teshari/suit_ch.dmi',
+		SPECIES_VOX				 = 'modular_chomp/icons/mob/species/vox/suit_ch.dmi',
+		SPECIES_XENOMORPH_HYBRID = 'modular_chomp/icons/mob/species/xenomorph_hybrid/suit_ch.dmi'
 		)
 
 	sprite_sheets_obj = list()