diff --git a/code/WorkInProgress/Ported/Bureaucracy/filing.dm b/code/WorkInProgress/Ported/Bureaucracy/filing.dm index a742371e33..47ffb29f3d 100644 --- a/code/WorkInProgress/Ported/Bureaucracy/filing.dm +++ b/code/WorkInProgress/Ported/Bureaucracy/filing.dm @@ -1,8 +1,8 @@ /obj/structure/filingcabinet name = "Filing Cabinet" desc = "A large cabinet with drawers." - icon = 'computer.dmi' - icon_state = "messyfiles" + icon = 'bureaucracy.dmi' + icon_state = "filingcabinet" density = 1 anchored = 1 diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index 66a3b25915..b4ba4f2b18 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -136,7 +136,7 @@ if(H.gloves != src) if(prob(75) && istype(H.gloves, /obj/item/clothing/gloves/latex)) return 0 - else if(H.gloves && !istype(H.gloves, /obj/item/clothing/gloves/latex)) + else if(H.gloves && !istype(H.gloves, /obj/item/clothing/gloves/latex) && !istype(H.gloves, /obj/item/clothing/gloves/fingerless)) return 0 if(fingerprintslast != H.key) fingerprintshidden += text("Real name: [], Key: []",H.real_name, H.key) diff --git a/code/modules/clothing/gloves.dm b/code/modules/clothing/gloves.dm index 0faf49808b..5ddbd9a396 100644 --- a/code/modules/clothing/gloves.dm +++ b/code/modules/clothing/gloves.dm @@ -242,4 +242,19 @@ color="brown" cargo - color = "cargo" //Exists for washing machines. Is not different from brown gloves in any way. \ No newline at end of file + color = "cargo" //Exists for washing machines. Is not different from brown gloves in any way. + +//Fingerless gloves + +/obj/item/clothing/gloves/fingerless + name = "fingerless gloves" + desc = "A pair of gloves. They don't seem to have fingers." + icon_state = "fingerless_black" + item_state = "fingerless_black" + +/obj/item/clothing/gloves/fingerless/black + name = "black fingerless gloves" + desc = "A pair of black gloves. They don't seem to have fingers." + icon_state = "fingerless_black" + item_state = "fingerless_black" + color="black" \ No newline at end of file diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 29d0fd98c8..ae0c24177e 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index df838aaa6b..854f82bd17 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 3d52d8054c..5b8a7ac543 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 26d6dc44b5..ebad33c1b6 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index efe04808b5..98f9c04bd4 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/icons/obj/plants.dmi b/icons/obj/plants.dmi new file mode 100644 index 0000000000..ea82f747fa Binary files /dev/null and b/icons/obj/plants.dmi differ