From a3b274487fb634f564d174eebff0f55b7a662163 Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 12 May 2022 15:42:13 -0400 Subject: [PATCH 1/2] Adds Nettie's fluff Tablet --- .../loadout/loadout_fluffitems_vr.dm | 8 ++++- .../vore/fluffstuff/custom_items_vr.dm | 29 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) 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 184f61debd..e47364e9e4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -142,6 +142,12 @@ ckeywhitelist = list("bobofboblandia") character_name = list("Charles Gettler") +/datum/gear/fluff/nettie_tablet + path = /obj/item/modular_computer/tablet/preset/custom_loadout/nettie + display_name = "Remodeled Tablet" + ckeywhitelist = list("bricker98") + character_name = list("Nettie Stough") + /datum/gear/fluff/xin_sovietuniform path = /obj/item/clothing/under/soviet display_name = "Xin's Soviet Uniform" @@ -1252,4 +1258,4 @@ path = /obj/item/device/modkit_conversion/crusader_luck display_name = "Lucky's amour" ckeywhitelist = list ("thedavestdave") - character_name = list("Lucky") \ No newline at end of file + character_name = list("Lucky") diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 66bc6baf0a..bfe87ba9ec 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1486,3 +1486,32 @@ End CHOMP Removal*/ attack_verb = list("blorbled", "slimed", "absorbed", "glomped") gender = PLURAL // this seems like a good idea but probably prone to changing. todo: ask dan // the only reason this thought is relevant because the base slimeplush has its gender set to female +<<<<<<< HEAD +======= + +//YeCrowbarMan - Lemon Yellow +/obj/item/toy/plushie/fluff/lemonplush + name = "yellow slime plushie" + desc = "A well-worn slime custom-made yellow plushie, extensively hugged and loved. It reeks of lemon." + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "lemonplush" + attack_verb = list("blorbled", "slimed", "absorbed", "glomped") + +//Bricker98:Nettie Stough +/obj/item/modular_computer/tablet/preset/custom_loadout/nettie + name = "Remodeled Tablet" + desc = "A tablet computer, looks quite high-tech and has some emblems on the back." + icon = 'icons/obj/modular_tablet.dmi' + icon_state = "elite" + icon_state_unpowered = "elite" + +/obj/item/modular_computer/tablet/preset/custom_loadout/nettie/install_default_hardware() + ..() + processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/(src) + network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) + battery_module = new/obj/item/weapon/computer_hardware/battery_module(src) + battery_module.charge_to_full() +>>>>>>> 679b957ef7... Merge pull request #12958 from TheToaster98/NettieFluff From 9cafbc8dd04963f5b2202fa1b7a649a3f32923c3 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Thu, 12 May 2022 19:40:22 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/vore/fluffstuff/custom_items_vr.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index bfe87ba9ec..f4cbfc902e 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1486,8 +1486,6 @@ End CHOMP Removal*/ attack_verb = list("blorbled", "slimed", "absorbed", "glomped") gender = PLURAL // this seems like a good idea but probably prone to changing. todo: ask dan // the only reason this thought is relevant because the base slimeplush has its gender set to female -<<<<<<< HEAD -======= //YeCrowbarMan - Lemon Yellow /obj/item/toy/plushie/fluff/lemonplush @@ -1514,4 +1512,3 @@ End CHOMP Removal*/ nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) battery_module = new/obj/item/weapon/computer_hardware/battery_module(src) battery_module.charge_to_full() ->>>>>>> 679b957ef7... Merge pull request #12958 from TheToaster98/NettieFluff