From e40e24e22066ec01e840c7d49c3fffc5d9ea7379 Mon Sep 17 00:00:00 2001 From: NikNakFlak Date: Fri, 22 Jul 2016 16:47:02 -0700 Subject: [PATCH] Washing machine code is bad and so is whoever did krav_maga at first --- code/datums/martial/krav_maga.dm | 16 ++++++++++------ .../crates_lockers/closets/secure/security.dm | 2 +- icons/mob/hands.dmi | Bin 8106 -> 8108 bytes 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index dbb847ee529..1da9d820a76 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -152,26 +152,30 @@ datum/martial_art/krav_maga/grab_act(var/mob/living/carbon/human/A, var/mob/livi //Krav Maga Gloves -/obj/item/clothing/gloves/color/black/krav_maga - can_be_cut = 0 +/obj/item/clothing/gloves/krav_maga var/datum/martial_art/krav_maga/style = new -/obj/item/clothing/gloves/color/black/krav_maga/equipped(mob/user, slot) +/obj/item/clothing/gloves/krav_maga/equipped(mob/user, slot) if(!ishuman(user)) return if(slot == slot_gloves) var/mob/living/carbon/human/H = user style.teach(H,1) -/obj/item/clothing/gloves/color/black/krav_maga/dropped(mob/user) +/obj/item/clothing/gloves/krav_maga/dropped(mob/user) if(!ishuman(user)) return var/mob/living/carbon/human/H = user if(H.get_item_by_slot(slot_gloves) == src) style.remove(H) -/obj/item/clothing/gloves/color/black/krav_maga/sec//more obviously named, given to sec +/obj/item/clothing/gloves/krav_maga/sec//more obviously named, given to sec name = "krav maga gloves" desc = "These gloves can teach you to perform Krav Maga using nanochips." icon_state = "fightgloves" - item_state = "fightgloves" \ No newline at end of file + item_state = "fightgloves" + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT + burn_state = FIRE_PROOF \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index d5f8a0e33b8..de874144cd2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -100,7 +100,7 @@ new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/weapon/storage/belt/security/full(src) new /obj/item/device/flashlight/seclite(src) - new /obj/item/clothing/gloves/color/black/krav_maga/sec(src) + new /obj/item/clothing/gloves/krav_maga/sec(src) new /obj/item/weapon/door_remote/head_of_security(src) /obj/structure/closet/secure_closet/security diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 2520e4ebae9e91b71c013cafc2059c52917815a7..dfe487caa8ba487441b4e754beb9d36a75d55f11 100644 GIT binary patch delta 170 zcmV;b09F60Kde8HBmonVB|ig+kRFj|NPo!=6KM4kthjaO!FpvUQ9do|1clT33)P|l zrRYQLH7|lD`VWhCz0coKJjnVqGf2HMugChZcTOoUt9Xp!SrZpz_GUDItX4dVl^rOr zvtHrV^U91iR&A6%qsuzzT&!b-;ZE7%7#fH%`cUB!w*xEiuat*r$vR!UouwwOe-hr= Y((!zt!>KbrrAM7;cwE6wvpxZA9*6`|B>(^b delta 168 zcmV;Z09XI4KdL{FBmohTB|ig65Fe3eNPnQyOR(bBod@45JBjjXQ70&z)_SYfzRb~uIxVvIgic*O0%3e=VIFfCc9i?_4X#P!cRTM#;) W4|F(n<_Anno6V^zBBirH0c;-iz)bM~