diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm index 1906bd3722..85a37cfd48 100644 --- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm @@ -1,6 +1,7 @@ +/* /datum/species var/vore_numbing = 0 - +*/ /datum/species/custom name = "Custom Species" name_plural = "Custom" diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 6ac0e334aa..143ece2eb8 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -18,13 +18,13 @@ cost = 0 var_changes = list("metabolic_rate" = 2) excludes = list(/datum/trait/metabolism_up, /datum/trait/metabolism_down) - +/* /datum/trait/vore_numbing name = "Prey Numbing" desc = "Adds a 'Digest (Numbing)' belly mode, to douse prey in numbing enzymes during digestion." cost = 0 var_changes = list("vore_numbing" = TRUE) - +*/ /datum/trait/cold_discomfort name = "Hot-Blooded" desc = "You are too hot at the standard 20C. 18C is more suitable. Rolling down your jumpsuit or being unclothed helps." diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index 7523f6682a..acb8a8326d 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -611,6 +611,13 @@ icon_state = "sepulchre_wings" ckeys_allowed = list("sepulchre") +/datum/sprite_accessory/tail/ketrai_wag + name = "fennix tail (vwag)" + desc = "" + icon_state = "ketraitail" + ani_state = "ketraitail_w" + //ckeys_allowed = list("ketrai") //They requested it to be enabled for everyone. + /datum/sprite_accessory/tail/feathered name = "feathered wings, colorable" desc = "" diff --git a/code/modules/vore/eating/belly_vr.dm b/code/modules/vore/eating/belly_vr.dm index f25702ff02..1cdf8297f9 100644 --- a/code/modules/vore/eating/belly_vr.dm +++ b/code/modules/vore/eating/belly_vr.dm @@ -30,7 +30,7 @@ var/datum/belly/transferlocation = null // Location that the prey is released if they struggle and get dropped off. var/tmp/digest_mode = DM_HOLD // Whether or not to digest. Default to not digest. - var/tmp/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_ITEMWEAK,DM_STRIPDIGEST,DM_HEAL,DM_ABSORB,DM_DRAIN,DM_UNABSORB) // Possible digest modes + var/tmp/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_ITEMWEAK,DM_STRIPDIGEST,DM_HEAL,DM_ABSORB,DM_DRAIN,DM_UNABSORB,DM_DIGEST_NUMB) // Possible digest modes var/tmp/list/transform_modes = list(DM_TRANSFORM_MALE,DM_TRANSFORM_FEMALE,DM_TRANSFORM_KEEP_GENDER,DM_TRANSFORM_CHANGE_SPECIES_AND_TAUR,DM_TRANSFORM_CHANGE_SPECIES_AND_TAUR_EGG,DM_TRANSFORM_REPLICA,DM_TRANSFORM_REPLICA_EGG,DM_TRANSFORM_KEEP_GENDER_EGG,DM_TRANSFORM_MALE_EGG,DM_TRANSFORM_FEMALE_EGG, DM_EGG) var/tmp/mob/living/owner // The mob whose belly this is. var/tmp/list/internal_contents = list() // People/Things you've eaten into this belly! diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index e41249e04d..9fdc300421 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -453,9 +453,9 @@ if(href_list["b_mode"]) var/list/menu_list = selected.digest_modes if(istype(usr,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = usr - if(H.species.vore_numbing) - menu_list += DM_DIGEST_NUMB + //var/mob/living/carbon/human/H = usr + //if(H.species.vore_numbing) + //menu_list += DM_DIGEST_NUMB menu_list += selected.transform_modes if(selected.digest_modes.len == 1) // Don't do anything diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 7a8be6517d..1af96037cf 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -24,6 +24,54 @@ */ +//SpoopyLizz: Roiz Lizden +/obj/item/clothing/suit/storage/hooded/wintercoat/roiz + name = "dinosaur winter coat" + desc = "A custom winter coat that looks rather like a dinosaur. It has a nametag that says, Roiz Lizden." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "coatroiz" + item_state_slots = list(slot_r_hand_str = "coatroiz", slot_l_hand_str = "coatroiz") + + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "coatroiz_mob" + +/obj/item/clothing/suit/storage/hooded/wintercoat/roiz/ui_action_click() + ToggleHood_roiz() + +/obj/item/clothing/suit/storage/hooded/wintercoat/roiz/equipped(mob/user, slot) + if(slot != slot_wear_suit) + RemoveHood_roiz() + ..() + +/obj/item/clothing/suit/storage/hooded/wintercoat/roiz/proc/RemoveHood_roiz() + icon_state = "coatroiz" + item_state = "coatroiz_mob" + suittoggled = 0 + if(ishuman(hood.loc)) + var/mob/living/carbon/H = hood.loc + H.unEquip(hood, 1) + H.update_inv_wear_suit() + hood.loc = src + +/obj/item/clothing/suit/storage/hooded/wintercoat/roiz/proc/ToggleHood_roiz() + if(!suittoggled) + if(ishuman(loc)) + var/mob/living/carbon/human/H = src.loc + if(H.wear_suit != src) + H << "You must be wearing [src] to put up the hood!" + return + if(H.head) + H << "You're already wearing something on your head!" + return + else + H.equip_to_slot_if_possible(hood,slot_head,0,0,1) + suittoggled = 1 + icon_state = "coatroiz_t" + item_state = "coatroiz_mob_t" + H.update_inv_wear_suit() + else + RemoveHood_roiz() + //ketrai:Ketrai /obj/item/clothing/head/fluff/ketrai name = "Pink Bear Hat" diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 350797ee2a..2616c79159 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -1,28 +1,29 @@ some~user - Species -zekesturm - Xenomorph Hybrid -bothnevarbackwards - Diona -jemli - Gutterband -xioen - Xenomorph Hybrid -xioen - Diona -sepulchre - Vox -sepulchre - Daemon -sepulchre - Xenomorph Hybrid -zammyman215 - Vox -hawkerthegreat - Vox 1r1s - Daemon +benemuel - Daemon +benemuel - Enochian +bothnevarbackwards - Diona +cameron653 - Xenomorph Hybrid +hawkerthegreat - Vox +jemli - Gutter natje - Daemon natje - Xenochimera -zalvine - Enochian -rikaru19xjenkins - Xenochimera -rikaru19xjenkins - Xenomorph Hybrid -rixunie - Diona -seiga - Vox -benemuel - Enochian -benemuel - Daemon -vorrarkul - Enochian -vorrarkul - Daemon -pontifexminimus - Enochian pontifexminimus - Daemon -silvertalismen - Xenochimera +pontifexminimus - Enochian +rikaru19xjenkins - Xenomorph Hybrid +rikaru19xjenkins - Xenochimera +rixunie - Diona +rixunie - Gutter +seiga - Vox +sepulchre - Daemon +sepulchre - Vox +sepulchre - Xenomorph Hybrid silverTalismen - Diona -cameron653 - Xenomorph Hybrid +silvertalismen - Xenochimera +vorrarkul - Daemon +vorrarkul - Enochian +xioen - Diona +xioen - Xenomorph Hybrid +zalvine - Enochian +zammyman215 - Vox +zekesturm - Xenomorph Hybrid diff --git a/config/custom_items.txt b/config/custom_items.txt index e6b4bf8f3f..a79a6745c9 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -567,6 +567,12 @@ character_name: Roiz Lizden item_path: /obj/item/weapon/implanter/reagent_generator/roiz } +{ +ckey: SpoopyLizz +character_name: Roiz Lizden +item_path: /obj/item/clothing/suit/storage/hooded/wintercoat/roiz +} + # ######## T CKEYS { ckey: tonyvld diff --git a/icons/mob/vore/tails_vr.dmi b/icons/mob/vore/tails_vr.dmi index fd3a150ca2..ca6b724534 100644 Binary files a/icons/mob/vore/tails_vr.dmi and b/icons/mob/vore/tails_vr.dmi differ diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 0517135afd..1d040d12e7 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ