This commit is contained in:
Verkister
2017-06-07 12:12:16 +03:00
165 changed files with 5875 additions and 1919 deletions
@@ -174,21 +174,21 @@
new /obj/item/clothing/glasses/omnihud/med/fluff/aronai(src)
//Gun and holster
new /obj/item/weapon/gun/energy/netgun(src)
new /obj/item/clothing/accessory/holster/leg(src)
new /obj/item/clothing/accessory/holster(src)
//Aerowing:Sebastian Aji
/obj/item/weapon/storage/box/fluff/sebastian_aji
name = "Sebastian's Lumoco Arms P3 Box"
has_items = list(
/obj/item/weapon/gun/projectile/pistol,
/obj/item/ammo_magazine/mc9mm/flash,
/obj/item/ammo_magazine/mc9mm/flash,
/obj/item/ammo_magazine/m9mm/flash,
/obj/item/ammo_magazine/m9mm/flash,
/obj/item/fluff/permit/sebastian_aji)
/obj/item/weapon/storage/box/fluff/briana_moore
name = "Briana's Derringer Box"
has_items = list(
/obj/item/weapon/gun/projectile/derringer,
/obj/item/weapon/gun/projectile/derringer/fluff/briana,
/obj/item/fluff/permit/briana_moore)
+52 -46
View File
@@ -67,7 +67,7 @@
item_state = "haloshotgun_i"
item_icons = null
ammo_type = /obj/item/ammo_casing/shotgun
ammo_type = /obj/item/ammo_casing/a12g
max_shells = 12
// jertheace : Jeremiah 'Ace' Acacius
@@ -75,7 +75,7 @@
name = "Ace's M45D Tactical Shotgun" // D-model holds half as many shells as the normal version so as not to be OP as shit. Better than shotgun, worse than combat shotgun.
desc = "Owned by the respected (or feared?) veteran Captain of VORE Station. Inscribed on the barrel are the words \"Speak softly, and carry a big stick.\" It has a folding stock so it can fit into bags."
w_class = ITEMSIZE_NORMAL // Because collapsable stock so it fits in backpacks.
ammo_type = /obj/item/ammo_casing/shotgun/stunshell
ammo_type = /obj/item/ammo_casing/a12g/stunshell
max_shells = 6
// bwoincognito:Tasald Corlethian
@@ -146,7 +146,7 @@
icon_state = "jury"
item_state = "gun"
accuracy = 0 // Because I know you're not an idiot who needs to be nerfed. -Ace
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
ammo_type = /obj/item/ammo_casing/a12g/beanbag
// Dhaeleena : Dhaeleena M'iar
/obj/item/weapon/gun/projectile/revolver/mateba/fluff/dhael
@@ -166,8 +166,14 @@
icon_state = "model10"
fire_sound = 'sound/weapons/deagle.ogg'
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
ammo_type = /obj/item/ammo_casing/c38r //Rubber rounds.
ammo_type = /obj/item/ammo_casing/a38r //Rubber rounds.
// LuminescentRing : Briana Moore
/obj/item/weapon/gun/projectile/derringer/fluff/briana
name = "second-hand derringer"
desc = "It's a palm sized gun. One of the few things that won't break an angel's wrists."
caliber = "10mm"
ammo_type = /obj/item/ammo_casing/a10mm
// For general use
/obj/item/weapon/gun/projectile/automatic/stg
@@ -180,8 +186,8 @@
max_shells = 30
caliber = "kurz"
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2, TECH_ILLEGAL = 6)
magazine_type = /obj/item/ammo_magazine/stg
allowed_magazines = list(/obj/item/ammo_magazine/stg)
magazine_type = /obj/item/ammo_magazine/mtg
allowed_magazines = list(/obj/item/ammo_magazine/mtg)
load_method = MAGAZINE
/obj/item/weapon/gun/projectile/automatic/stg/update_icon(var/ignore_inhands)
@@ -238,8 +244,8 @@
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
slot_flags = SLOT_BELT
load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/mc9mml
allowed_magazines = list(/obj/item/ammo_magazine/mc9mm, /obj/item/ammo_magazine/mc9mml)
magazine_type = /obj/item/ammo_magazine/m9mml
allowed_magazines = list(/obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mml)
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
@@ -248,7 +254,7 @@
/obj/item/weapon/gun/projectile/automatic/pdw/update_icon(var/ignore_inhands)
..()
if(istype(ammo_magazine,/obj/item/ammo_magazine/mc9mm))
if(istype(ammo_magazine,/obj/item/ammo_magazine/m9mm))
icon_state = "pdw-short"
else
icon_state = (ammo_magazine)? "pdw" : "pdw-empty"
@@ -279,8 +285,8 @@
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
hitsound = null
caliber = "s762"
magazine_type = /obj/item/ammo_magazine/s762
allowed_magazines = list(/obj/item/ammo_magazine/s762)
magazine_type = /obj/item/ammo_magazine/m762
allowed_magazines = list(/obj/item/ammo_magazine/m762)
/obj/item/weapon/gun/projectile/automatic/fluff/crestrose/attack_self(mob/user as mob)
on = !on
@@ -379,7 +385,7 @@
/obj/item/weapon/gun/projectile/automatic/carbine/fluff/g44/update_icon(var/ignore_inhands)
..()
// TODO - Fix this for spriting different size magazines
// TODO - Fix this for spriting different size magazines
icon_state = (ammo_magazine)? "g44" : "g44-empty"
item_state = (ammo_magazine)? "bullpup" : "bullpup-empty"
if(!ignore_inhands) update_held_icon()
@@ -462,8 +468,8 @@
icon = 'icons/obj/gun_vr.dmi'
icon_state = "khipistol"
item_state = "gun" // Placeholder
magazine_type = /obj/item/ammo_magazine/c45m/flash //Dun wanna KILL all the people.
allowed_magazines = list(/obj/item/ammo_magazine/c45m)
magazine_type = /obj/item/ammo_magazine/m45/flash //Dun wanna KILL all the people.
allowed_magazines = list(/obj/item/ammo_magazine/m45)
caliber = ".45"
handle_casings = CYCLE_CASINGS
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5)
@@ -485,8 +491,8 @@
slot_flags = SLOT_BELT
load_method = MAGAZINE
handle_casings = CYCLE_CASINGS
magazine_type = /obj/item/ammo_magazine/mc9mml
allowed_magazines = list(/obj/item/ammo_magazine/mc9mm, /obj/item/ammo_magazine/mc9mml)
magazine_type = /obj/item/ammo_magazine/m9mml
allowed_magazines = list(/obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mml)
dna_lock = 1
firemodes = list(
@@ -583,8 +589,8 @@
caliber = ".44"
ammo_type = /obj/item/ammo_casing/a44/rubber
magazine_type = /obj/item/ammo_magazine/a44/rubber
allowed_magazines = list(/obj/item/ammo_magazine/a44,/obj/item/ammo_magazine/a44/rubber)
magazine_type = /obj/item/ammo_magazine/m44/rubber
allowed_magazines = list(/obj/item/ammo_magazine/m44,/obj/item/ammo_magazine/m44/rubber)
load_method = MAGAZINE
auto_eject = 1
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
@@ -610,8 +616,8 @@
caliber = ".32"
ammo_type = /obj/item/ammo_casing/a32
magazine_type = /obj/item/ammo_magazine/a32
allowed_magazines = list(/obj/item/ammo_magazine/a32)
magazine_type = /obj/item/ammo_magazine/m32
allowed_magazines = list(/obj/item/ammo_magazine/m32)
load_method = MAGAZINE
fire_delay = 0.6
accuracy = 1
@@ -639,8 +645,8 @@
caliber = ".32"
ammo_type = /obj/item/ammo_casing/a32
magazine_type = /obj/item/ammo_magazine/a32
allowed_magazines = list(/obj/item/ammo_magazine/a32)
magazine_type = /obj/item/ammo_magazine/m32
allowed_magazines = list(/obj/item/ammo_magazine/m32)
fire_delay = 1.2
load_method = MAGAZINE
accuracy = 2
@@ -699,9 +705,9 @@
slot_flags = SLOT_BELT
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/c9mm
magazine_type = /obj/item/ammo_magazine/c9mm
allowed_magazines = list(/obj/item/ammo_magazine/c9mm)
ammo_type = /obj/item/ammo_casing/a9mm
magazine_type = /obj/item/ammo_magazine/m9mm
allowed_magazines = list(/obj/item/ammo_magazine/m9mm)
load_method = MAGAZINE
multi_aim = 1
burst_delay = 2
@@ -866,7 +872,7 @@
impact_type = /obj/effect/projectile/laser_omni/impact
//--------------- StG-60 ----------------
/obj/item/ammo_magazine/stg
/obj/item/ammo_magazine/mtg
name = "box mag (7.92x33mm Kurz)"
icon = 'icons/obj/ammo_vr.dmi'
icon_state = "stg_30rnd"
@@ -881,7 +887,7 @@
caliber = "kurz"
projectile_type = /obj/item/projectile/bullet/rifle/a762
/obj/item/ammo_magazine/stg/empty
/obj/item/ammo_magazine/mtg/empty
initial_ammo = 0
//------------- Battlerifle -------------
@@ -909,7 +915,7 @@
initial_ammo = 0
//---------------- PDW ------------------
/obj/item/ammo_magazine/mc9mml
/obj/item/ammo_magazine/m9mml
name = "\improper SMG magazine (9mm)"
icon = 'icons/obj/ammo_vr.dmi'
icon_state = "smg"
@@ -917,31 +923,31 @@
mag_type = MAGAZINE
matter = list(DEFAULT_WALL_MATERIAL = 1800)
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/c9mm
ammo_type = /obj/item/ammo_casing/a9mm
max_ammo = 30
multiple_sprites = 1
/obj/item/ammo_magazine/mc9mml/empty
/obj/item/ammo_magazine/m9mml/empty
initial_ammo = 0
/obj/item/ammo_magazine/mc9mml/ap
/obj/item/ammo_magazine/m9mml/ap
name = "\improper SMG magazine (9mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/c9mm/ap
ammo_type = /obj/item/ammo_casing/a9mm/ap
/obj/item/ammo_magazine/mc9mml/flash
/obj/item/ammo_magazine/m9mml/flash
name = "\improper SMG magazine (9mm flash)"
ammo_type = /obj/item/ammo_casing/c9mmf
ammo_type = /obj/item/ammo_casing/a9mmf
/obj/item/ammo_magazine/mc9mml/rubber
/obj/item/ammo_magazine/m9mml/rubber
name = "\improper SMG magazine (9mm rubber)"
ammo_type = /obj/item/ammo_casing/c9mmr
ammo_type = /obj/item/ammo_casing/a9mmr
/obj/item/ammo_magazine/mc9mml/practice
/obj/item/ammo_magazine/m9mml/practice
name = "\improper SMG magazine (9mm practice)"
ammo_type = /obj/item/ammo_casing/c9mmp
ammo_type = /obj/item/ammo_casing/a9mmp
//.357 special ammo
/obj/item/ammo_magazine/a357/stun
/obj/item/ammo_magazine/m357/stun
name = "speedloader (.357 stun)"
desc = "A speedloader for .357 revolvers."
icon = 'icons/obj/ammo_vr.dmi'
@@ -957,7 +963,7 @@
icon_state = "stun357"
projectile_type = /obj/item/projectile/energy/electrode/stunshot/strong
/obj/item/ammo_magazine/a357/rubber
/obj/item/ammo_magazine/m357/rubber
name = "speedloader (.357 rubber)"
desc = "A speedloader for .357 revolvers."
icon = 'icons/obj/ammo_vr.dmi'
@@ -973,7 +979,7 @@
icon_state = "rubber357"
projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong
/obj/item/ammo_magazine/a357/flash
/obj/item/ammo_magazine/m357/flash
name = "speedloader (.357 flash)"
desc = "A speedloader for .357 revolvers."
icon = 'icons/obj/ammo_vr.dmi'
@@ -995,7 +1001,7 @@
caliber = ".32"
projectile_type = /obj/item/projectile/bullet/pistol
/obj/item/ammo_magazine/a32
/obj/item/ammo_magazine/m32
icon_state = "a762"
caliber = ".32"
ammo_type = /obj/item/ammo_casing/a32
@@ -1016,7 +1022,7 @@
desc = "A .44 rubber bullet casing."
projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong
/obj/item/ammo_magazine/a44
/obj/item/ammo_magazine/m44
desc = "A magazine for .44 ammo."
icon = 'icons/obj/ammo_vr.dmi'
icon_state = "44lethal"
@@ -1026,13 +1032,13 @@
max_ammo = 8
mag_type = MAGAZINE
/obj/item/ammo_magazine/a44/rubber
/obj/item/ammo_magazine/m44/rubber
desc = "A magazine for .44 less-than-lethal ammo."
icon_state = "44rubber"
ammo_type = /obj/item/ammo_casing/a44/rubber
//.44 speedloaders
/obj/item/ammo_magazine/a44sl
/obj/item/ammo_magazine/m44sl
name = "speedloader (.44)"
desc = "A speedloader for .44 revolvers."
icon = 'icons/obj/ammo_vr.dmi'
@@ -1044,7 +1050,7 @@
multiple_sprites = 1
mag_type = SPEEDLOADER
/obj/item/ammo_magazine/a44sl/rubber
/obj/item/ammo_magazine/m44sl/rubber
name = "speedloader (.44 rubber)"
icon_state = "r357"
ammo_type = /obj/item/ammo_casing/a44/rubber
@@ -710,6 +710,127 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
do_reagent_implant(usr)
//SpoopyLizz: Roiz Lizden
//I made this! Woo!
//implant
//--------------------
/obj/item/weapon/implant/reagent_generator/roiz
name = "egg laying implant"
desc = "This is an implant that allows the user to lay eggs."
generated_reagent = "egg"
usable_volume = 500
transfer_amount = 50
empty_message = list("Your lower belly feels smooth and empty. Sorry, we're out of eggs!", "The reduced pressure in your lower belly tells you there are no more eggs.")
full_message = list("Your lower belly looks swollen with irregular bumps, and it feels heavy.", "Your lower abdomen feels really heavy, making it a bit hard to walk.")
emote_descriptor = list("an egg right out of Roiz's lower belly!", "into Roiz' belly firmly, forcing him to lay an egg!", "Roiz really tight, who promptly lays an egg!")
var/verb_descriptor = list("squeezes", "pushes", "hugs")
var/self_verb_descriptor = list("squeeze", "push", "hug")
var/short_emote_descriptor = list("lays", "forces out", "pushes out")
self_emote_descriptor = list("lay", "force out", "push out")
random_emote = list("hisses softly with a blush on his face", "yelps in embarrassment", "grunts a little")
assigned_proc = /mob/living/carbon/human/proc/use_reagent_implant_roiz
/obj/item/weapon/implanter/reagent_generator/roiz
implant_type = /obj/item/weapon/implant/reagent_generator/roiz
/mob/living/carbon/human/proc/use_reagent_implant_roiz()
set name = "Lay Egg"
set desc = "Force Roiz to lay an egg by squeezing into his lower body! This makes the lizard extremely embarrassed, and it looks funny."
set category = "Object"
set src in view(1)
//do_reagent_implant(usr)
if(!isliving(usr) || !usr.canClick())
return
if(usr.incapacitated() || usr.stat > CONSCIOUS)
return
var/obj/item/weapon/implant/reagent_generator/roiz/rimplant
for(var/I in src.contents)
if(istype(I, /obj/item/weapon/implant/reagent_generator))
rimplant = I
break
if (rimplant)
if(rimplant.reagents.total_volume <= rimplant.transfer_amount)
to_chat(src, "<span class='notice'>[pick(rimplant.empty_message)]</span>")
return
new /obj/item/weapon/reagent_containers/food/snacks/egg/roiz(get_turf(src))
var/index = rand(0,3)
if (usr != src)
var/emote = rimplant.emote_descriptor[index]
var/verb_desc = rimplant.verb_descriptor[index]
var/self_verb_desc = rimplant.self_verb_descriptor[index]
usr.visible_message("<span class='notice'>[usr] [verb_desc] [emote]</span>",
"<span class='notice'>You [self_verb_desc] [emote]</span>")
else
src.visible_message("<span class='notice'>[src] [pick(rimplant.short_emote_descriptor)] an egg.</span>",
"<span class='notice'>You [pick(rimplant.self_emote_descriptor)] an egg.</span>")
if(prob(15))
src.visible_message("<span class='notice'>[src] [pick(rimplant.random_emote)].</span>") // M-mlem.
rimplant.reagents.remove_reagent(rimplant.generated_reagent, rimplant.transfer_amount)
//Egg item
//-------------
/obj/item/weapon/reagent_containers/food/snacks/egg/roiz
name = "lizard egg"
desc = "It's a large lizard egg."
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "egg_roiz"
filling_color = "#FDFFD1"
volume = 12
/obj/item/weapon/reagent_containers/food/snacks/egg/roiz/New()
..()
reagents.add_reagent("egg", 9)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/friedegg/roiz
name = "fried lizard egg"
desc = "A large, fried lizard egg, with a touch of salt and pepper. It looks rather chewy."
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "friedegg"
volume = 12
/obj/item/weapon/reagent_containers/food/snacks/friedegg/roiz/New()
..()
reagents.add_reagent("protein", 9)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/boiledegg/roiz
name = "boiled lizard egg"
desc = "A hard boiled lizard egg. Be careful, a lizard detective may hatch!"
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "egg_roiz"
volume = 12
/obj/item/weapon/reagent_containers/food/snacks/boiledegg/roiz/New()
..()
reagents.add_reagent("protein", 6)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/roiz
name = "chocolate lizard egg"
desc = "Such huge, sweet, fattening food."
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "chocolateegg_roiz"
filling_color = "#7D5F46"
nutriment_amt = 3
nutriment_desc = list("chocolate" = 5)
volume = 18
/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/roiz/New()
..()
reagents.add_reagent("sugar", 6)
reagents.add_reagent("coco", 6)
reagents.add_reagent("milk", 2)
bitesize = 6
//PontifexMinimus: Lucius/Lucia Null
/obj/item/weapon/fluff/dragor_dot
name = "supplemental battery"
@@ -1089,3 +1210,30 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
B.internal_contents |= src
user.visible_message("<span class='warning'>[user] eats a telebeacon!</span>","You eat the the beacon!")
playsound(user, B.vore_sound, 70, 1)
//InterroLouis: Ruda Lizden
/obj/item/clothing/accessory/badge/holo/detective/ruda
name = "Hisstective's Badge"
desc = "This is Ruda Lizden's personal Detective's badge. The polish is dull, as if it's simply been huffed upon and wiped against a coat. Labeled 'Hisstective.'"
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "hisstective_badge"
//slot_flags = SLOT_TIE | SLOT_BELT
/obj/item/clothing/accessory/badge/holo/detective/ruda/attack(mob/living/carbon/human/M, mob/living/user)
if(isliving(user))
user.visible_message("<span class='danger'>[user] invades [M]'s personal space, thrusting [src] into their face with an insistent huff.</span>","<span class='danger'>You invade [M]'s personal space, thrusting [src] into their face with an insistent huff.</span>")
user.do_attack_animation(M)
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam
/obj/item/clothing/accessory/badge/holo/detective/ruda/attack_self(mob/user as mob)
if(!stored_name)
user << "You huff along the front of your badge, then rub your sleeve on it to polish it up."
set_name(user.real_name)
return
if(isliving(user))
if(stored_name)
user.visible_message("<span class='notice'>[user] displays their [src.name].\nIt reads: [stored_name], [badge_string].</span>","<span class='notice'>You display your [src.name].\nIt reads: [stored_name], [badge_string].</span>")
else
user.visible_message("<span class='notice'>[user] displays their [src.name].\nIt reads: [badge_string].</span>","<span class='notice'>You display your [src.name]. It reads: [badge_string].</span>")