cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 11:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dragor fluff items, Aronai fluff item fixes

Browse Source 
Also fixes *flip to not print an error message (emotes must have messages that they display) and redoes how vials start with reagents to make it easier to code them. Also swapping genders as a promethean won't randomize your hair anymore. That was silly, and relevant to Dragor's thing.
This commit is contained in:
Arokha Sieyes
2017-03-04 16:04:43 -05:00
parent 14f5ca3524
commit 4f06a18057
9 changed files with 95 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_boxes_vr.dm
+20 -10
View File
@@ -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.
code/modules/vore/fluffstuff/custom_clothes_vr.dm
-22
View File
@@ -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"
code/modules/vore/fluffstuff/custom_guns_vr.dm
+20
View File
@@ -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"
code/modules/vore/fluffstuff/custom_items_vr.dm
+26 -27
View File
@@ -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