Skip to content

Commit

Permalink
Fixes a handful of sprite issues (tgstation#68346)
Browse files Browse the repository at this point in the history
Co-authored-by: TWAT <[email protected]>
  • Loading branch information
Twaticus and TWAT authored Jul 17, 2022
1 parent 18a3a32 commit 8a9f01c
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 23 deletions.
23 changes: 1 addition & 22 deletions code/modules/clothing/gloves/plasmaman.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
desc = "Covers up those scandalous boney hands."
name = "plasma envirogloves"
icon_state = "plasmaman"
inhand_icon_state = "plasmaman"
inhand_icon_state = "bgloves"
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
Expand All @@ -13,111 +13,90 @@
/obj/item/clothing/gloves/color/plasmaman/black
name = "black envirogloves"
icon_state = "blackplasma"
inhand_icon_state = "blackplasma"

/obj/item/clothing/gloves/color/plasmaman/plasmanitrile
name = "nitrile envirogloves"
desc = "Pricy nitrile gloves made for plasmamen."
icon_state = "nitrile"
inhand_icon_state = "nitrilegloves"
clothing_traits = list(TRAIT_QUICKER_CARRY, TRAIT_FASTMED)

/obj/item/clothing/gloves/color/plasmaman/white
name = "white envirogloves"
icon_state = "whiteplasma"
inhand_icon_state = "whiteplasma"

/obj/item/clothing/gloves/color/plasmaman/robot
name = "roboticist envirogloves"
icon_state = "robotplasma"
inhand_icon_state = "robotplasma"

/obj/item/clothing/gloves/color/plasmaman/janny
name = "janitor envirogloves"
icon_state = "jannyplasma"
inhand_icon_state = "jannyplasma"

/obj/item/clothing/gloves/color/plasmaman/cargo
name = "cargo envirogloves"
icon_state = "cargoplasma"
inhand_icon_state = "cargoplasma"

/obj/item/clothing/gloves/color/plasmaman/engineer
name = "engineering envirogloves"
icon_state = "engieplasma"
inhand_icon_state = "engieplasma"
siemens_coefficient = 0

/obj/item/clothing/gloves/color/plasmaman/atmos
name = "atmos envirogloves"
icon_state = "atmosplasma"
inhand_icon_state = "atmosplasma"

/obj/item/clothing/gloves/color/plasmaman/explorer
name = "explorer envirogloves"
icon_state = "explorerplasma"
inhand_icon_state = "explorerplasma"

/obj/item/clothing/gloves/color/plasmaman/botanic_leather
name = "botany envirogloves"
desc = "These leather gloves protect your boney hands against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
icon_state = "botanyplasma"
inhand_icon_state = "botanyplasma"
clothing_traits = list(TRAIT_PLANT_SAFE)

/obj/item/clothing/gloves/color/plasmaman/prototype
name = "prototype envirogloves"
icon_state = "protoplasma"
inhand_icon_state = "protoplasma"

/obj/item/clothing/gloves/color/plasmaman/clown
name = "clown envirogloves"
icon_state = "clownplasma"
inhand_icon_state = "clownplasma"

/obj/item/clothing/gloves/combat/wizard
name = "enchanted gloves"
desc = "These gloves have been enchanted with a spell that makes them electrically insulated and fireproof."
icon_state = "wizard"
inhand_icon_state = "purplegloves"


/obj/item/clothing/gloves/color/plasmaman/head_of_personnel
name = "head of personnel's envirogloves"
desc = "Covers up those scandalous, bony hands. Appears to be an attempt at making a replica of the captain's gloves."
icon_state = "hopplasma"
inhand_icon_state = "hopplasma"

/obj/item/clothing/gloves/color/plasmaman/chief_engineer
name = "chief engineer's envirogloves"
icon_state = "ceplasma"
inhand_icon_state = "ceplasma"
siemens_coefficient = 0

/obj/item/clothing/gloves/color/plasmaman/research_director
name = "research director's envirogloves"
icon_state = "rdplasma"
inhand_icon_state = "rdplasma"

/obj/item/clothing/gloves/color/plasmaman/centcom_commander
name = "CentCom commander envirogloves"
icon_state = "commanderplasma"
inhand_icon_state = "commanderplasma"

/obj/item/clothing/gloves/color/plasmaman/centcom_official
name = "CentCom official envirogloves"
icon_state = "officialplasma"
inhand_icon_state = "officialplasma"

/obj/item/clothing/gloves/color/plasmaman/centcom_intern
name = "CentCom intern envirogloves"
icon_state = "internplasma"
inhand_icon_state = "internplasma"

/obj/item/clothing/gloves/color/plasmaman/radio
name = "translation envirogloves"
desc = "Allows the less vocally-capable plasmamen to use sign language over comms."
icon_state = "radio_gplasma"
inhand_icon_state = "radio_gplasma"
worn_icon_state = "radio_g"
clothing_traits = list(TRAIT_CAN_SIGN_ON_COMMS)
2 changes: 1 addition & 1 deletion code/modules/clothing/masks/gasmask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
desc = "Oooh, gold and green. Fancy! This should help as you sit in your office."
icon = 'icons/obj/clothing/masks.dmi'
worn_icon = 'icons/mob/clothing/mask.dmi'
worn_icon_state = "centcomspace"
worn_icon_state = "gas_centcom"
icon_state = "gas_centcom"
inhand_icon_state = "gas_centcom"
resistance_flags = FIRE_PROOF | ACID_PROOF
Expand Down
Binary file modified icons/obj/tiles.dmi
Binary file not shown.
Binary file modified icons/obj/vehicles.dmi
Binary file not shown.

0 comments on commit 8a9f01c

Please sign in to comment.