cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 03:56:47 +01: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
2016-12-12 18:37:33 +09:00
parent 2ca24521d9 d6dc578dd6
commit 0ecd0a51be
306 changed files with 19602 additions and 15418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_boxes_vr.dm
+13
View File
@@ -140,3 +140,16 @@
new /obj/item/weapon/card/id/centcom/fluff/aro(src)
new /obj/item/weapon/reagent_containers/hypospray/fluff/aronai(src)
new /obj/item/clothing/glasses/sunglasses/omnihud(src)
//ivymoomoo:Ivy Baladeva
/obj/item/weapon/storage/backpack/messenger/sec/fluff/ivymoomoo
name = "Ivy's Courier"
desc = "A bag resembling something used by college students. Contains items for ''MooMoo''."
New()
..()
new /obj/item/clothing/head/beretg(src)
new /obj/item/weapon/card/id/fluff/ivyholoid(src)
new /obj/item/weapon/storage/fancy/cigarettes/dromedaryco(src)
new /obj/item/weapon/storage/box/matches(src)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake(src)
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+63 -49
View File
@@ -436,12 +436,12 @@
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
..()
if(H.ckey != "scree")
H << "<span class='warning'>Your face and whoever is meant for this helmet are too different.</span>"
return 0
else
return 1
if(..())
if(H.ckey != "scree")
H << "<span class='warning'>Your face and whoever is meant for this helmet are too different.</span>"
return 0
else
return 1
//scree:Scree
/obj/item/clothing/suit/space/void/engineering/fluff/screespess
@@ -457,12 +457,12 @@
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
..()
if(H.ckey != "scree")
H << "<span class='warning'>The gloves only have three fingers, not to mention the accommodation for extra limbs.</span>"
return 0
else
return 1
if(..())
if(H.ckey != "scree")
H << "<span class='warning'>The gloves only have three fingers, not to mention the accommodation for extra limbs.</span>"
return 0
else
return 1
//scree:Scree
/obj/item/clothing/under/fluff/screesuit
@@ -476,12 +476,12 @@
item_state = "screesuit"
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
..()
if(H.ckey != "scree")
H << "<span class='warning'>Are you just going to tape them on or what? This isn't gonna work.</span>"
return 0
else
return 1
if(..())
if(H.ckey != "scree")
H << "<span class='warning'>Are you just going to tape them on or what? This isn't gonna work.</span>"
return 0
else
return 1
//HOS Hardsuit
/obj/item/clothing/suit/space/void/security/fluff/hos // ToDo: Rig version.
@@ -600,7 +600,7 @@
// arokha : Aronai Kadigan
/obj/item/clothing/head/helmet/space/void/medical/emt/fluff/aronai
name = "KIN-313-SM medical spacesuit"
name = "KIN-313-SM medical helmet"
desc = "This spacesuit helmet appears to be custom-made for someone with pointed ears and a muzzle. \
It is form-fitting enough that it's unlikely to fit anyone but the person it was intended for. \
'Aronai' is printed on the back of the helmet."
@@ -613,37 +613,41 @@
light_overlay = "helmet_light_dual"
camera_networks = list(NETWORK_MEDICAL)
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
..()
if(H.ckey != "arokha")
H << "<span class='warning'>You try to wear the helmet, but it doesn't fit.</span>"
return 0
else
return 1
if(..())
if(H.ckey != "arokha")
H << "<span class='warning'>You try to wear the helmet, but it doesn't fit.</span>"
return 0
else
return 1
/obj/item/clothing/suit/space/void/medical/emt/fluff/aronai
name = "KIN-313-SMb medical space helmet"
name = "KIN-313-SMb medical space spacesuit"
desc = "This spacesuit appears to be custom-made for someone with digitigrade legs and a tail. \
It is form-fitting enough that it's unlikely to fit anyone but the person it was intended for. \
'Aronai' is printed just above the spine on the back of the neckpiece. It has no space for an O2 tank. \
In fact, it's practically paper-thin. It doesn't seem to retain body heat at all."
In fact, it's practically paper-thin."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "arosuit"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "arosuit_mob"
w_class = ITEMSIZE_LARGE //Oh but I can.
allowed = list(/obj/item/device/suit_cooling_unit) //Can't fit O2 tanks
w_class = ITEMSIZE_NORMAL //If Joan can do it! >.>
slowdown = 0 //... <.<
allowed = list(/obj/item/device/suit_cooling_unit) //No storage space other than that
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
..()
if(H.ckey != "arokha")
H << "<span class='warning'>You try to fit into the suit, to no avail.</span>"
return 0
else
return 1
if(..())
if(H.ckey != "arokha")
H << "<span class='warning'>You try to fit into the suit, to no avail.</span>"
return 0
else
return 1
//Viveret:Keturah
/obj/item/clothing/under/dress/maid
@@ -666,13 +670,12 @@
light_overlay = "helmet_light"
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
..()
if(H.ckey != "joanrisu")
H << "<span class='warning'>You try to fit on the helmet, but it doesn't fit.</span>"
return 0
else
return 1
if(..())
if(H.ckey != "joanrisu")
H << "<span class='warning'>You try to fit on the helmet, but it doesn't fit.</span>"
return 0
else
return 1
//JoanRisu:Joan Risu
/obj/item/clothing/suit/space/fluff/joan
@@ -695,13 +698,12 @@
item_state = "joansuit_mob"
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
..()
if(H.ckey != "joanrisu")
H << "<span class='warning'>You try to fit into the suit, to no avail.</span>"
return 0
else
return 1
if(..())
if(H.ckey != "joanrisu")
H << "<span class='warning'>You try to fit into the suit, to no avail.</span>"
return 0
else
return 1
/obj/item/clothing/under/rank/internalaffairs/fluff/joan
desc = "The plain, professional attire of a Federation Law Enforcement Detective. The collar is <i>immaculately</i> starched."
@@ -818,6 +820,18 @@
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "bowler_mob"
//jemli:Jemli
/obj/item/clothing/head/fedora/fluff/jemli
name = "Cavalier Hat"
desc = "A smart, wide-brimmed hat with a rather fetching red feather in the brim. All for one, one for all."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "jemli_hat"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "jemli_hat_mob"
//bwoincognito:Octavious Ward
/obj/item/clothing/mask/gas/plaguedoctor/fluff/octaviousmask
name = "Customized Gas Mask"
code/modules/vore/fluffstuff/custom_items_vr.dm
+32 -5
View File
@@ -345,8 +345,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
desc = "A medal awarded to Lucina Darkarim for excellence in medical service."
//SilencedMP5A5:Serdykov Antoz
/*
/obj/item/clothing/suit/armor/vest/wolftaur/serdy //SilencedMP5A5's specialty armor suit. Uncomment if/when they make their custom item app and are accepted.
/obj/item/clothing/suit/armor/vest/wolftaur/serdy //SilencedMP5A5's specialty armor suit.
name = "Modified wolf-taur armor vest"
desc = "An armored vest that protects against some damage. It appears to be created for a wolf-taur, and seems modified."
species_restricted = null //Species restricted since all it cares about is a taur half
@@ -357,7 +356,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
icon_override = 'icons/mob/taursuits_vr.dmi' //Just in case
icon_state = "serdy_armor" //Just in case
pixel_x = -16
return 1
return ..()
else
H << "<span class='warning'>You need to have a wolf-taur half to wear this.</span>"
return 0
@@ -370,7 +369,19 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "serdyhelm_mob"
*/
//SilencedMP5A5:Serdykov Antoz
/obj/item/device/modkit_conversion/fluff/serdykit
name = "Serdykov's armor modification kit"
desc = "A kit containing all the needed tools and parts to modify a armor vest and helmet for a specific user. This one looks like it's fitted for a wolf-taur."
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "modkit"
from_helmet = /obj/item/clothing/head/helmet
from_suit = /obj/item/clothing/suit/armor/vest/wolftaur
to_helmet = /obj/item/clothing/head/helmet/serdy
to_suit = /obj/item/clothing/suit/armor/vest/wolftaur/serdy
//arokha:Aronai Kadigan, but anyone is welcome to use it.
/obj/item/clothing/accessory/collar/khcrystal
@@ -501,4 +512,20 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
throwforce = 7.0
w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 50)
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
/obj/item/weapon/card/id/fluff/ivyholoid
name = "Holo-ID"
registered_name = "Unconfigured"
desc = "A thin screen that seems to show an ID card's information. It keeps flickering between the ID and being blank."
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "ivyholoid"
var/configured = 0
attack_self(mob/user as mob)
if(configured == 1) return ..()
assignment = user.job
user.set_id_info(src)
configured = 1
user << "<span class='notice'>Card settings set.</span>"