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

Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop

Browse Source
This commit is contained in:
JoanRisu
2017-03-02 23:28:45 -08:00
parent 3f26a1d223 8ad568ae18
commit ceca64804d
105 changed files with 4451 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/vore/fluffstuff/custom_boxes_vr.dm
View File

@@ -154,8 +154,8 @@
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/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,

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

@@ -643,7 +643,6 @@
new /obj/item/weapon/wirecutters(src)
new /obj/item/device/multitool(src)
new /obj/item/stack/cable_coil(src, 30, "red")
new /obj/item/stack/cable_coil(src, 30, "green")
// molenar:Giliana Gamish
/obj/item/clothing/suit/storage/toggle/labcoat/fluff/molenar
@@ -807,6 +806,12 @@
rolled_sleeves = 0
starting_accessories = list(/obj/item/clothing/accessory/black)
//Kisukegema:Kisuke `the nerd` Gema
/obj/item/clothing/glasses/sunglasses/omnihud/kamina
name = "Kamina glasses"
icon_state = "kamina"
desc = "ROW ROW, FIGHT THE POWER."
//Kitsuhana Uniforms
/obj/item/clothing/under/rank/khi
name = "Delete Me"

4
code/modules/vore/fluffstuff/custom_guns_vr.dm
View File

@@ -39,7 +39,7 @@
icon = 'icons/obj/gun_vr.dmi'
icon_state = "battlerifle"
icon_override = 'icons/obj/gun_vr.dmi'
item_state = "battlerifle"
item_state = "battlerifle_i"
item_icons = null
w_class = ITEMSIZE_LARGE
recoil = 2 // The battlerifle was known for its nasty recoil.
@@ -64,7 +64,7 @@
icon_state = "haloshotgun"
icon_override = 'icons/obj/gun_vr.dmi'
item_state = "haloshotgun"
item_state = "haloshotgun_i"
item_icons = null
ammo_type = /obj/item/ammo_casing/shotgun

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

@@ -327,33 +327,37 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
//arokha:Aronai Kadigan - Vials to go with mk2 hypo
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr
stabilize
name = "vial (1tr1in2tri2dxp)"
name = "vial (stabilize)"
desc = "10 Tricordrazine, 10 Dexalin Plus, 5 Tramadol, 5 Inaprovaline"
New()
..()
reagents.add_reagent("tramadol", 5)
reagents.add_reagent("inaprovaline", 5)
reagents.add_reagent("tricordrazine", 10)
reagents.add_reagent("dexalinp", 10)
reagents.add_reagent("tramadol", 5)
reagents.add_reagent("inaprovaline", 5)
bashed
name = "vial (5bi1tri)"
name = "vial (brute)"
desc = "25 Bicaridine, 5 Tricordrazine"
New()
..()
reagents.add_reagent("bicaridine", 25)
reagents.add_reagent("tricordrazine", 5)
toasted
name = "vial (3der2kel1tri)"
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
name = "vial (4dy1hy1tri)"
name = "vial (toxins)"
desc = "25 Dylovene, 2 Hyronalin, 3 Tricordrazine"
New()
..()
reagents.add_reagent("anti_toxin", 20)
reagents.add_reagent("hyronalin", 5)
reagents.add_reagent("tricordrazine", 5)
reagents.add_reagent("anti_toxin", 25)
reagents.add_reagent("hyronalin", 2)
reagents.add_reagent("tricordrazine", 3)
//Swat43:Fortune Bloise
/obj/item/weapon/storage/backpack/satchel/fluff/swat43bag
@@ -566,4 +570,17 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
desc = "A custom-made MKII hypospray belonging to Chakat Tempest. There's small print engraved on the handle: A medicine-cat has no time for doubt. Act now, act swiftly."
icon = 'icons/vore/custom_items_vr.dmi'
item_state = "temphypo"
icon_state = "temphypo"
icon_state = "temphypo"
//WickedTempest: Chakat Tempest
/obj/item/weapon/storage/backpack/saddlebag/tempest
name = "Tempest's Saddlebags"
desc = "A custom-made set of saddlebags, tailored to Chakat Tempest's exact dimensions, and taste in color! One one side, there's small print stitched in: ...to carry the weight of any responsibility, burden or task."
icon = 'icons/vore/custom_items_vr.dmi'
icon_override = 'icons/vore/custom_items_vr.dmi'
item_state = "tempestsaddlebag"
icon_state = "tempestbag"
max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Since they play a macro character, no reason to put custom slowdown code on here.
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!"

11
code/modules/vore/fluffstuff/custom_permits_vr.dm
View File

@@ -119,3 +119,14 @@
The individual named above is licensed by the Nanotrasen Department of Civil Protection to openly carry a MEUSOC 45. CONDITIONS.
This license expires on 31/May/2561 and must be renewed by CentCom prior to this date."}
// dhaeleena:Dhaeleena M'iar
/obj/item/fluff/permit/dhaeleena_miar
name = "Dhaeleena M'iar's Sidearm Permit"
desc = {"
<b>NAME:</b> Dhaeleena M'iar | <b>RACE:</b> Tajara | <b>HOMEWORLD:</b> Slyria
<b>DOB:</b> 15/Nov/2535 | <b>HEIGHT:</b> 210,3cm | <b>SEX:</b> Female
The individual named above is licensed by the Nanotrasen Department of Civil Protection
to carry one Mateba Model 6 Unica handgun with stun/rubber/flash ammo.
This license expires on 01/Mar/2562 and must be renewed by CentCom prior to this date."}