cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 08:11:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-02-19 17:54:22 -05:00
committed by GitHub
parent e723ed2118
commit ab14efcf41
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/miscellaneous_vr.dm
-3
View File
@@ -60,8 +60,6 @@
name = "knight gauntlets"
icon_state = "brown"
item_state = "brown"
<<<<<<< HEAD
=======
/obj/item/clothing/gloves/heavy_engineer
desc = "Elbow-length insulated gloves, with added reinforcement. They'll keep your fingers and forearms just that little bit safer from things that might try to melt, mangle, or burn them. A tag on the inside of each glove reads \'PROPERTY OF ENGINEERING, RETURN IF FOUND\'."
@@ -83,4 +81,3 @@
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
>>>>>>> 9b8bc2c486a... Merge pull request #12233 from KillianKirilenko/kk-fluff