From ec67313964c87c00f17dbc63a25bbcd0d9ccdc7c Mon Sep 17 00:00:00 2001 From: TheToaster98 <51209769+TheToaster98@users.noreply.github.com> Date: Thu, 12 May 2022 19:48:12 +0200 Subject: [PATCH 1/4] Update loadout_fluffitems_vr --- .../preference_setup/loadout/loadout_fluffitems_vr.dm | 8 +++++++- 1 file changed, 7 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 6684a605f5a..667bf3eea25 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -198,6 +198,12 @@ ckeywhitelist = list("bobofboblandia") character_name = list("Charles Gettler") +/datum/gear/fluff/nettie_tablet + path = /obj/item/modular_computer/tablet/preset/custom_loadout/elite/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" @@ -1380,4 +1386,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") From bce935865da9e2246b69c6220776d97246cb1b39 Mon Sep 17 00:00:00 2001 From: TheToaster98 <51209769+TheToaster98@users.noreply.github.com> Date: Thu, 12 May 2022 19:48:26 +0200 Subject: [PATCH 2/4] Update custom_items_vr.dm --- code/modules/vore/fluffstuff/custom_items_vr.dm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 96ea7e77a04..fcbe0e0e49b 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1495,4 +1495,15 @@ 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") \ No newline at end of file + attack_verb = list("blorbled", "slimed", "absorbed", "glomped") + +//Bricker98:Nettie Stough +/obj/item/modular_computer/tablet/preset/custom_loadout/elite/nettie + name = "Remodeled Tablet" + desc = "A tablet computer, looks quite high-tech and has some emblems on the back." + +/obj/item/modular_computer/tablet/preset/custom_loadout/elite/nettie/install_default_hardware() + ..() + qdel_null(hard_drive) + hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(src) + qdel_null(card_slot) From 17bdd346468b88ebc67990b81e458ca26258ce88 Mon Sep 17 00:00:00 2001 From: TheToaster98 <51209769+TheToaster98@users.noreply.github.com> Date: Thu, 12 May 2022 20:13:48 +0200 Subject: [PATCH 3/4] Make the tablet its own subtype Please don't break --- .../vore/fluffstuff/custom_items_vr.dm | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index fcbe0e0e49b..1fd5965df9a 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1498,12 +1498,19 @@ attack_verb = list("blorbled", "slimed", "absorbed", "glomped") //Bricker98:Nettie Stough -/obj/item/modular_computer/tablet/preset/custom_loadout/elite/nettie - name = "Remodeled Tablet" - desc = "A tablet computer, looks quite high-tech and has some emblems on the back." +/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/elite/nettie/install_default_hardware() +/obj/item/modular_computer/tablet/preset/custom_loadout/nettie/install_default_hardware() ..() - qdel_null(hard_drive) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(src) - qdel_null(card_slot) + 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() From 42a95cdc3931c37033494c2577c078351db0dd5f Mon Sep 17 00:00:00 2001 From: TheToaster98 <51209769+TheToaster98@users.noreply.github.com> Date: Thu, 12 May 2022 21:18:43 +0200 Subject: [PATCH 4/4] Change Datum for the new subtype AAAAAA --- .../client/preference_setup/loadout/loadout_fluffitems_vr.dm | 2 +- 1 file changed, 1 insertion(+), 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 667bf3eea25..42aa7f50d21 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -199,7 +199,7 @@ character_name = list("Charles Gettler") /datum/gear/fluff/nettie_tablet - path = /obj/item/modular_computer/tablet/preset/custom_loadout/elite/nettie + path = /obj/item/modular_computer/tablet/preset/custom_loadout/nettie display_name = "Remodeled Tablet" ckeywhitelist = list("bricker98") character_name = list("Nettie Stough")