diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index b4d42305f0e..eaccb9108c2 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -117439,7 +117439,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, -/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/fyellow, /obj/item/storage/toolbox/electrical, /obj/item/multitool, /turf/simulated/floor/plasteel{ @@ -119945,7 +119945,7 @@ /area/crew_quarters/captain/bedroom) "wPi" = ( /obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/fyellow, /obj/item/storage/toolbox/electrical, /obj/item/multitool, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/celestation/celestation.dmm b/_maps/map_files/celestation/celestation.dmm index b33c5d41cc7..27aac85ba4c 100644 --- a/_maps/map_files/celestation/celestation.dmm +++ b/_maps/map_files/celestation/celestation.dmm @@ -101066,7 +101066,7 @@ "sdv" = ( /obj/structure/rack, /obj/item/storage/toolbox/electrical, -/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/fyellow, /obj/item/t_scanner, /obj/item/multitool, /turf/simulated/floor/plating, diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index 9af7a647563..bbd6506be2a 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -26899,7 +26899,7 @@ pixel_x = 1; pixel_y = -1 }, -/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/fyellow, /obj/item/t_scanner, /obj/item/multitool, /turf/simulated/floor/plating, diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 672a0db91b1..c737e05e439 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -42216,7 +42216,7 @@ pixel_x = 1; pixel_y = -1 }, -/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/fyellow, /obj/item/t_scanner, /obj/item/clothing/glasses/meson, /obj/item/multitool, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index cef94438757..c55ef782bb5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -39,7 +39,6 @@ custom_door_overlay = "engelec" /obj/structure/closet/secure_closet/engineering_electrical/populate_contents() - new /obj/item/clothing/gloves/color/yellow(src) new /obj/item/clothing/gloves/color/yellow(src) new /obj/item/storage/toolbox/electrical(src) new /obj/item/storage/toolbox/electrical(src) @@ -85,6 +84,7 @@ new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/glasses/meson(src) + new /obj/item/clothing/gloves/color/fyellow(src) new /obj/item/cartridge/engineering(src) new /obj/item/clothing/head/beret/eng(src) new /obj/item/clothing/head/hardhat/orange(src) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index bb94ca477c3..f0a26a4f5f4 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -62,17 +62,16 @@ /obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap desc = "These gloves are cheap copies of the coveted gloves, no way this can end badly." name = "budget insulated gloves" - icon_state = "yellow" + icon_state = "fyellow" item_state = "ygloves" + siemens_coefficient = 0 //Set to a default of 0 belt_icon = "ygloves" - siemens_coefficient = 1 //Set to a default of 1, gets overridden in New() permeability_coefficient = 0.05 item_color="yellow" resistance_flags = NONE + toolspeedmod = 0.2 + clothing_traits = list(TRAIT_NO_GUNS) -/obj/item/clothing/gloves/color/fyellow/New() - ..() - siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5) /obj/item/clothing/gloves/color/fyellow/old desc = "Old and worn out insulated gloves, hopefully they still work." diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 6e1299b96c1..b2829a92ec0 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ