From 95a86ad1c4424af37a1b51d64d1495a2cbe65478 Mon Sep 17 00:00:00 2001 From: Cebutris Date: Mon, 13 Jan 2020 19:27:33 -0500 Subject: [PATCH 1/3] foxicide fluff items --- code/modules/vore/fluffstuff/custom_clothes_yw.dm | 9 +++++++++ code/modules/vore/fluffstuff/custom_items_yw.dm | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm index 0eaa343647..5e5197ef5d 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm @@ -1591,3 +1591,12 @@ icon_override = 'icons/vore/custom_clothes_yw.dmi' item_state = "valormedal1_mob" overlay_state = "valormedal1_mob" + +// ****** +// Foxicide +// ****** +/obj/item/weapon/storage/backpack/fluff/kaith + name = "Light Duffel bag" + desc = "A compact duffel bag, meant for long hikes." + icon = 'icons/obj/clothing/backpack.dmi' + icon_state = "duffle" \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm index 9f62aa8163..0e01c857cc 100644 --- a/code/modules/vore/fluffstuff/custom_items_yw.dm +++ b/code/modules/vore/fluffstuff/custom_items_yw.dm @@ -568,3 +568,11 @@ from_suit = /obj/item/clothing/suit/storage/hooded/explorer to_suit = /obj/item/clothing/suit/storage/hooded/fluff/mocha_suit +// ************* +// Foxicide +// ************* +/obj/item/weapon/kitchenknife/tacknife/unathiknife/fluff/kaith + name = "Trusty Survival Knife" + desc = "An old looking knife with an outdated wooden handle. Still looks robust, though." + icon = 'icons/vore/custom_items_yw.dmi' + icon_state = "kaithknife" \ No newline at end of file From 0773e06bc65515e6ed027b6d8dec59019c7bef57 Mon Sep 17 00:00:00 2001 From: Cebutris Date: Mon, 13 Jan 2020 19:51:31 -0500 Subject: [PATCH 2/3] oops --- .../loadout/loadout_fluffitems_yw.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm index 11dbbb06eb..3149f5f83a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -346,6 +346,22 @@ // F CKEYS +//Foxicide +//Kaith +/datum/gear/fluff/kaith_knife + path = /obj/item/weapon/kitchenknife/tacknife/unathiknife/fluff/kaith + display_name = "Trusty Survival Knife" + description = "An old looking knife with an outdated wooden handle. Still looks robust, though." + ckeywhitelist = list("foxicide") + character_name = list("Kaith") + +/datum/gear/fluff/kaith_bag + path = /obj/item/weapon/storage/backpack/fluff/kaith + display_name = "Light Duffel bag" + description = "A compact duffel bag, meant for long hikes." + ckeywhitelist = list("foxicide") + character_name = list("Kaith") + // G CKEYS //generalpantsu From 3450336020d109d0dd485c60c3e317fb25bf3802 Mon Sep 17 00:00:00 2001 From: Cebutris Date: Mon, 20 Jan 2020 13:44:02 -0500 Subject: [PATCH 3/3] does the thing, and another thing --- .../items/weapons/material/material_weapons.dm | 4 +++- .../loadout/loadout_fluffitems_yw.dm | 12 ++++++------ .../modules/vore/fluffstuff/custom_clothes_yw.dm | 4 ++-- code/modules/vore/fluffstuff/custom_items_yw.dm | 16 ++++++++++++++-- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index 3f2b1978d3..9d4592c17c 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -26,6 +26,7 @@ var/default_material = DEFAULT_WALL_MATERIAL var/material/material var/drops_debris = 1 + var/named_from_material = 1 //YW EDIT, Does it prepend the material's name to it's name? /obj/item/weapon/material/New(var/newloc, var/material_key) ..(newloc) @@ -65,7 +66,8 @@ if(!material) qdel(src) else - name = "[material.display_name] [initial(name)]" + if(named_from_material) //YW EDIT + name = "[material.display_name] [initial(name)]" health = round(material.integrity/10) if(applies_material_colour) color = material.icon_colour diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm index 3149f5f83a..30bbd07f30 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -348,17 +348,17 @@ //Foxicide //Kaith -/datum/gear/fluff/kaith_knife - path = /obj/item/weapon/kitchenknife/tacknife/unathiknife/fluff/kaith - display_name = "Trusty Survival Knife" - description = "An old looking knife with an outdated wooden handle. Still looks robust, though." +/datum/gear/fluff/kaith_modkit + path = /obj/item/device/modkit_conversion/fluff/kaith_knife_kit + display_name = "Kaith's modkit" + description = "A kit containing all the needed tools and parts to modify a survival knife" ckeywhitelist = list("foxicide") character_name = list("Kaith") /datum/gear/fluff/kaith_bag path = /obj/item/weapon/storage/backpack/fluff/kaith - display_name = "Light Duffel bag" - description = "A compact duffel bag, meant for long hikes." + display_name = "Light duffle bag" + description = "A compact duffle bag, meant for long hikes." ckeywhitelist = list("foxicide") character_name = list("Kaith") diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm index 5e5197ef5d..22cc6ef33f 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm @@ -1596,7 +1596,7 @@ // Foxicide // ****** /obj/item/weapon/storage/backpack/fluff/kaith - name = "Light Duffel bag" - desc = "A compact duffel bag, meant for long hikes." + name = "Light duffle bag" + desc = "A compact duffle bag, meant for long hikes." icon = 'icons/obj/clothing/backpack.dmi' icon_state = "duffle" \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm index 0e01c857cc..32c8215359 100644 --- a/code/modules/vore/fluffstuff/custom_items_yw.dm +++ b/code/modules/vore/fluffstuff/custom_items_yw.dm @@ -571,8 +571,20 @@ // ************* // Foxicide // ************* -/obj/item/weapon/kitchenknife/tacknife/unathiknife/fluff/kaith +/obj/item/weapon/material/knife/tacknife/survival/fluff/kaith name = "Trusty Survival Knife" desc = "An old looking knife with an outdated wooden handle. Still looks robust, though." icon = 'icons/vore/custom_items_yw.dmi' - icon_state = "kaithknife" \ No newline at end of file + icon_state = "kaithknife" + named_from_material = 0 + +/obj/item/device/modkit_conversion/fluff/kaith_knife_kit + name = "Kaith's modkit" + desc = "A kit containing all the needed tools and parts to modify a survival knife" + + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "modkit" + + from_suit = /obj/item/weapon/material/knife/tacknife/survival + to_suit = /obj/item/weapon/material/knife/tacknife/survival/fluff/kaith +