cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 22:18:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into aro-tether-wip

Browse Source 
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
This commit is contained in:
Leshana
2017-05-16 00:26:32 -04:00
parent 036af69b78 86daf319f0
commit 5ae26332fa
220 changed files with 2121 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_boxes_vr.dm
+18
View File
@@ -176,6 +176,24 @@
new /obj/item/weapon/gun/energy/netgun(src)
new /obj/item/clothing/accessory/holster/leg(src)
//Aerowing:Sebastian Aji
/obj/item/weapon/storage/box/fluff/sebastian_aji
name = "Sebastian's Lumoco Arms P3 Box"
/obj/item/weapon/storage/box/fluff/sebastian_aji/New()
..()
new /obj/item/weapon/gun/projectile/pistol(src)
new /obj/item/ammo_magazine/mc9mm/flash(src)
new /obj/item/ammo_magazine/mc9mm/flash(src)
new /obj/item/fluff/permit/sebastian_aji(src)
/obj/item/weapon/storage/box/fluff/briana_moore
name = "Briana's Derringer Box"
/obj/item/weapon/storage/box/fluff/briana_moore/New()
..()
new /obj/item/weapon/gun/projectile/derringer(src)
new /obj/item/fluff/permit/briana_moore(src)
/*
Swimsuits, for general use, to avoid arriving to work with your swimsuit.
*/
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+76 -1
View File
@@ -774,6 +774,7 @@
else
return 1
/obj/item/clothing/under/rank/internalaffairs/fluff/joan
desc = "The plain, professional attire of a Federation Law Enforcement Detective."
name = "Federation Dress Shirt"
@@ -1218,4 +1219,78 @@ Departamental Swimsuits, for general use
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_override = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "batter"
item_state = "batter_mob"
item_state = "batter_mob"
//samanthafyre:Kateryna Petrovitch
/obj/item/clothing/suit/armor/vest/wolftaur/kate
name = "Kat's Fox Taur Armor"
desc = "A set of security armor, light weight and easy to run in for a Taur, this item protects the \
entire body."
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "katesuit"
item_state_slots = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
if(icon_state == "katesuit")
return ..()
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "katesuit"
pixel_x = -16
return ..()
else
H << "<span class='warning'>You need to have a wolf-taur half to wear this.</span>"
return 0
//samanthafyre:Kateryna Petrovitch
/obj/item/clothing/suit/space/void/engineering/kate
name = "Kat's Navy Engineer voidsuit"
desc = "Taur engineering voidsuit. Recolored navy blue and white. Slightly tweaked as well to \
get close to having security voidsuit protection as possible with a slight reduction in movement \
speed to compensate for custom padding and armor Kateryna made herself."
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "lilithsuit"
armor = list(melee = 40, bullet = 20, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
if(icon_state == "lilithsuit")
return ..()
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "lilithsuit"
pixel_x = -16
return ..()
else
H << "<span class='warning'>You need to have a wolf-taur half to wear this.</span>"
return 0
//samanthafyre:Kateryna Petrovitch
/obj/item/clothing/head/helmet/space/fluff/kate
name = "Kat's Navy Engineer Helmet"
desc = "A customized combat space helmet made for Kateryna. It uses a navy design as the base before it\
was customized to suit the wearer's personality."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "lilithhelmet"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "lilithhelmet"
light_overlay = "helmet_light"
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(H.ckey != "samanthafyre")
H << "<span class='warning'>You try to fit on the helmet, but it doesn't fit.</span>"
return 0
else
return 1
//Seiga: Alfonso Oak Telanor
/obj/item/clothing/glasses/sunglasses/fluff/alfonso
name = "cyborg visor"
desc = "Eyewear worn by a once famous Thunderdome competitor. Fo' shizzle."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "alfonso_visor"
icon_override = 'icons/vore/custom_onmob_vr.dmi'
code/modules/vore/fluffstuff/custom_items_vr.dm
+25
View File
@@ -629,6 +629,30 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
taurtype = /datum/sprite_accessory/tail/taur/feline/tempest
no_message = "These saddlebags seem to be fitted for someone else, and keep slipping off!"
//WickedTempest: Chakat Tempest
/obj/item/weapon/implant/reagent_generator/tempest
generated_reagent = "milk"
usable_volume = 1000
empty_message = list("Your breasts are almost completely drained!")
full_message = list("Your teats feel heavy and swollen!")
emote_descriptor = list("squeezes milk", "tugs on Tempest's breasts, milking them")
self_emote_descriptor = list("squeeze")
random_emote = list("moos quietly")
assigned_proc = /mob/living/carbon/human/proc/use_reagent_implant_tempest
/obj/item/weapon/implanter/reagent_generator/tempest
implant_type = /obj/item/weapon/implant/reagent_generator/tempest
/mob/living/carbon/human/proc/use_reagent_implant_tempest()
set name = "Milk"
set desc = "Grab Tempest's nipples and milk them into a container! May cause blushing and groaning."
set category = "Object"
set src in view(1)
do_reagent_implant(usr)
//PontifexMinimus: Lucius/Lucia Null
/obj/item/weapon/fluff/dragor_dot
name = "supplemental battery"
@@ -643,6 +667,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
else
return
//The perfect adminboos device?
/obj/item/device/perfect_tele
name = "personal translocator"
code/modules/vore/fluffstuff/custom_permits_vr.dm
+23 -1
View File
@@ -129,4 +129,26 @@
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."}
This license expires on 01/Mar/2562 and must be renewed by CentCom prior to this date."}
// aerowing:Sebastian Aji
/obj/item/fluff/permit/sebastian_aji
name = "Sebastian Aji's Sidearm Permit"
desc = {"
<b>NAME:</b> Sebastian Aji | <b>RACE:</b> Panthera Tigris | <b>HOMEWORLD:</b> Ahdomai, Siik'tajr
<b>DOB:</b> 19/Dec/2530 | <b>HEIGHT:</b> 198cm | <b>SEX:</b> Male
The individual named above is licensed by the Nanotrasen Department of Civil Protection
to carry one Lumoco Arms P3 Whisper handgun with lethal/flash ammo.
This license expires on 17/Apr/2563 and must be renewed by CentCom prior to this date."}
// luminescent_ring:Briana Moore
/obj/item/fluff/permit/briana_moore
name = "Briana Moore's Sidearm Permit"
desc = {"
<b>NAME:</b> Briana Moore | <b>RACE:</b> Angel | <b>HOMEWORLD:</b> Sanctum
<b>DOB:</b> 2538-07-11 | <b>HEIGHT:</b> 155cm | <b>SEX:</b> Female
The individual named above is licensed by the Nanotrasen Department of Civil Protection
to carry one Derringer handgun with lethal ammo.
This license expires on 24/Apr/2563 and must be renewed by CentCom prior to this date."}