makes sec gloves way more obvious

1. makes krav maga gloves pathed under black gloves for fire resistance
2. adds sprites for krav maga gloves to hands.dmi and gloves.dmi
3. sets up a var to prevent krav gloves from being cut into fingerless gloves in color.dm
4. makes sec use the new path for krav gloves in security.dm
This commit is contained in:
PKPenguin321
2016-04-17 21:06:26 -07:00
parent 7501ddebf9
commit 866f63d2d4
5 changed files with 15 additions and 11 deletions
+8 -8
View File
@@ -146,26 +146,26 @@ datum/martial_art/krav_maga/grab_act(var/mob/living/carbon/human/A, var/mob/livi
//Krav Maga Gloves
/obj/item/clothing/gloves/krav_maga
desc = "These gloves can teach you to perform Krav Maga using nanochips."
name = "black gloves"
icon_state = "black"
item_state = "bgloves"
/obj/item/clothing/gloves/color/black/krav_maga
can_be_cut = 0
var/datum/martial_art/krav_maga/style = new
/obj/item/clothing/gloves/krav_maga/equipped(mob/user, slot)
/obj/item/clothing/gloves/color/black/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/krav_maga/dropped(mob/user)
/obj/item/clothing/gloves/color/black/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/krav_maga/sec//more obviously named, given to sec
/obj/item/clothing/gloves/color/black/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"
+4
View File
@@ -36,6 +36,7 @@
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
burn_state = FIRE_PROOF
var/can_be_cut = 1
/obj/item/clothing/gloves/color/black/hos
item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way.
@@ -45,6 +46,9 @@
/obj/item/clothing/gloves/color/black/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/wirecutters))
if(!can_be_cut)
..()
return
if(icon_state == initial(icon_state)) //only if not dyed
user << "<span class='notice'>You snip the fingertips off of [src].</span>"
playsound(user.loc,'sound/items/Wirecutter.ogg', rand(10,50), 1)
+3 -3
View File
@@ -40,7 +40,7 @@ Head of Security
uniform = /obj/item/clothing/under/rank/head_of_security
shoes = /obj/item/clothing/shoes/jackboots
suit = /obj/item/clothing/suit/armor/hos/trenchcoat
gloves = /obj/item/clothing/gloves/krav_maga/sec
gloves = /obj/item/clothing/gloves/color/black/krav_maga/sec
head = /obj/item/clothing/head/HoS/beret
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
suit_store = /obj/item/weapon/gun/energy/gun
@@ -98,7 +98,7 @@ Warden
uniform = /obj/item/clothing/under/rank/warden
shoes = /obj/item/clothing/shoes/jackboots
suit = /obj/item/clothing/suit/armor/vest/warden
gloves = /obj/item/clothing/gloves/krav_maga/sec
gloves = /obj/item/clothing/gloves/color/black/krav_maga/sec
head = /obj/item/clothing/head/warden
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
r_pocket = /obj/item/device/assembly/flash/handheld
@@ -207,7 +207,7 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science")
belt = /obj/item/device/pda/security
ears = /obj/item/device/radio/headset/headset_sec/alt
uniform = /obj/item/clothing/under/rank/security
gloves = /obj/item/clothing/gloves/krav_maga/sec
gloves = /obj/item/clothing/gloves/color/black/krav_maga/sec
head = /obj/item/clothing/head/helmet/sec
suit = /obj/item/clothing/suit/armor/vest
shoes = /obj/item/clothing/shoes/jackboots
Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB