From 6bee95ef0131eb9c6ded1ba906e6e6f8ab5fa06a Mon Sep 17 00:00:00 2001 From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com> Date: Tue, 5 Nov 2019 11:28:37 +0000 Subject: [PATCH] Fluff items Removes Tasald's coat and loyalty implanter as requested in #6147 Adds Tasald's Cartographer's Uniform as approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1627 adds medals: Xander Bevin - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1579 Nick Sloan - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1575 Erik Ramadwood - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1624 Nolan Conaway - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1622 Resolves #6147 --- .../loadout/loadout_fluffitems_vr.dm | 42 +++++++++++++++++++ .../vore/fluffstuff/custom_boxes_vr.dm | 4 +- .../vore/fluffstuff/custom_clothes_vr.dm | 16 ------- 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 13c81b63e1..4f5fa9c11c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -34,6 +34,12 @@ ckeywhitelist = list("aegisoa") character_name = list("Xander Bevin") +/datum/gear/fluff/xander_medal + path = /obj/item/clothing/accessory/medal/conduct + display_name = "Xander's Conduct Medal" + ckeywhitelist = list("aegisoa") + character_name = list("Xander Bevin") + /datum/gear/fluff/lynn_penlight path = /obj/item/device/flashlight/pen/fluff/lynn display_name = "Lynn's Penlight" @@ -85,6 +91,12 @@ ckeywhitelist = list("beyondmylife") character_name = list("Ne'tra Ky'ram") +/datum/gear/fluff/nolan_medal + path = /obj/item/clothing/accessory/medal/silver/unity + display_name = "Nolan's Unity Medal" + ckeywhitelist = list("blakeryan") + character_name = list("Nolan Conaway") + /datum/gear/fluff/xin_sovietuniform path = /obj/item/clothing/under/soviet display_name = "Xin's Soviet Uniform" @@ -98,6 +110,24 @@ ckeywhitelist = list("bwoincognito") character_name = list("Tasald Corlethian") +/datum/gear/fluff/tasald_cartographer_jumpsuit + path = /obj/item/clothing/under/solgov/utility/sifguard/officer/exploration + display_name = "Tasald's Cartographer's uniform - jumpsuit" + ckeywhitelist = list("bwoincognito") + character_name = list("Tasald Corlethian") + +/datum/gear/fluff/tasald_cartographer_jacket + path = /obj/item/clothing/suit/storage/service/sifguard/command + display_name = "Tasald's Cartographer's uniform - jacket" + ckeywhitelist = list("bwoincognito") + character_name = list("Tasald Corlethian") + +/datum/gear/fluff/tasald_cartographer_beret + path = /obj/item/clothing/head/beret/sol/expedition/command + display_name = "Tasald's Cartographer's uniform - beret" + ckeywhitelist = list("bwoincognito") + character_name = list("Tasald Corlethian") + /datum/gear/fluff/octavius_box path = /obj/item/weapon/storage/box/fluff/octavious display_name = "Octavious' Box" @@ -210,6 +240,12 @@ ckeywhitelist = list("epigraphzero") character_name = list("Verd Woodrow") +/datum/gear/fluff/erik_medal + path = /obj/item/clothing/accessory/medal/silver/unity + display_name = "Erik's Unity Medal" + ckeywhitelist = list("erikthedog") + character_name = list("Erik Ramadwood") + // F CKEYS // G CKEYS @@ -708,6 +744,12 @@ ckeywhitelist = list("techtypes") character_name = list("Lasshseeki Korss") +/datum/gear/fluff/nick_medal + path = /obj/item/clothing/accessory/medal/conduct + display_name = "Nick's Conduct Medal" + ckeywhitelist = list("thedavestdave") + character_name = list("Nick Sloan") + /datum/gear/fluff/konor_medal path = /obj/item/clothing/accessory/medal/silver/unity display_name = "Konor's Unity Medal" diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index 07e018f7a6..489cab17f5 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -60,9 +60,7 @@ desc = "A kit containing Tasald's equipment." has_items = list( /obj/item/clothing/suit/storage/det_suit/fluff/tasald, - /obj/item/clothing/suit/storage/det_suit/fluff/tas_coat, - /obj/item/clothing/under/det/fluff/tasald, - /obj/item/weapon/implanter/loyalty) + /obj/item/clothing/under/det/fluff/tasald) //bwoincognito:Octavious Ward /obj/item/weapon/storage/box/fluff/octavious diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 1ba3941bbe..11cf4ab2e3 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -502,22 +502,6 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0) -// 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. " - allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight,/obj/item/clothing/head/helmet) - - 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 - armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) - //Event Costumes Below /obj/item/clothing/head/helmet/fluff/freddy name = "Animatronic Suit Helmet"