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 a01f2ff64aa..c0211f71e65 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -911,6 +911,13 @@ ckeywhitelist = list("theskringdinger") character_name = list("Monty Kopic") +/datum/gear/fluff/shadow_laptop + path = /obj/item/modular_computer/laptop/preset/custom_loadout/advanced/shadowlarkens + display_name = "Shadow's Laptop" + ckeywhitelist = list("tigercat2000") + character_name = list("Shadow Larkens") + cost = 5 + /datum/gear/fluff/konor_medal path = /obj/item/clothing/accessory/medal/silver/unity display_name = "Konor's Unity Medal" diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm index a2749836aa1..d4b311e8e25 100644 --- a/code/modules/modular_computers/computers/modular_computer/core.dm +++ b/code/modules/modular_computers/computers/modular_computer/core.dm @@ -42,6 +42,8 @@ return 1 /obj/item/modular_computer/Initialize() + if(!overlay_icon) + overlay_icon = icon START_PROCESSING(SSobj, src) install_default_hardware() if(hard_drive) @@ -72,20 +74,20 @@ overlays.Cut() if(bsod) - overlays.Add("bsod") + overlays += image(icon = overlay_icon, icon_state = "bsod") return if(!enabled) if(icon_state_screensaver) - overlays.Add(icon_state_screensaver) + overlays += image(icon = overlay_icon, icon_state = icon_state_screensaver) set_light(0) return set_light(light_strength) if(active_program) - overlays.Add(active_program.program_icon_state ? active_program.program_icon_state : icon_state_menu) + overlays += image(icon = overlay_icon, icon_state = active_program.program_icon_state ? active_program.program_icon_state : icon_state_menu) if(active_program.program_key_state) - overlays.Add(active_program.program_key_state) + overlays += image(icon = overlay_icon, icon_state = active_program.program_key_state) else - overlays.Add(icon_state_menu) + overlays += image(icon = overlay_icon, icon_state = icon_state_menu) /obj/item/modular_computer/proc/turn_on(var/mob/user) if(bsod) diff --git a/code/modules/modular_computers/computers/modular_computer/variables.dm b/code/modules/modular_computers/computers/modular_computer/variables.dm index d89a82a0f39..db263d4ec50 100644 --- a/code/modules/modular_computers/computers/modular_computer/variables.dm +++ b/code/modules/modular_computers/computers/modular_computer/variables.dm @@ -24,6 +24,7 @@ // If you create a program which is limited to Laptops and Consoles you don't have to add it's icon_state overlay for Tablets too, for example. icon = null // This thing isn't meant to be used on it's own. Subtypes should supply their own icon. + var/overlay_icon = null icon_state = null center_of_mass = null // No pixelshifting by placing on tables, etc. randpixel = 0 // And no random pixelshifting on-creation either. diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index e445cda2fc4..b9165442f37 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1278,3 +1278,13 @@ /obj/item/clothing/accessory/solgov/department/security/aurora name = "Old security insignia" desc = "Insignia denoting assignment to the security department. These fit Expeditionary Corps uniforms. This one seems to be from the 2100s..." + +//Tigercat2000 - Shadow Larkens +/obj/item/modular_computer/laptop/preset/custom_loadout/advanced/shadowlarkens + name = "Shadow's laptop computer" + desc = "A laptop with a different color scheme than usual!" + icon = 'icons/vore/custom_items_vr.dmi' + overlay_icon = 'icons/obj/modular_laptop.dmi' + icon_state_unpowered = "shadowlaptop-open" + icon_state = "shadowlaptop-open" + icon_state_closed = "shadowlaptop-closed" \ No newline at end of file diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index a16ebe46d9b..4b4f56ebc30 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ