cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
killer653
2017-09-15 18:21:28 -04:00
parent d9538dcfd3 72ebf79a0c
commit 55ee9cb15e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/vore/fluffstuff/custom_items_vr.dm
View File

@@ -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"
@@ -1396,4 +1397,4 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
H.monkeyize()
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>")

4
config/custom_items.txt
View File

@@ -614,7 +614,7 @@ item_path: /obj/item/clothing/head/fluff/runac
{
ckey: verkister
character_name: Cameron Eggbert
item_path: /obj/item/clothing/glasses/science_proper
item_path: /obj/item/clothing/glasses/fluff/science_proper
}
{
ckey: verkister
@@ -624,7 +624,7 @@ item_path: /obj/item/weapon/disk/limb/eggnerdltd
{
ckey: verkister
character_name: Opie Eggbert
item_path: /obj/item/clothing/glasses/spiffygogs
item_path: /obj/item/clothing/glasses/fluff/spiffygogs
}
{
ckey: virgo113