Merge pull request #4248 from CHOMPStation2/upstream-merge-12958

[MIRROR] Adds Nettie's fluff Tablet
This commit is contained in:
Nadyr
2022-05-12 19:58:45 -04:00
committed by GitHub
2 changed files with 33 additions and 1 deletions

View File

@@ -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")
character_name = list("Lucky")

View File

@@ -1486,3 +1486,29 @@ 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
//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()