cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-5654

Browse Source
This commit is contained in:
Spades
2019-03-01 05:42:07 -05:00
committed by GitHub
parent dd6949a779 71d1a05531
commit 6e2172a5ae
736 changed files with 29915 additions and 32830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_boxes_vr.dm
+4 -4
View File
@@ -228,18 +228,18 @@
/obj/item/clothing/gloves/fluff/morsleeves,
/obj/item/clothing/under/fluff/morunder)
// Mewchild: Phi Vietsi
/obj/item/weapon/storage/box/fluff/vietsi
// Mewchild: Phi Ahkeen
/obj/item/weapon/storage/box/fluff/phi
name = "Phi's Personal Items"
has_items = list(
/obj/item/clothing/accessory/medal/bronze_heart,
/obj/item/clothing/gloves/ring/seal/signet/fluff/vietsi)
/obj/item/clothing/gloves/ring/seal/signet/fluff/phi)
// Tabiranth: Ascian
/obj/item/weapon/grenade/spawnergrenade/spirit
name = "spirit's pet carrier"
desc = "Contains kitten."
spawner_type = /mob/living/simple_animal/cat/fluff/tabiranth
spawner_type = /mob/living/simple_mob/animal/passive/cat/tabiranth
deliveryamt = 1
/*
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+9 -7
View File
@@ -780,6 +780,9 @@
/obj/item/clothing/head/fluff/pompom/digest_act(var/atom/movable/item_storage = null)
return FALSE
/obj/item/clothing/head/fluff/pompom/gurgle_contaminate(var/atom/movable/item_storage = null)
return FALSE
/obj/item/clothing/head/fluff/pompom/attack_self(mob/user)
//if(!isturf(user.loc)) -- doesn't seem to cause problems to allow this and it's silly not to
// to_chat(user, "You cannot turn the light on while in this [user.loc]")
@@ -1686,16 +1689,15 @@ Departamental Swimsuits, for general use
icon_state = "kilanosuit_p"
item_state = "kilanosuit_p"
//Mewchild: Phi Vietsi
/obj/item/clothing/gloves/ring/seal/signet/fluff/vietsi
name = "Phi Vietsi's Bone Signet Ring"
desc = "A signet ring belonging to Phi Vietsi, carved from the bones of something long extinct, as a ward against bad luck."
var/signet_name = "Phi Vietsi"
//Mewchild: Phi Ahkeen
/obj/item/clothing/gloves/ring/seal/signet/fluff/phi
name = "Phi's Bone Signet Ring"
desc = "A signet ring belonging to Phi, carved from the bones of something long extinct, as a ward against bad luck."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "vietsi_ring"
icon_state = "phi_ring"
/obj/item/clothing/gloves/ring/seal/signet/fluff/vietsi/change_name(var/signet_name = "Unknown")
/obj/item/clothing/gloves/ring/seal/signet/fluff/phi/change_name(var/signet_name = "Unknown")
name = "[signet_name]'s Bone Signet Ring"
desc = "A signet ring belonging to [signet_name], carved from the bones of something long extinct, as a ward against bad luck."