Merge remote-tracking branch 'refs/remotes/VOREStation/master' into NUMBING_BITE_V2

This commit is contained in:
killer653
2017-09-14 15:31:17 -04:00
6 changed files with 10 additions and 8 deletions
@@ -989,7 +989,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
..()
//verkister: Cameron Eggbert - Science goggles that ACTUALLY do nothing.
/obj/item/clothing/glasses/science_proper
/obj/item/clothing/glasses/fluff/science_proper
name = "Aesthetic Science Goggles"
desc = "The goggles really do nothing this time!"
icon_state = "purple"
@@ -997,12 +997,13 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
item_flags = AIRTIGHT
//verkister: Opie Eggbert - Spiffy fluff goggles
/obj/item/clothing/glasses/spiffygogs
/obj/item/clothing/glasses/fluff/spiffygogs
name = "Chad Goggles"
desc = "You can almost feel the raw power radiating off these strange specs."
icon = 'icons/vore/custom_items_vr.dmi'
icon_override = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "spiffygogs"
slot_flags = SLOT_EYES | SLOT_EARS
item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses")
toggleable = 1
off_state = "spiffygogsup"
@@ -1410,4 +1411,4 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
H.species.give_numbing_bite() //This was annoying, but this is the easiest way of performing it.
qdel(src) //One time use.
else //If not, do nothing.
to_chat(user,"<span class='warning'>You are unable to inject other people.</span>")
to_chat(user,"<span class='warning'>You are unable to inject other people.</span>")