diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index f966c689a2..aa465fce5d 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -28,7 +28,7 @@ /obj/item/clothing/under/thing4) */ -/*POLARISTODO - These fail to compile since not all items are ported yet +//POLARISTODO - These fail to compile since not all items are ported yet // bwoincognito:Tasald Corlethian /obj/item/weapon/storage/box/fluff/tasald name = "Tasald's Kit" @@ -61,7 +61,7 @@ /obj/item/clothing/head/beret, /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing, /obj/item/clothing/shoes/black, - /obj/item/toy/crayon/mime) + /*/obj/item/toy/crayon/mime*/) //Need to track down the code for crayons before adding this back in // joanrisu:Joan Risu /obj/item/weapon/storage/box/fluff/joanrisu @@ -72,6 +72,5 @@ /obj/item/device/radio/headset/heads/captain, /obj/item/weapon/storage/backpack/satchel, /obj/item/clothing/suit/storage/fluff/fedcoat, - /obj/item/weapon/card/id/gold/fluff/badge/, + /obj/item/weapon/card/id/gold/fluff/joanbadge, /obj/item/weapon/card/id/captains_spare) -*/ \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 9c144a9308..dfa442b4f9 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -295,6 +295,35 @@ icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "tasaldsuit" +// bwoincognito:Tasald Corlethian +/obj/item/clothing/suit/storage/det_suit/fluff/tasald + name = "Tasald's Vest" + desc = "A fancy looking vest. You look like a smooth operating officer in this." + + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "tasvest" + + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "tasvest_mob" + + blood_overlay_type = "coat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + +// bwoincognito:Tasald Corlethian +/obj/item/clothing/suit/storage/det_suit/fluff/tas_coat + name = "Armored Colony coat" + desc = "Dark green and grey colored sleeveless long coat with two thick metal shoulder pads. has seen some wear and tear, with noticeable patches in the fabric, scratches on the shoulder pads, but with a clean patch on the left upper chest. It has a red NT marked on the right shoulder pad and red Security on the left. " + + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "tasaldcoat" + + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "tasaldcoat_mob" + + blood_overlay_type = "coat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + + //Event Costumes Below /obj/item/clothing/head/helmet/fluff/freddy name = "Animatronic Suit Helmet" @@ -448,3 +477,42 @@ icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "molenar" + +//scree:Scree +/obj/item/clothing/head/fluff/pompom + name = "Pom-Pom" + desc = "A fluffy little thingus on a thin stalk, ideal for impersonating moogles and anglerfish. Kupomnomnom." + + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "pom" + + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "pom_mob" + + w_class = 2.0 + on = 0 + brightness_on = 5 + light_overlay = null + + attack_self(mob/user) + if(brightness_on) + if(!isturf(user.loc)) + user << "You cannot turn the light on while in this [user.loc]" + return + on = !on + user << "You [on ? "light up" : "dim"] your pom-pom." + update_light(user) + else + return ..(user) + + + update_icon(var/mob/user) + if(on) + icon_state = "pom-on" + item_state = "pom-on_mob" + else + icon_state = "pom" + item_state = "pom_mob" + if(istype(user,/mob/living/carbon/human)) + var/mob/living/carbon/human/H = user + H.update_inv_head() diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index c1fbdb0305..00490cafa2 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -134,4 +134,101 @@ from_helmet = /obj/item/clothing/head/caphat from_suit = /obj/item/clothing/under/rank/captain to_helmet = /obj/item/clothing/head/centhat/fluff/harmhat - to_suit = /obj/item/clothing/under/rank/captain/fluff/harmuniform \ No newline at end of file + to_suit = /obj/item/clothing/under/rank/captain/fluff/harmuniform + +//scree:Scree +/obj/item/device/modkit_conversion/fluff/screekit + name = "Scree's hardsuit modification kit" + desc = "A kit containing all the needed tools and parts to modify a hardsuit for a specific user. This one looks like it's fitted for a winged creature." + + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "modkit" + + from_helmet = /obj/item/clothing/head/helmet/space/void/engineering + from_suit = /obj/item/clothing/suit/space/void/engineering + to_helmet = /obj/item/clothing/head/helmet/space/void/engineering/fluff/screehelm + to_suit = /obj/item/clothing/suit/space/void/engineering/fluff/screespess + +//General Use +/obj/item/weapon/flag + name = "Nanotrasen Banner" + desc = "I pledge allegiance to the flag of a megacorporation in space." + + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "Flag_Nanotrasen" + + icon_override = 'icons/vore/custom_items_vr.dmi' + item_state = "Flag_Nanotrasen" + + attack_self(mob/user as mob) + if(isliving(user)) + user.visible_message("[user] waves their Banner around!","You wave your Banner around.") + + attack(mob/living/carbon/human/M, mob/living/user) + if(isliving(user)) + user.visible_message("[user] invades [M]'s personal space, thrusting [src] into their face insistently.","You invade [M]'s personal space, thrusting [src] into their face insistently.") + + + federation + name = "Federation Banner" + desc = "Space, The Final Frontier. Sorta. Just go with it and say the damn oath." + + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "flag_federation" + + icon_override = 'icons/vore/custom_items_vr.dmi' + item_state = "flag_federation" + +//zodiacshadow: ? +/obj/item/device/radio/headset/fluff/zodiacshadow + name = "Nehi's 'phones" + desc = "A pair of old-fashioned purple headphones for listening to music that also double as an NT-approved headset; they connect nicely to any standard PDA. One side is engraved with the letters NEHI, the other having an elaborate inscription of the words \"My voice is my weapon of choice\" in a fancy font. A modern polymer allows switching between modes to either allow one to hear one's surroundings or to completely block them out." + + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "headphones" + + icon_override = 'icons/vore/custom_items_vr.dmi' + item_state = "headphones_mob" + + +// OrbisA: Richard D'angelo +/obj/item/weapon/melee/fluff/holochain + name = "Holographic Chain" + desc = "A High Tech solution to simple perversions. It has a red leather handle and the initials R.D. on the silver base." + + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "holochain" + + icon_override = 'icons/vore/custom_items_vr.dmi' + item_state = "holochain_mob" + + flags = CONDUCT | NOBLOODY + no_attack_log = 1 //if you want to turn on the attack log for this, comment/delete this line. Orbis. + slot_flags = SLOT_BELT + force = 10 + throwforce = 3 + w_class = 3 + damtype = HALLOSS + attack_verb = list("flogged", "whipped", "lashed", "disciplined", "chastised", "flayed") + +// joey4298:Emoticon +/obj/item/device/fluff/id_kit_mime + name = "Mime ID reprinter" + desc = "Stick your ID in one end and it'll print a new ID out the other!" + icon = 'icons/obj/bureaucracy.dmi' + icon_state = "labeler1" + + afterattack(obj/O, mob/user as mob) + var/new_icon = "mime" + if(istype(O,/obj/item/weapon/card/id) && O.icon_state != new_icon) + //O.icon = src.icon // just in case we're using custom sprite paths with fluff items. + O.icon_state = new_icon // Changes the icon without changing the access. + playsound(user.loc, 'sound/items/polaroid2.ogg', 100, 1) + user.visible_message(" [user] reprints their ID.") + del(src) + else if(O.icon_state == new_icon) + user << "[O] already has been reprinted." + return + else + user << "This isn't even an ID card you idiot." + return diff --git a/code/modules/vore/fluffstuff/custom_permits_vr.dm b/code/modules/vore/fluffstuff/custom_permits_vr.dm index 2840b7f19e..8d8ada2909 100644 --- a/code/modules/vore/fluffstuff/custom_permits_vr.dm +++ b/code/modules/vore/fluffstuff/custom_permits_vr.dm @@ -102,3 +102,14 @@ The individual named above is licensed by the Nanotrasen Department of Civil Protection to carry one Clockwork Rifle (bolt-action variant). This license expires on 14/Dec/2560 and must be renewed by CentCom prior to this date."} + +//eekasqueak: Serkii Miishy +/obj/item/fluff/permit/serkiimiishy + name = "Serkii Miishy's Stun Revolver Permit" + desc = {" + NAME: Serkii Miishy | RACE: Mousemorph | HOMEWORLD: Mars, Sol + DOB: 10/9/2441 | HEIGHT: 122cm | SEX: Male + + The individual named above is licensed by the Nanotrasen Department of Civil Protection to carry one stun revolver. + This license expires on 30/March/2561 and must be renewed by CentCom prior to this date."} + diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index e5c1e78012..217f0f0310 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index 9a260414b0..4fe023d5d0 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ