diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index 101390b3d6..b5521ed0b4 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -22,7 +22,7 @@ return src.gender = gender - reset_hair() + //reset_hair() //VOREStation Remove - Don't just randomize hair on gender swaps for prometheans. update_body() update_dna() return 1 diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 4404b14449..48d3c95a73 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -7,8 +7,8 @@ if ("awoo") message = "awoos loudly. AwoooOOOOoooo!" m_type = 2 - if ("flip") + message = "does a flip!" if(!src.sleeping || !src.resting || !src.buckled || !src.restrained()) src.SpinAnimation(7,1) m_type = 1 diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm index fb5d2e4e22..8f65866b0a 100644 --- a/code/modules/reagents/reagent_containers/glass_vr.dm +++ b/code/modules/reagents/reagent_containers/glass_vr.dm @@ -7,58 +7,57 @@ /obj/item/weapon/reagent_containers/glass/beaker/vial/vr possible_transfer_amounts = list(5,10,15,30) //Dunno why there was no '30' option before. w_class = ITEMSIZE_SMALL //Why would it be the same size as a beaker? - var/starting_reagent //Easy way of doing this. + var/comes_with = list() //Easy way of doing this. /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/New() ..() - if(starting_reagent) - reagents.add_reagent(starting_reagent, 30) - update_icon() + for(var/R in comes_with) + reagents.add_reagent(R,comes_with[R]) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/bicaridine name = "vial (bicaridine)" - starting_reagent = "bicaridine" + comes_with = list("bicaridine" = 30) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dylovene name = "vial (dylovene)" - starting_reagent = "dylovene" + comes_with = list("dylovene" = 30) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dermaline name = "vial (dermaline)" - starting_reagent = "dermaline" + comes_with = list("dermaline" = 30) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/kelotane name = "vial (kelotane)" - starting_reagent = "kelotane" + comes_with = list("kelotane" = 30) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/inaprovaline name = "vial (inaprovaline)" - starting_reagent = "inaprovaline" + comes_with = list("inaprovaline" = 30) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dexalin name = "vial (dexalin)" - starting_reagent = "dexalin" + comes_with = list("dexalin" = 30) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dexalinplus name = "vial (dexalinp)" - starting_reagent = "dexalinp" + comes_with = list("dexalinp" = 30) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/tricordrazine name = "vial (tricordrazine)" - starting_reagent = "tricordrazine" + comes_with = list("tricordrazine" = 30) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/alkysine name = "vial (alkysine)" - starting_reagent = "alkysine" + comes_with = list("alkysine" = 30) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/imidazoline name = "vial (imidazoline)" - starting_reagent = "imidazoline" + comes_with = list("imidazoline" = 30) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/peridaxon name = "vial (peridaxon)" - starting_reagent = "peridaxon" + comes_with = list("peridaxon" = 30) /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/hyronalin name = "vial (hyronalin)" - starting_reagent = "hyronalin" + comes_with = list("hyronalin" = 30) diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index 702708df95..c0ae20b531 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -153,16 +153,26 @@ has_items = list(/obj/item/clothing/under/swimsuit/fluff/penelope) //Arokha:Aronai Kadigan -/obj/item/weapon/storage/box/fluff/aronai - name = "Aronai's Kit" - desc = "A kit containing Aronai's equipment." - has_items = list( - ///obj/item/weapon/storage/backpack/fluff/aronai, - ///obj/item/weapon/rig/light/hacker/fluff/aronai, - /obj/item/clothing/under/rank/khi/fluff/aronai, - /obj/item/fluff/permit/aronai_kadigan, - /obj/item/weapon/gun/projectile/khi/pistol, - /obj/item/ammo_magazine/c45m/flash) +/obj/item/weapon/storage/backpack/satchel/gen/fluff/aronai + name = "blue medical satchel" + desc = "A medical satchel done up in blue and white." + + New() + ..() //Might look like a lot... but all small items. + new /obj/item/weapon/reagent_containers/hypospray/vr/fluff/aronai(src) + new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_st(src) + new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_bt(src) + new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_bu(src) + new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_tx(src) + //Centcom stuff and permit + new /obj/item/weapon/card/id/centcom/fluff/aronai(src) + new /obj/item/fluff/permit/aronai_kadigan(src) + new /obj/item/clothing/under/rank/khi/fluff/aronai(src) + new /obj/item/clothing/glasses/sunglasses/omnihud(src) + //Gun and holster + new /obj/item/weapon/gun/projectile/khi/pistol(src) + new /obj/item/ammo_magazine/c45m/flash(src) + new /obj/item/clothing/accessory/holster/armpit(src) /* Swimsuits, for general use, to avoid arriving to work with your swimsuit. diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 93d6338c5e..cc895eb859 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -719,28 +719,6 @@ /obj/item/rig_module/teleporter ) -/obj/item/weapon/storage/backpack/fluff/aronai - name = "medical pouch" - desc = "A medical belt with a small pouch rather than straps and loops for equipment." - icon = 'icons/vore/custom_clothes_vr.dmi' - icon_override = 'icons/vore/custom_clothes_vr.dmi' - icon_state = "emspouch" - item_state = "emspouch_mob" - - slot_flags = SLOT_BELT //You're a belt now. Congrats. - max_w_class = ITEMSIZE_SMALL //fit only pocket sized items - max_storage_space = ITEMSIZE_COST_SMALL * 7 //Much smaller than a backpack - - New() - new /obj/item/weapon/reagent_containers/hypospray/vr/fluff/aronai(src) - new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/stabilize(src) - new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/bashed(src) - new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/toasted(src) - new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/poisoned(src) - new /obj/item/weapon/card/id/centcom/fluff/aronai(src) - new /obj/item/clothing/glasses/sunglasses/omnihud(src) - ..() - //Viveret:Keturah /obj/item/clothing/under/dress/maid name = "Maid Outfit" diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 850886521f..c828d78f1c 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -370,10 +370,30 @@ desc = "Some serious drywall work, coming up!" //-----------------------KHI Common---------------------------------- +// // // Pistols /obj/item/weapon/gun/projectile/khi/process_chambered() if (!chambered) return qdel(chambered) //Devours ammo rather than fires it. +/obj/item/weapon/gun/projectile/khi/update_icon() + ..() + if(ammo_magazine) + icon_state = "[initial(icon_state)]" + else + icon_state = "[initial(icon_state)]-empty" + +// // // Automatics +/obj/item/weapon/gun/projectile/automatic/khi/process_chambered() + if (!chambered) return + qdel(chambered) //Devours ammo rather than fires it. + +/obj/item/weapon/gun/projectile/automatic/khi/update_icon() + ..() + if(ammo_magazine) + icon_state = "[initial(icon_state)]" + else + icon_state = "[initial(icon_state)]-empty" + //-----------------------KHI Pistol---------------------------------- /obj/item/weapon/gun/projectile/khi/pistol name = "alien pistol" diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index efb6262048..8ee08e01e9 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -321,43 +321,28 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie New() ..() - reagents.add_reagent("inaprovaline", 5) - reagents.add_reagent("tricordrazine", 25) + loaded_vial.name = "[initial(loaded_vial.name)] (tricord)" + loaded_vial.desc = "30 Tricordrazine" + reagents.add_reagent("tricordrazine", 30) //arokha:Aronai Kadigan - Vials to go with mk2 hypo -/obj/item/weapon/reagent_containers/glass/beaker/vial/vr - stabilize +/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff + aro_st name = "vial (stabilize)" desc = "10 Tricordrazine, 10 Dexalin Plus, 5 Tramadol, 5 Inaprovaline" - New() - ..() - reagents.add_reagent("tricordrazine", 10) - reagents.add_reagent("dexalinp", 10) - reagents.add_reagent("tramadol", 5) - reagents.add_reagent("inaprovaline", 5) - bashed + comes_with = list("tricordrazine"=10,"dexalinp"=10,"tramadol"=5,"inaprovaline"=5) + aro_bt name = "vial (brute)" desc = "25 Bicaridine, 5 Tricordrazine" - New() - ..() - reagents.add_reagent("bicaridine", 25) - reagents.add_reagent("tricordrazine", 5) - toasted + comes_with = list("bicaridine"=25,"tricordrazine"=5) + aro_bu name = "vial (burn)" desc = "10 Kelotane, 15 Dermaline, 5 Tricordrazine" - New() - ..() - reagents.add_reagent("kelotane", 10) - reagents.add_reagent("dermaline", 15) - reagents.add_reagent("tricordrazine", 5) - poisoned + comes_with = list("kelotane"=10,"dermaline"=15,"tricordrazine"=5) + aro_tx name = "vial (toxins)" desc = "25 Dylovene, 2 Hyronalin, 3 Tricordrazine" - New() - ..() - reagents.add_reagent("anti_toxin", 25) - reagents.add_reagent("hyronalin", 2) - reagents.add_reagent("tricordrazine", 3) + comes_with = list("anti_toxin"=25,"hyronalin"=2,"tricordrazine"=3) //Swat43:Fortune Bloise /obj/item/weapon/storage/backpack/satchel/fluff/swat43bag @@ -584,3 +569,17 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie slowdown = 0 taurtype = /datum/sprite_accessory/tail/taur/feline/tempest no_message = "These saddlebags seem to be fitted for someone else, and keep slipping off!" + +//PontifexMinimus: Lucius/Lucia Null +/obj/item/weapon/fluff/dragor_dot + name = "supplemental battery" + desc = "A tiny supplemental battery for powering something or someone synthetic." + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "dragor_dot" + w_class = ITEMSIZE_SMALL + + attack_self(mob/user as mob) + if(user.ckey == "pontifexminimus") + user.verbs |= /mob/living/carbon/human/proc/shapeshifter_select_gender + else + return diff --git a/config/custom_items.txt b/config/custom_items.txt index 023d830fe6..451fb71320 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -57,7 +57,7 @@ item_path: /obj/item/clothing/head/helmet/hos/fluff/lethe { ckey: arokha character_name: Aronai Kadigan -item_path: /obj/item/weapon/storage/box/fluff/aronai +item_path: /obj/item/weapon/storage/backpack/satchel/gen/fluff/aronai } # ######## B CKEYS @@ -348,6 +348,17 @@ item_path: /obj/item/weapon/melee/fluff/holochain } # ######## P CKEYS +{ +ckey: pontifexminimus +character_name: Lucius Null +item_path: /obj/item/weapon/fluff/dragor_dot +} +{ +ckey: pontifexminimus +character_name: Lucia Null +item_path: /obj/item/weapon/fluff/dragor_dot +} + # ######## Q CKEYS # ######## R CKEYS { diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index f2b132ab79..2f17141da0 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ