diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 62a6e675c4..4c20e9924e 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -196,7 +196,7 @@ gender = PLURAL //Carn: for grammarically correct text-parsing w_class = ITEMSIZE_SMALL icon = 'icons/obj/clothing/gloves.dmi' - siemens_coefficient = 0.75 + siemens_coefficient = 0.9 var/wired = 0 var/obj/item/weapon/cell/cell = 0 var/fingerprint_chance = 0 //How likely the glove is to let fingerprints through diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index d7e0362272..370306539a 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -6,21 +6,21 @@ permeability_coefficient = 0.05 /obj/item/clothing/gloves/fyellow //Cheap Chinese Crap - desc = "These gloves are cheap copies of the coveted gloves, no way this can end badly." + desc = "These gloves are cheap copies of proper insulated gloves. No way this can end badly." name = "budget insulated gloves" icon_state = "yellow" siemens_coefficient = 1 //Set to a default of 1, gets overridden in New() permeability_coefficient = 0.05 - New() - //average of 0.5, somewhat better than regular gloves' 0.75 - siemens_coefficient = pick(0,0.1,0.3,0.5,0.5,0.75,1.35) +/obj/item/clothing/gloves/fyellow/New() + //Picks a value between 0 and 1, in 5% increments + var/shock_pick = rand(0,20) + siemens_coefficient = shock_pick * 0.05 /obj/item/clothing/gloves/black desc = "These work gloves are thick and fire-resistant." name = "black gloves" icon_state = "black" - siemens_coefficient = 0.50 permeability_coefficient = 0.05 cold_protection = HANDS diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index ea194e1a51..27db4424d7 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -16,7 +16,6 @@ name = "forensic gloves" icon_state = "forensic" item_state = "black" - siemens_coefficient = 0.50 permeability_coefficient = 0.05 cold_protection = HANDS @@ -81,14 +80,13 @@ icon_state = "leather" item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown") permeability_coefficient = 0.05 - siemens_coefficient = 0.50 //thick work gloves + siemens_coefficient = 0.75 //thick work gloves /obj/item/clothing/gloves/duty desc = "These brown duty gloves are made from a durable synthetic." name = "work gloves" icon_state = "work" item_state = "wgloves" - siemens_coefficient = 0.50 armor = list(melee = 10, bullet = 10, laser = 10, energy = 5, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/gloves/tactical @@ -97,7 +95,7 @@ icon_state = "work" item_state = "wgloves" force = 5 - siemens_coefficient = 0.50 + siemens_coefficient = 0.75 permeability_coefficient = 0.05 armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0) diff --git a/html/changelogs/Anewbe - Gloves.yml b/html/changelogs/Anewbe - Gloves.yml new file mode 100644 index 0000000000..ddb365ea94 --- /dev/null +++ b/html/changelogs/Anewbe - Gloves.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Gloves are generally less protective from shocks." + - tweak: "Budget Insulated Gloves will almost always be better than any other non-insulated glove."