From 3799968eb3e6a3e61e54dc12699bb0fe92c5442f Mon Sep 17 00:00:00 2001 From: mcbalaam <104003807+mcbalaam@users.noreply.github.com> Date: Sun, 4 Jan 2026 02:52:18 +0700 Subject: [PATCH] feat: new floppy disk sprites; most disks are now under the `/item/disk` type; adds disk stacking, uqinue styling and wrapping (#94112) ## About The Pull Request Floppy disks received a sprite upgrade, as well as unique wraps: image image You can now stack floppy disks! They also scatter around when thrown. The video also showcases new styling options with a selection of stickers! You can also write something on the disk instead of selecting an icon: https://github.com/user-attachments/assets/ff0a8542-9d79-4108-ae46-672ca5d620a2 MOST disks now inherit the `/item/disk` type to properly stack and do... stuff. An updatepaths script included. ## Why It's Good For The Game Old school is cool. Stacking disks makes them feel more authentic, while styling allows for more crearivity! ## Changelog :cl: add: New unique wraps for floppy disks qol: Floppy disks can now be stacked image: New sprites and stickers for floppy disks map: Added and ran an updatepaths script refactor: Most disks are now under the base disk item type /:cl: --------- Co-authored-by: The-Tyrant --- .../icemoon_underground_syndidome.dmm | 4 +- .../icemoon_underground_syndielab.dmm | 2 +- .../LavaRuins/lavaland_surface_crashsite.dmm | 2 +- .../SpaceRuins/anomaly_research.dmm | 2 +- _maps/RandomRuins/SpaceRuins/derelict7.dmm | 2 +- .../RandomRuins/SpaceRuins/garbagetruck4.dmm | 4 +- .../SpaceRuins/old_infiltrator.dmm | 2 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 2 +- .../SpaceRuins/turretedoutpost.dmm | 2 +- _maps/RandomZLevels/SnowCabin.dmm | 4 +- _maps/RandomZLevels/moonoutpost19.dmm | 4 +- _maps/RandomZLevels/museum.dmm | 2 +- _maps/RandomZLevels/undergroundoutpost45.dmm | 4 +- .../CatwalkStation/CatwalkStation_2023.dmm | 6 +- .../map_files/Deltastation/DeltaStation2.dmm | 34 +- .../map_files/IceBoxStation/IceBoxStation.dmm | 32 +- _maps/map_files/MetaStation/MetaStation.dmm | 28 +- .../map_files/NebulaStation/NebulaStation.dmm | 12 +- _maps/map_files/generic/CentCom.dmm | 6 +- _maps/map_files/tramstation/tramstation.dmm | 30 +- _maps/map_files/wawastation/wawastation.dmm | 14 +- code/_globalvars/lists/maintenance_loot.dm | 12 +- .../greyscale_configs/greyscale_objects.dm | 5 + .../json_configs/giftdeliveryfloppy.json | 16 + code/datums/holocall.dm | 2 +- code/game/gamemodes/objective_items.dm | 6 +- code/game/machinery/dna_scanner.dm | 50 +-- .../objects/effects/spawners/random/exotic.dm | 2 +- .../game/objects/items/devices/aicard_evil.dm | 7 +- code/game/objects/items/floppy_disk.dm | 370 ++++++++++++++++++ code/game/objects/items/rcd/RHD.dm | 2 +- code/game/objects/items/rcd/RPD.dm | 2 +- code/game/objects/items/robot/ai_upgrades.dm | 4 +- code/game/objects/items/stacks/wrap.dm | 8 +- .../items/storage/boxes/science_boxes.dm | 7 +- .../items/storage/boxes/security_boxes.dm | 2 +- .../game/objects/items/storage/uplink_kits.dm | 8 +- code/game/objects/items/theft_tools.dm | 5 +- .../closets/secure/engineering.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 2 +- .../closets/secure/scientist.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 6 +- .../equipment/nuclear_authentication_disk.dm | 14 +- code/modules/bitrunning/objects/debug.dm | 2 +- code/modules/bitrunning/objects/disks.dm | 48 +-- .../objects/gimmick_disks/_gimmick_disk.dm | 8 +- .../objects/gimmick_disks/dungeon_disk.dm | 2 +- .../objects/gimmick_disks/sports_disk.dm | 2 +- code/modules/bitrunning/orders/tech.dm | 24 +- .../virtual_domain/domains/island_brawl.dm | 2 +- code/modules/cargo/exports/parts.dm | 6 +- .../cargo/markets/market_items/tools.dm | 2 +- code/modules/cargo/supplypod.dm | 7 +- .../mob/living/silicon/robot/robot_defense.dm | 2 +- .../computers/item/computer.dm | 6 +- .../computers/item/computer_files.dm | 4 +- .../computers/item/disks/computer_disk.dm | 27 +- .../computers/item/disks/maintenance_disks.dm | 16 +- .../computers/item/disks/role_disks.dm | 28 +- .../computers/item/disks/unique_disks.dm | 20 +- .../computers/item/disks/virus_disk.dm | 22 +- .../modular_computers/computers/item/pda.dm | 6 +- .../computers/item/role_tablet_presets.dm | 6 +- .../file_system/computer_file.dm | 2 +- .../programs/messenger/messenger_program.dm | 4 +- code/modules/power/singularity/emitter.dm | 2 +- .../research/designs/computer_part_designs.dm | 6 +- .../research/ordnance/doppler_array.dm | 6 +- .../research/ordnance/tank_compressor.dm | 6 +- code/modules/research/server.dm | 4 +- .../uplink/uplink_items/device_tools.dm | 6 +- code/modules/uplink/uplink_items/explosive.dm | 2 +- code/modules/uplink/uplink_items/nukeops.dm | 2 +- code/modules/vending/assist.dm | 2 +- code/modules/vending/cartridge.dm | 12 +- code/modules/vending/modularpc.dm | 2 +- icons/obj/devices/circuitry_n_data.dmi | Bin 23033 -> 17163 bytes icons/obj/devices/floppy_disks.dmi | Bin 0 -> 4210 bytes icons/obj/storage/wrapping.dmi | Bin 3663 -> 6844 bytes tgstation.dme | 1 + .../UpdatePaths/Scripts/94112_disk_repath.txt | 7 + 81 files changed, 694 insertions(+), 342 deletions(-) create mode 100644 code/datums/greyscale/json_configs/giftdeliveryfloppy.json create mode 100644 code/game/objects/items/floppy_disk.dm create mode 100644 icons/obj/devices/floppy_disks.dmi create mode 100644 tools/UpdatePaths/Scripts/94112_disk_repath.txt diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm index f93bfc737a0..07e7273ca21 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm @@ -4051,11 +4051,11 @@ /area/icemoon/surface/outdoors/noteleport) "UK" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -5; pixel_y = 8 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = 4; pixel_y = 5 }, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm index 0ce6fd74481..2d65f7ff2a0 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm @@ -680,7 +680,7 @@ /area/ruin/syndielab) "QO" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/computer_disk/syndicate/camera_app{ +/obj/item/disk/computer/syndicate/camera_app{ pixel_y = 4; pixel_x = -5 }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm index 4a162ed4e76..ef3307e388d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm @@ -54,7 +54,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/item/bitrunning_disk/item/pka_mods, +/obj/item/disk/bitrunning/item/pka_mods, /turf/open/floor/mineral/titanium/blue, /area/ruin/unpowered) "k" = ( diff --git a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm index 17fe1864a16..88e51a612a6 100644 --- a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm @@ -269,7 +269,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/computer_disk/ordnance, +/obj/item/disk/computer/ordnance, /turf/open/floor/iron/dark, /area/misc/anomaly_research) "iq" = ( diff --git a/_maps/RandomRuins/SpaceRuins/derelict7.dmm b/_maps/RandomRuins/SpaceRuins/derelict7.dmm index 49cd1a71613..d12954efd2c 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict7.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict7.dmm @@ -265,7 +265,7 @@ /obj/effect/turf_decal/trimline/neutral/warning{ dir = 1 }, -/obj/item/computer_disk/ordnance, +/obj/item/disk/computer/ordnance, /turf/open/floor/iron/dark/side/airless{ dir = 1 }, diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm index 10c1a56fa26..627842aa210 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm @@ -635,8 +635,8 @@ "JI" = ( /obj/item/dice/d10, /obj/structure/filingcabinet/chestdrawer, -/obj/item/computer_disk/maintenance/modsuit_control, -/obj/item/computer_disk/maintenance/modsuit_control, +/obj/item/disk/computer/maintenance/modsuit_control, +/obj/item/disk/computer/maintenance/modsuit_control, /turf/open/floor/plating, /area/ruin/space/has_grav/garbagetruck/toystore) "KR" = ( diff --git a/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm b/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm index 082f1341908..a98f08c1948 100644 --- a/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm +++ b/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm @@ -215,7 +215,7 @@ pixel_y = -4; pixel_x = -7 }, -/obj/item/computer_disk/syndicate/camera_app{ +/obj/item/disk/computer/syndicate/camera_app{ pixel_x = -5; pixel_y = 9 }, diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 93141bbfef4..07001ee233f 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -3051,7 +3051,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/table, /obj/machinery/door/window/brigdoor/right/directional/east, -/obj/item/computer_disk, +/obj/item/disk/computer, /turf/open/floor/iron/dark, /area/ruin/space/ancientstation/delta/ai) "nI" = ( diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm index e2efec50286..853c4c3c68e 100644 --- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm +++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm @@ -165,7 +165,7 @@ pixel_x = 5; pixel_y = 6 }, -/obj/item/computer_disk/syndicate/camera_app{ +/obj/item/disk/computer/syndicate/camera_app{ pixel_x = -5 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index a190ac27e3e..d0c0389f4e6 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -3318,7 +3318,7 @@ /obj/effect/turf_decal/weather/snow, /obj/item/modular_computer/pda/syndicate{ desc = "A portable microcomputer by Thinktronic Systems, LTD."; - inserted_disk = /obj/item/computer_disk/virus/clown; + inserted_disk = /obj/item/disk/computer/virus/clown; name = "soviet tablet" }, /obj/effect/decal/remains/human{ @@ -5321,7 +5321,7 @@ /obj/structure/table/reinforced, /obj/item/modular_computer/pda/syndicate{ desc = "A portable microcomputer by Thinktronic Systems, LTD."; - inserted_disk = /obj/item/computer_disk/virus/mime; + inserted_disk = /obj/item/disk/computer/virus/mime; name = "soviet tablet" }, /obj/effect/light_emitter{ diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 7ec1338d0c0..377eb6be16f 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -2644,8 +2644,8 @@ /area/awaymission/moonoutpost19/arrivals) "rc" = ( /obj/structure/table, -/obj/item/computer_disk/ordnance, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance, +/obj/item/disk/computer/ordnance{ pixel_x = -4; pixel_y = 2 }, diff --git a/_maps/RandomZLevels/museum.dmm b/_maps/RandomZLevels/museum.dmm index ab6be28cdfb..a4492aed844 100644 --- a/_maps/RandomZLevels/museum.dmm +++ b/_maps/RandomZLevels/museum.dmm @@ -5535,7 +5535,7 @@ "Ux" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/structure/table, -/obj/item/computer_disk{ +/obj/item/disk/computer{ name = "plant data disk"; icon_state = "datadisk_hydro" }, diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 624f05678ac..0b5d881f3d5 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -7785,8 +7785,8 @@ /area/awaymission/undergroundoutpost45/engineering) "Yk" = ( /obj/structure/table, -/obj/item/computer_disk/ordnance, -/obj/item/computer_disk/ordnance, +/obj/item/disk/computer/ordnance, +/obj/item/disk/computer/ordnance, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria{ dir = 5 diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index 02508b9de0f..1b2d3a0e6b5 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -32163,11 +32163,11 @@ /obj/item/radio/intercom/directional/east, /obj/structure/cable, /obj/machinery/keycard_auth/wall_mounted/directional/south, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -6 }, -/obj/item/computer_disk, -/obj/item/computer_disk{ +/obj/item/disk/computer, +/obj/item/disk/computer{ pixel_x = 6 }, /turf/open/floor/wood, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 7faa02b1844..17f79580956 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -13971,9 +13971,9 @@ /area/station/maintenance/disposal/incinerator) "dvF" = ( /obj/structure/table/reinforced, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, +/obj/item/disk/computer/quartermaster, +/obj/item/disk/computer/quartermaster, +/obj/item/disk/computer/quartermaster, /obj/item/gps/mining, /obj/item/paper_bin/carbon, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -38804,11 +38804,11 @@ /area/station/security/holding_cell) "jCf" = ( /obj/structure/table, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = 7; pixel_y = 2 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -2 }, /obj/machinery/light_switch/directional/east{ @@ -46311,17 +46311,17 @@ pixel_x = 4; pixel_y = 1 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_y = 4 }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -2; pixel_y = 2 }, -/obj/item/computer_disk, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer, +/obj/item/disk/computer/ordnance{ pixel_x = -4; pixel_y = -1 }, @@ -59055,9 +59055,9 @@ "oIL" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/bot, -/obj/item/computer_disk/engineering, -/obj/item/computer_disk/engineering, -/obj/item/computer_disk/engineering, +/obj/item/disk/computer/engineering, +/obj/item/disk/computer/engineering, +/obj/item/disk/computer/engineering, /obj/structure/rack, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -66183,10 +66183,10 @@ /area/station/service/chapel) "qtq" = ( /obj/structure/table, -/obj/item/computer_disk/medical{ +/obj/item/disk/computer/medical{ pixel_x = 3 }, -/obj/item/computer_disk/medical{ +/obj/item/disk/computer/medical{ pixel_x = -3 }, /obj/item/toy/figure/cmo, @@ -94883,13 +94883,13 @@ /area/station/science/xenobiology) "xzq" = ( /obj/structure/table/reinforced, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_x = 3 }, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_x = -2 }, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_y = 2 }, /obj/item/toy/figure/rd, diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 70abb1613d3..bf6538a41c4 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -20782,9 +20782,9 @@ }, /obj/structure/table, /obj/item/coin/silver, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, +/obj/item/disk/computer/quartermaster, +/obj/item/disk/computer/quartermaster, +/obj/item/disk/computer/quartermaster, /obj/item/clipboard, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -22970,15 +22970,15 @@ }, /obj/item/stock_parts/power_store/cell/high, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/computer_disk/engineering{ +/obj/item/disk/computer/engineering{ pixel_x = 4; pixel_y = 3 }, -/obj/item/computer_disk/engineering{ +/obj/item/disk/computer/engineering{ pixel_x = 4; pixel_y = 3 }, -/obj/item/computer_disk/engineering{ +/obj/item/disk/computer/engineering{ pixel_x = 4; pixel_y = 3 }, @@ -23683,12 +23683,12 @@ /area/station/engineering/storage_shared) "gEy" = ( /obj/structure/table, -/obj/item/computer_disk/ordnance, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance, +/obj/item/disk/computer/ordnance{ pixel_x = -5; pixel_y = 4 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = 7; pixel_y = 2 }, @@ -61319,8 +61319,8 @@ /area/station/medical/virology) "rjt" = ( /obj/structure/table/glass, -/obj/item/computer_disk/medical, -/obj/item/computer_disk/medical, +/obj/item/disk/computer/medical, +/obj/item/disk/computer/medical, /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark, @@ -71218,10 +71218,10 @@ /area/station/service/theater) "tZw" = ( /obj/structure/table, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -2 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = 2; pixel_y = 8 }, @@ -76818,14 +76818,14 @@ /area/station/medical/break_room) "vIg" = ( /obj/structure/table, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = 7; pixel_y = 2 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -2 }, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_x = -5; pixel_y = 6 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 567b6badb80..e8234f1482a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -10494,9 +10494,9 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/paper/monitorkey, -/obj/item/computer_disk/engineering, -/obj/item/computer_disk/engineering, -/obj/item/computer_disk/engineering, +/obj/item/disk/computer/engineering, +/obj/item/disk/computer/engineering, +/obj/item/disk/computer/engineering, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) @@ -26804,7 +26804,7 @@ name = "Dud Rocket"; desc = "An 84mm High Explosive rocket. This one's a dud. Pretty sure." }, -/obj/item/computer_disk/quartermaster{ +/obj/item/disk/computer/quartermaster{ pixel_x = 9; pixel_y = 13 }, @@ -33099,9 +33099,9 @@ /obj/effect/turf_decal/siding{ dir = 4 }, -/obj/item/computer_disk/ordnance, -/obj/item/computer_disk/ordnance, -/obj/item/computer_disk/ordnance, +/obj/item/disk/computer/ordnance, +/obj/item/disk/computer/ordnance, +/obj/item/disk/computer/ordnance, /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, @@ -41869,11 +41869,11 @@ /area/station/hallway/primary/starboard) "ote" = ( /obj/structure/table, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -8; pixel_y = -3 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -5; pixel_y = 8 }, @@ -41881,7 +41881,7 @@ dir = 9 }, /obj/machinery/airalarm/directional/west, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_x = 1 }, /turf/open/floor/iron/white, @@ -51565,8 +51565,8 @@ pixel_x = -7; pixel_y = 8 }, -/obj/item/computer_disk/medical, -/obj/item/computer_disk/medical, +/obj/item/disk/computer/medical, +/obj/item/disk/computer/medical, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) "rHn" = ( @@ -58014,11 +58014,11 @@ /obj/item/radio/intercom/directional/east, /obj/structure/table, /obj/effect/turf_decal/bot, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = 7; pixel_y = 2 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -5; pixel_y = 8 }, diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index 7ac250c073f..6521255f639 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -19832,7 +19832,7 @@ fax_name = "Chief Engineer's Office"; name = "Chief Engineer's Fax Machine" }, -/obj/item/computer_disk/engineering, +/obj/item/disk/computer/engineering, /obj/structure/table/reinforced/rglass, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/ce) @@ -32131,14 +32131,14 @@ }, /obj/effect/mapping_helpers/requests_console/assistance, /obj/effect/mapping_helpers/requests_console/information, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -5; pixel_y = 8 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_y = 1 }, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_x = 4; pixel_y = 6 }, @@ -101353,7 +101353,7 @@ pixel_y = 6; pixel_x = -5 }, -/obj/item/computer_disk/medical, +/obj/item/disk/computer/medical, /obj/machinery/requests_console/directional/south{ department = "Chief Medical Officer's Desk"; name = "Chief Medical Officer's Requests Console" @@ -144154,7 +144154,7 @@ pixel_y = 3; pixel_x = -2 }, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_y = 2; pixel_x = 4 }, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index c63c1c091ce..f3e01239f79 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -7081,9 +7081,9 @@ /area/awaymission/errorroom) "FO" = ( /obj/structure/table/reinforced, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, +/obj/item/disk/computer/quartermaster, +/obj/item/disk/computer/quartermaster, +/obj/item/disk/computer/quartermaster, /obj/item/gps/mining, /obj/effect/turf_decal/stripes/line{ dir = 6 diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index d5153099e4a..27fa9526b94 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -14194,15 +14194,15 @@ /area/station/engineering/engine_smes) "dNH" = ( /obj/structure/table, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -8; pixel_y = -3 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -5; pixel_y = 8 }, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_x = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -18341,8 +18341,8 @@ /area/station/security/brig) "foD" = ( /obj/structure/table/glass, -/obj/item/computer_disk/medical, -/obj/item/computer_disk/medical, +/obj/item/disk/computer/medical, +/obj/item/disk/computer/medical, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) @@ -38965,9 +38965,9 @@ dir = 1 }, /obj/structure/window/reinforced/spawner/directional/west, -/obj/item/computer_disk/engineering, -/obj/item/computer_disk/engineering, -/obj/item/computer_disk/engineering, +/obj/item/disk/computer/engineering, +/obj/item/disk/computer/engineering, +/obj/item/disk/computer/engineering, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) "myc" = ( @@ -43745,10 +43745,10 @@ /area/station/construction/mining/aux_base) "okA" = ( /obj/structure/table, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -2 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = 7; pixel_y = 2 }, @@ -48336,8 +48336,8 @@ "pUV" = ( /obj/structure/table, /obj/item/clipboard, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, +/obj/item/disk/computer/quartermaster, +/obj/item/disk/computer/quartermaster, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -62314,15 +62314,15 @@ pixel_x = 7; pixel_y = -2 }, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_x = -4; pixel_y = 10 }, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_x = 5; pixel_y = 10 }, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_x = 1; pixel_y = 10 }, diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index 2a07700a6ad..28b390be699 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -207,7 +207,7 @@ pixel_y = 4 }, /obj/machinery/firealarm/directional/east, -/obj/item/computer_disk/quartermaster{ +/obj/item/disk/computer/quartermaster{ pixel_x = -6; pixel_y = 4 }, @@ -16102,7 +16102,7 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, -/obj/item/computer_disk/ordnance, +/obj/item/disk/computer/ordnance, /obj/machinery/light/warm/directional/south, /obj/item/coffee_cartridge/fancy, /turf/open/floor/iron/dark, @@ -23195,11 +23195,11 @@ /obj/item/radio/intercom/directional/east, /obj/structure/table, /obj/effect/turf_decal/bot, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = 7; pixel_y = 2 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_x = -5; pixel_y = 8 }, @@ -36622,7 +36622,7 @@ /turf/open/floor/iron, /area/station/security) "mEN" = ( -/obj/item/computer_disk/maintenance/spectre_meter, +/obj/item/disk/computer/maintenance/spectre_meter, /turf/open/misc/asteroid/airless, /area/station/asteroid) "mEQ" = ( @@ -49449,7 +49449,7 @@ /obj/machinery/modular_computer/preset/civilian{ dir = 1 }, -/obj/item/computer_disk/ordnance{ +/obj/item/disk/computer/ordnance{ pixel_x = 1 }, /turf/open/floor/iron/dark, @@ -64419,7 +64419,7 @@ "whG" = ( /obj/structure/table/reinforced/rglass, /obj/item/folder/blue, -/obj/item/computer_disk/medical, +/obj/item/disk/computer/medical, /obj/item/stamp/head/cmo, /turf/open/floor/holofloor/dark, /area/station/command/heads_quarters/cmo) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index b9abc260dc8..638d1068b2c 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -266,13 +266,13 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items ) = 8, list(//computer disks - /obj/item/computer_disk/maintenance/scanner = 1, - /obj/item/computer_disk/maintenance/camera = 1, - /obj/item/computer_disk/maintenance/modsuit_control = 1, - /obj/item/computer_disk/maintenance/spectre_meter = 1, - /obj/item/computer_disk/maintenance/arcade = 1, + /obj/item/disk/computer/maintenance/scanner = 1, + /obj/item/disk/computer/maintenance/camera = 1, + /obj/item/disk/computer/maintenance/modsuit_control = 1, + /obj/item/disk/computer/maintenance/spectre_meter = 1, + /obj/item/disk/computer/maintenance/arcade = 1, /obj/item/disk/design_disk/liberator = 1, - /obj/item/computer_disk/maintenance/theme = 3, + /obj/item/disk/computer/maintenance/theme = 3, ) = 4, list(//modsuits diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm index 4f17ad5ae57..5f094f412d9 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm @@ -82,6 +82,11 @@ icon_file = 'icons/obj/storage/wrapping.dmi' json_config = 'code/datums/greyscale/json_configs/giftdeliverypackage1.json' +/datum/greyscale_config/giftdeliveryfloppy + name = "Gift Floppy Disk Package" + icon_file = 'icons/obj/storage/wrapping.dmi' + json_config = 'code/datums/greyscale/json_configs/giftdeliveryfloppy.json' + /datum/greyscale_config/wrap_paper name = "Wrapping Paper" icon_file = 'icons/obj/stack_objects.dmi' diff --git a/code/datums/greyscale/json_configs/giftdeliveryfloppy.json b/code/datums/greyscale/json_configs/giftdeliveryfloppy.json new file mode 100644 index 00000000000..24b0e0892d8 --- /dev/null +++ b/code/datums/greyscale/json_configs/giftdeliveryfloppy.json @@ -0,0 +1,16 @@ +{ + "": [ + { + "type": "icon_state", + "icon_state": "giftdeliveryfloppy_base", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "giftdeliveryfloppy_ribbon", + "blend_mode": "overlay", + "color_ids": [2] + } + ] +} diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 1c6590acd64..0217298f9bc 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -215,7 +215,7 @@ /obj/item/disk/holodisk name = "holorecord disk" desc = "Stores recorder holocalls." - icon_state = "holodisk" + sticker_icon_state = "o_holo" obj_flags = UNIQUE_RENAME custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT) var/datum/holorecord/record diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index 33256f6d390..49d737ffd16 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -520,15 +520,15 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) /datum/objective_item/steal/hdd_extraction name = "the source code for Project Goon from the master R&D server mainframe" - targetitem = /obj/item/computer_disk/hdd_theft + targetitem = /obj/item/disk/computer/hdd_theft excludefromjob = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST) item_owner = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST) exists_on_map = TRUE difficulty = 4 steal_hint = "The hard drive of the master research server, found in R&D's server room." -/obj/item/computer_disk/hdd_theft/add_stealing_item_objective() - return add_item_to_steal(src, /obj/item/computer_disk/hdd_theft) +/obj/item/disk/computer/hdd_theft/add_stealing_item_objective() + return add_item_to_steal(src, /obj/item/disk/computer/hdd_theft) /datum/objective_item/steal/hdd_extraction/New() special_equipment += /obj/item/paper/guides/antag/hdd_extraction diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 1ad319486c8..a3e92e9463d 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -159,56 +159,18 @@ SIGNAL_HANDLER set_linked_console(null) -// Disk skins -/datum/atom_skin/dna_disk - abstract_type = /datum/atom_skin/dna_disk - -/datum/atom_skin/dna_disk/red - preview_name = "Red" - new_icon_state = "datadisk0" - -/datum/atom_skin/dna_disk/dark_blue - preview_name = "Dark Blue" - new_icon_state = "datadisk1" - -/datum/atom_skin/dna_disk/yellow - preview_name = "Yellow" - new_icon_state = "datadisk2" - -/datum/atom_skin/dna_disk/black - preview_name = "Black" - new_icon_state = "datadisk3" - -/datum/atom_skin/dna_disk/green - preview_name = "Green" - new_icon_state = "datadisk4" - -/datum/atom_skin/dna_disk/purple - preview_name = "Purple" - new_icon_state = "datadisk5" - -/datum/atom_skin/dna_disk/grey - preview_name = "Grey" - new_icon_state = "datadisk6" - -/datum/atom_skin/dna_disk/light_blue - preview_name = "Light Blue" - new_icon_state = "datadisk7" - //Just for transferring between genetics machines. /obj/item/disk/data - name = "DNA data disk" + name = "\improper DNA data disk" icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk. var/list/genetic_makeup_buffer = list() var/list/mutations = list() var/max_mutations = 6 - var/read_only = FALSE //Well,it's still a floppy disk /obj/item/disk/data/Initialize(mapload) . = ..() - AddComponent(/datum/component/reskinable_item, /datum/atom_skin/dna_disk, infinite = TRUE) icon_state = "datadisk[rand(0,7)]" - add_overlay("datadisk_gene") + set_sticker_icon_state(pick("o_dna1", "o_dna2")) if(length(genetic_makeup_buffer)) var/datum/blood_type = genetic_makeup_buffer["blood_type"] if(blood_type) @@ -225,11 +187,3 @@ for(var/datum/mutation/mut as anything in subtypesof(/datum/mutation)) var/datum/mutation/ref = GET_INITIALIZED_MUTATION(mut) mutations += ref - -/obj/item/disk/data/attack_self(mob/user) - read_only = !read_only - to_chat(user, span_notice("You flip the write-protect tab to [read_only ? "protected" : "unprotected"].")) - -/obj/item/disk/data/examine(mob/user) - . = ..() - . += "The write-protect tab is set to [read_only ? "protected" : "unprotected"]." diff --git a/code/game/objects/effects/spawners/random/exotic.dm b/code/game/objects/effects/spawners/random/exotic.dm index cb43d6f06ae..901bb06cee7 100644 --- a/code/game/objects/effects/spawners/random/exotic.dm +++ b/code/game/objects/effects/spawners/random/exotic.dm @@ -9,7 +9,7 @@ loot = list( // Space loot spawner. Couple of random bits of technology-adjacent stuff including anomaly cores and BEPIS techs. /obj/item/raw_anomaly_core/random, /obj/item/disk/design_disk/bepis, - /obj/item/computer_disk/syndicate/camera_app, + /obj/item/disk/computer/syndicate/camera_app, ) /obj/effect/spawner/random/exotic/languagebook diff --git a/code/game/objects/items/devices/aicard_evil.dm b/code/game/objects/items/devices/aicard_evil.dm index 0c9f0c6f9c4..65860338fc9 100644 --- a/code/game/objects/items/devices/aicard_evil.dm +++ b/code/game/objects/items/devices/aicard_evil.dm @@ -87,15 +87,14 @@ qdel(src) /// Upgrade disk used to increase the range of a syndicate AI -/obj/item/computer_disk/syndie_ai_upgrade +/obj/item/disk/computer/syndie_ai_upgrade name = "AI interaction range upgrade" desc = "A NT data chip containing information that a syndiCard AI can utilize to improve its wireless interfacing abilities. Simply slap it on top of an intelliCard, MODsuit, or AI core and watch it do its work! It's rumoured that there's something 'pretty awful' in it." - icon = 'icons/obj/antags/syndicate_tools.dmi' - icon_state = "something_awful" max_capacity = 1000 w_class = WEIGHT_CLASS_NORMAL + sticker_icon_state = "o_syndicate" -/obj/item/computer_disk/syndie_ai_upgrade/pre_attack(atom/target, mob/living/user, list/modifiers, list/attack_modifiers) +/obj/item/disk/computer/syndie_ai_upgrade/pre_attack(atom/target, mob/living/user, list/modifiers, list/attack_modifiers) var/mob/living/silicon/ai/AI if(isAI(target)) AI = target diff --git a/code/game/objects/items/floppy_disk.dm b/code/game/objects/items/floppy_disk.dm new file mode 100644 index 00000000000..027cfa41cb5 --- /dev/null +++ b/code/game/objects/items/floppy_disk.dm @@ -0,0 +1,370 @@ +#define MAX_DISK_STACK_SIZE 10 +#define STACK_PIXEL_STEP 2 +#define MAX_TEXT_LENGTH 30 +#define STARTING_STICKER "o_empty" + +/datum/atom_skin/floppy_disk + abstract_type = /datum/atom_skin/floppy_disk + +/datum/atom_skin/floppy_disk/red + preview_name = "Red" + new_icon_state = "datadisk0" + +/datum/atom_skin/floppy_disk/dark_blue + preview_name = "Dark Blue" + new_icon_state = "datadisk1" + +/datum/atom_skin/floppy_disk/yellow + preview_name = "Yellow" + new_icon_state = "datadisk2" + +/datum/atom_skin/floppy_disk/black + preview_name = "Black" + new_icon_state = "datadisk3" + +/datum/atom_skin/floppy_disk/green + preview_name = "Green" + new_icon_state = "datadisk4" + +/datum/atom_skin/floppy_disk/purple + preview_name = "Purple" + new_icon_state = "datadisk5" + +/datum/atom_skin/floppy_disk/grey + preview_name = "Grey" + new_icon_state = "datadisk6" + +/datum/atom_skin/floppy_disk/light_blue + preview_name = "Light Blue" + new_icon_state = "datadisk7" + +/obj/item/disk + name = "floppy disk" + desc = "A generic floppy disk. No way Nanotrasen still uses those, right?" + icon = 'icons/obj/devices/floppy_disks.dmi' + icon_state = "datadisk3" + w_class = WEIGHT_CLASS_TINY + inhand_icon_state = "card-id" + lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' + drop_sound = 'sound/items/handling/disk_drop.ogg' + pickup_sound = 'sound/items/handling/disk_pickup.ogg' + + /// Sticker icons to choose from (as icon states) + var/static/list/sticker_variants = list( + "One" = "o_one", + "Two" = "o_two", + "Three" = "o_three", + "Four" = "o_four", + "Five" = "o_five", + "Six" = "o_six", + "Seven" = "o_seven", + "Eight" = "o_eight", + "Nine" = "o_nine", + "Zero" = "o_zero", + "A" = "o_A", + "B" = "o_B", + "C" = "o_C", + "D" = "o_D", + "E" = "o_E", + "F" = "o_F", + "Code" = "o_code", + "DNA — Green" = "o_dna1", + "DNA — Red" = "o_dna2", + "Medical" = "o_medical", + "Holographic" = "o_holo", + ) + + /// Toggles the readonly state + var/read_only = FALSE + /// If readonly state can be toggled on and off + var/read_only_locked = FALSE + /// The current sticker icon state to display + var/sticker_icon_state = STARTING_STICKER + /// Custom description + var/custom_description + /// Whether this disk can be reskinned + var/reskin_allowed = TRUE + +/obj/item/disk/Initialize(mapload) + . = ..() + if(reskin_allowed) + AddComponent(/datum/component/reskinable_item, /datum/atom_skin/floppy_disk, infinite = FALSE) + update_appearance(UPDATE_OVERLAYS) + +/obj/item/disk/update_overlays() + . = ..() + if(sticker_icon_state) + . += sticker_icon_state + +/obj/item/disk/examine(mob/user) + . = ..() + . += span_notice("The write-protect tab is set to [span_bold("[read_only ? "protected" : "unprotected"]")].") + + if(custom_description) + . += span_notice("There's something scribbled on the sticker:") + . += span_notice(span_italics("\"[custom_description]\"")) + +/obj/item/disk/tool_act(mob/living/user, obj/item/tool, list/modifiers) + if(istype(tool, /obj/item/pen)) + if(sticker_icon_state != STARTING_STICKER) + to_chat(user, span_warning("You can't add anything else!")) + return ITEM_INTERACT_FAILURE + + var/newdescription = sanitize_text(tgui_input_text(user, "What do you want to write?", "Floppy Disk", max_length = MAX_TEXT_LENGTH, multiline = TRUE)) + if(!newdescription) + return ITEM_INTERACT_FAILURE + + if(!can_interact(user)) + return ITEM_INTERACT_FAILURE + + playsound(src, SFX_WRITING_PEN, 30) + to_chat(user, span_notice("You sign the [src].")) + + custom_description = newdescription + set_sticker_icon_state(pick("o_text1", "o_text2", "o_text3")) + return ITEM_INTERACT_SUCCESS + + . = ..() + +/obj/item/disk/attack_self(mob/user) + if(read_only_locked) + to_chat(user, span_warning("The write-protect tab seems to be stuck in place!")) + return + read_only = !read_only + to_chat(user, span_notice("You flip the write-protect tab to [span_bold("[read_only ? "protected" : "unprotected"]")].")) + +/obj/item/disk/click_alt(mob/user) + if(sticker_icon_state != STARTING_STICKER) + return CLICK_ACTION_BLOCKING + + if(!LAZYLEN(sticker_variants)) + return CLICK_ACTION_BLOCKING + + var/list/items = list() + for(var/variant_name in sticker_variants) + var/icon_state_name = sticker_variants[variant_name] + var/image/item_image = image(icon = icon, icon_state = icon_state) + + var/image/overlay_preview = image(icon = icon, icon_state = icon_state_name) + item_image.overlays += overlay_preview + items += list("[variant_name]" = item_image) + + var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_sticker_menu), user), radius = 38, require_near = TRUE) + if(!pick) + return CLICK_ACTION_BLOCKING + if(!sticker_variants[pick]) + return CLICK_ACTION_BLOCKING + + set_sticker_icon_state(sticker_variants[pick]) + to_chat(user, span_notice("You change the sticker on [src] to '[pick]'.")) + return CLICK_ACTION_SUCCESS + +/// Can we select a new sticker? +/obj/item/disk/proc/check_sticker_menu(mob/user) + if(QDELETED(src)) + return FALSE + if(sticker_icon_state != STARTING_STICKER) + return FALSE + if(!istype(user)) + return FALSE + if(user.incapacitated) + return FALSE + return TRUE + +/// Sets the sticker icon state and updates the appearance +/obj/item/disk/proc/set_sticker_icon_state(new_icon_state) + sticker_icon_state = new_icon_state + update_appearance(UPDATE_OVERLAYS) + +/obj/item/disk/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(istype(tool, /obj/item/disk_stack)) + var/obj/item/disk_stack/held_stack = tool + var/obj/item/disk_stack/new_stack = new(get_turf(src)) + var/should_put_in_hand = user.is_holding(src) + + new_stack.add_to_stack(user, src) + new_stack.merge_stacks(user, held_stack) + + if(should_put_in_hand) + user.put_in_hands(new_stack) + return ITEM_INTERACT_SUCCESS + + if(istype(tool, /obj/item/disk)) + var/obj/item/disk_stack/new_stack = new(get_turf(src)) + new_stack.pixel_x = pixel_x + new_stack.pixel_y = pixel_y + + var/should_put_in_hand = user.is_holding(src) && user.is_holding(tool) + new_stack.add_to_stack(user, src) + new_stack.add_to_stack(user, tool) + new_stack.update_appearance(UPDATE_OVERLAYS) + if(should_put_in_hand) + user.put_in_hands(new_stack) + return ITEM_INTERACT_SUCCESS + +/obj/item/disk_stack + name = "stack of floppy disks" + desc = "A stack of floppy disks. You wonder what happens if you pull out the bottom one..." + icon = null + icon_state = null + w_class = WEIGHT_CLASS_SMALL + inhand_icon_state = "card-id" + lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' + drop_sound = 'sound/items/handling/disk_drop.ogg' + pickup_sound = 'sound/items/handling/disk_pickup.ogg' + /// List of references to the disks inside the stack + var/list/stacked_disks = list() + +/obj/item/disk_stack/Initialize(mapload) + . = ..() + RegisterSignal(src, COMSIG_MOVABLE_THROW_LANDED, PROC_REF(spread)) + RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exited)) + +/obj/item/disk_stack/Destroy() + stacked_disks.Cut() + return ..() + +/obj/item/disk_stack/examine(mob/user) + . = ..() + . += span_notice("There are [span_bold("[length(stacked_disks)]")] disks in the stack.") + +/obj/item/disk_stack/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(istype(tool, /obj/item/disk_stack)) + return merge_stacks(user, tool) + + if(istype(tool, /obj/item/disk)) + return add_to_stack(user, tool) + +/obj/item/disk_stack/proc/add_to_stack(mob/living/user, obj/item/disk/newdisk) + if(length(stacked_disks) >= MAX_DISK_STACK_SIZE) + balloon_alert(user, "can't add more!") + return ITEM_INTERACT_BLOCKING + + newdisk.forceMove(src) + stacked_disks += newdisk + balloon_alert(user, "added to top") + update_appearance(UPDATE_OVERLAYS) + return ITEM_INTERACT_SUCCESS + +/obj/item/disk_stack/update_overlays() + . = ..() + var/iteration_count = 1 + for(var/obj/item/disk/disk_in_stack in stacked_disks) + var/mutable_appearance/stacked_disk_appearance = mutable_appearance(disk_in_stack.icon, disk_in_stack.icon_state, disk_in_stack.layer + (0.1 * iteration_count)) + stacked_disk_appearance.pixel_z += iteration_count * STACK_PIXEL_STEP + + if(LAZYLEN(disk_in_stack.overlays)) + stacked_disk_appearance.overlays = disk_in_stack.overlays.Copy() + . += stacked_disk_appearance + iteration_count++ + +/obj/item/disk_stack/proc/pop_top_disk(mob/living/user) + if(!length(stacked_disks)) + return FALSE + + var/obj/item/disk/top = stacked_disks[length(stacked_disks)] + user.put_in_hands(top) + balloon_alert(user, "removed top disk") + + if(length(stacked_disks) == 1) + var/obj/item/disk/last_disk = stacked_disks[1] + var/was_in_hand = user.is_holding(src) + if(was_in_hand) + last_disk.forceMove(user) + user.put_in_hands(last_disk) + else + var/turf/T = get_turf(src) + last_disk.forceMove(T) + last_disk.pixel_x = pixel_x + last_disk.pixel_y = pixel_y + + QDEL_IN(src, 0) + return TRUE + + update_appearance(UPDATE_OVERLAYS) + return TRUE + +/obj/item/disk_stack/proc/merge_stacks(mob/user, obj/item/disk_stack/diskstack) + var/amount_counter = 0 + var/list/moved_disks = list() + + for(var/obj/item/disk/each_disk as anything in diskstack.stacked_disks) + if(length(stacked_disks) >= MAX_DISK_STACK_SIZE) + break + + each_disk.forceMove(src) + stacked_disks += each_disk + moved_disks += each_disk + amount_counter += 1 + + diskstack.stacked_disks -= moved_disks + diskstack.update_appearance(UPDATE_OVERLAYS) + + if(!amount_counter) + balloon_alert(user, "no space!") + return ITEM_INTERACT_BLOCKING + + update_appearance(UPDATE_OVERLAYS) + to_chat(user, span_notice("You merge two stacks of disks together.")) + + if(!length(diskstack.stacked_disks)) + QDEL_IN(diskstack, 0) + + return ITEM_INTERACT_SUCCESS + +/obj/item/disk_stack/proc/spread() + SIGNAL_HANDLER + + if(!length(stacked_disks)) + return + + var/turf/landing = get_turf(src) + for(var/obj/item/disk/each_disk as anything in stacked_disks) + each_disk.forceMove(landing) + each_disk.throw_at(get_step(src, pick(NORTH, NORTHEAST, EAST, SOUTHEAST, SOUTH, SOUTHWEST, WEST, NORTHWEST)), 1, 0.8) + + visible_message(span_warning("The stack falls apart!")) + update_appearance(UPDATE_OVERLAYS) + throw_at(get_step(src, pick(NORTH, NORTHEAST, EAST, SOUTHEAST, SOUTH, SOUTHWEST, WEST, NORTHWEST)), 1, 0.8) + +/obj/item/disk_stack/attack_hand_secondary(mob/user, list/modifiers) + if(pop_top_disk(user)) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + + . = ..() + +/// Handle disks leaving the stack through other means +/obj/item/disk_stack/proc/on_exited(datum/source, atom/movable/gone, direction) + SIGNAL_HANDLER + + if(!istype(gone, /obj/item/disk)) + return + + stacked_disks -= gone + update_appearance(UPDATE_OVERLAYS) + + if(!length(stacked_disks)) + QDEL_IN(src, 0) + +/obj/item/disk/can_be_package_wrapped() + return TRUE + +/obj/item/disk_stack/can_be_package_wrapped() + return FALSE + +/obj/item/delivery/small/floppy + name = "flat parcel" + desc = "A flat paper parcel." + icon_state = "deliveryfloppy" + base_icon_state = "deliveryfloppy" + +/obj/item/delivery/small/floppy/Initialize(mapload) + . = ..() + new /obj/item/disk/data(src) + +#undef STARTING_STICKER +#undef MAX_DISK_STACK_SIZE +#undef STACK_PIXEL_STEP +#undef MAX_TEXT_LENGTH diff --git a/code/game/objects/items/rcd/RHD.dm b/code/game/objects/items/rcd/RHD.dm index ccd2b9f5063..2b08fc42b72 100644 --- a/code/game/objects/items/rcd/RHD.dm +++ b/code/game/objects/items/rcd/RHD.dm @@ -296,7 +296,7 @@ /obj/item/rcd_upgrade name = "RCD advanced design disk" desc = "It seems to be empty." - icon = 'icons/obj/devices/circuitry_n_data.dmi' + icon = 'icons/obj/devices/floppy_disks.dmi' icon_state = "datadisk3" var/upgrade diff --git a/code/game/objects/items/rcd/RPD.dm b/code/game/objects/items/rcd/RPD.dm index e5ff17bccca..11f1a1fc2c3 100644 --- a/code/game/objects/items/rcd/RPD.dm +++ b/code/game/objects/items/rcd/RPD.dm @@ -598,7 +598,7 @@ /obj/item/rpd_upgrade name = "RPD advanced design disk" desc = "It seems to be empty." - icon = 'icons/obj/devices/circuitry_n_data.dmi' + icon = 'icons/obj/devices/floppy_disks.dmi' icon_state = "datadisk3" /// Bitflags for upgrades var/upgrade_flags diff --git a/code/game/objects/items/robot/ai_upgrades.dm b/code/game/objects/items/robot/ai_upgrades.dm index 9d7e6c41d58..80e97acab18 100644 --- a/code/game/objects/items/robot/ai_upgrades.dm +++ b/code/game/objects/items/robot/ai_upgrades.dm @@ -2,7 +2,7 @@ /obj/item/aiupgrade name = "ai upgrade disk" desc = "You really shouldn't be seeing this" - icon = 'icons/obj/devices/circuitry_n_data.dmi' + icon = 'icons/obj/devices/floppy_disks.dmi' icon_state = "datadisk3" ///The upgrade that will be applied to the AI when installed var/datum/ai_module/to_gift = /datum/ai_module @@ -44,7 +44,7 @@ /obj/item/malf_upgrade name = "combat software upgrade" desc = "A highly illegal, highly dangerous upgrade for artificial intelligence units, granting them a variety of powers as well as the ability to hack APCs.
This upgrade does not override any active laws, and must be applied directly to an active AI core." - icon = 'icons/obj/devices/circuitry_n_data.dmi' + icon = 'icons/obj/devices/floppy_disks.dmi' icon_state = "datadisk3" /obj/item/malf_upgrade/Initialize(mapload) diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index 0c445cc2986..432e040940b 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -149,10 +149,14 @@ user.put_in_hands(parcel) item.forceMove(parcel) var/size = round(item.w_class) - parcel.name = "[weight_class_to_text(size)] parcel" + if(istype(item, /obj/item/disk)) + parcel.base_icon_state = "deliveryfloppy" + parcel.name = "floppy disk parcel" + else + parcel.base_icon_state = "deliverypackage[size]" + parcel.name = "[weight_class_to_text(size)] parcel" parcel.update_weight_class(size) size = min(size, 5) - parcel.base_icon_state = "deliverypackage[size]" parcel.update_icon() else return ITEM_INTERACT_BLOCKING diff --git a/code/game/objects/items/storage/boxes/science_boxes.dm b/code/game/objects/items/storage/boxes/science_boxes.dm index 11eebd8699c..c182c5c8a30 100644 --- a/code/game/objects/items/storage/boxes/science_boxes.dm +++ b/code/game/objects/items/storage/boxes/science_boxes.dm @@ -25,12 +25,13 @@ //Disk boxes /obj/item/storage/box/disks - name = "diskette box" + name = "floppy disk box" illustration = "disk_kit" + desc = "A set of 8 Nanotrasen-approved floppy disks in individual packaging." /obj/item/storage/box/disks/PopulateContents() - for(var/i in 1 to 7) - new /obj/item/disk/data(src) + for(var/i in 1 to 8) + new /obj/item/delivery/small/floppy(src) /obj/item/storage/box/monkeycubes name = "monkey cube box" diff --git a/code/game/objects/items/storage/boxes/security_boxes.dm b/code/game/objects/items/storage/boxes/security_boxes.dm index 230ad5eea22..d5df26d2bac 100644 --- a/code/game/objects/items/storage/boxes/security_boxes.dm +++ b/code/game/objects/items/storage/boxes/security_boxes.dm @@ -93,7 +93,7 @@ /obj/item/storage/box/seccarts/PopulateContents() for(var/i in 1 to 6) - new /obj/item/computer_disk/security(src) + new /obj/item/disk/computer/security(src) /obj/item/storage/box/firingpins name = "box of standard firing pins" diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 1e8a9acbba8..c42e33b9a68 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -57,7 +57,7 @@ new /obj/item/clothing/under/chameleon(src) // 2 tc since it's not the full set new /obj/item/clothing/mask/chameleon(src) // Goes with above new /obj/item/clothing/shoes/chameleon/noslip(src) // 2 tc - new /obj/item/computer_disk/syndicate/camera_app(src) // 1 tc + new /obj/item/disk/computer/syndicate/camera_app(src) // 1 tc new /obj/item/multitool/ai_detect(src) // 1 tc new /obj/item/encryptionkey/syndicate(src) // 2 tc new /obj/item/storage/box/syndie_kit/mulligan(src) // 4 tc @@ -122,7 +122,7 @@ new /obj/item/ai_module/toy_ai(src) // ~6 tc new /obj/item/multitool/ai_detect(src) // 1 tc new /obj/item/storage/toolbox/syndicate(src) // 1 tc - new /obj/item/computer_disk/syndicate/camera_app(src) // 1 tc + new /obj/item/disk/computer/syndicate/camera_app(src) // 1 tc new /obj/item/clothing/glasses/thermal/syndi(src) // 4 tc new /obj/item/card/id/advanced/chameleon/elite(src) // 2 tc @@ -143,9 +143,9 @@ if(KIT_SABOTAGE) new /obj/item/storage/backpack/duffelbag/syndie/sabotage(src) // 5 tc for 3 c4 and 2 x4 - new /obj/item/computer_disk/syndicate/camera_app(src) // 1 tc + new /obj/item/disk/computer/syndicate/camera_app(src) // 1 tc new /obj/item/sbeacondrop/powersink(src) // 11 tc - new /obj/item/computer_disk/virus/detomatix(src) // 6 tc + new /obj/item/disk/computer/virus/detomatix(src) // 6 tc new /obj/item/storage/toolbox/syndicate(src) // 1 tc new /obj/item/pizzabox/bomb(src) // 6 tc new /obj/item/storage/box/syndie_kit/emp(src) // 2 tc diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index c13d621036d..b8dce57e7c3 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -128,14 +128,13 @@ Succeed and you will receive a coveted green highlight on your record for this assignment. Fail us and red's the last colour you'll ever see.
\ Do not disappoint us.
" -/obj/item/computer_disk/hdd_theft +/obj/item/disk/computer/hdd_theft name = "r&d server hard disk drive" desc = "For some reason, people really seem to want to steal this. The source code on this drive is probably used for something awful!" - icon = 'icons/obj/antags/syndicate_tools.dmi' - icon_state = "something_awful" max_capacity = 512 w_class = WEIGHT_CLASS_NORMAL resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + sticker_icon_state = "o_nt" // STEALING SUPERMATTER diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index e448c3d553d..0e3be1e463a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -7,7 +7,7 @@ ..() new /obj/item/storage/bag/garment/engineering_chief (src) - new /obj/item/computer_disk/command/ce(src) + new /obj/item/disk/computer/command/ce(src) new /obj/item/radio/headset/heads/ce(src) new /obj/item/megaphone/command(src) new /obj/item/holosign_creator/atmos(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 849c7f74e8e..0b4e5600dbb 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -80,7 +80,7 @@ new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/cmo(src) new /obj/item/storage/bag/garment/chief_medical(src) - new /obj/item/computer_disk/command/cmo(src) + new /obj/item/disk/computer/command/cmo(src) new /obj/item/radio/headset/heads/cmo(src) new /obj/item/megaphone/command(src) new /obj/item/assembly/flash/handheld(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 7531b8bacfd..7df190f2f6c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -9,7 +9,7 @@ new /obj/item/clothing/suit/bio_suit/scientist(src) new /obj/item/clothing/head/bio_hood/scientist(src) new /obj/item/storage/bag/garment/research_director(src) - new /obj/item/computer_disk/command/rd(src) + new /obj/item/disk/computer/command/rd(src) new /obj/item/radio/headset/heads/rd(src) new /obj/item/megaphone/command(src) new /obj/item/storage/lockbox/medal/sci(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index d1fef8c52da..a43f435c4c9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -8,7 +8,7 @@ new /obj/item/clothing/neck/petcollar(src) new /obj/item/pet_carrier(src) new /obj/item/storage/bag/garment/captain(src) - new /obj/item/computer_disk/command/captain(src) + new /obj/item/disk/computer/command/captain(src) new /obj/item/radio/headset/heads/captain/alt(src) new /obj/item/radio/headset/heads/captain(src) new /obj/item/door_remote/captain(src) @@ -29,7 +29,7 @@ new /obj/item/dog_bone(src) new /obj/item/storage/bag/garment/hop(src) new /obj/item/storage/lockbox/medal/service(src) - new /obj/item/computer_disk/command/hop(src) + new /obj/item/disk/computer/command/hop(src) new /obj/item/radio/headset/heads/hop(src) new /obj/item/storage/box/ids(src) new /obj/item/storage/box/silver_ids(src) @@ -53,7 +53,7 @@ /obj/structure/closet/secure_closet/hos/PopulateContents() ..() - new /obj/item/computer_disk/command/hos(src) + new /obj/item/disk/computer/command/hos(src) new /obj/item/radio/headset/heads/hos(src) new /obj/item/radio/headset/heads/hos/alt(src) new /obj/item/storage/bag/garment/hos(src) diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm index 0f7dc33bc6f..24314af0b46 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm @@ -1,21 +1,15 @@ -/obj/item/disk - icon = 'icons/obj/devices/circuitry_n_data.dmi' - w_class = WEIGHT_CLASS_TINY - inhand_icon_state = "card-id" - lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' - icon_state = "datadisk0" - drop_sound = 'sound/items/handling/disk_drop.ogg' - pickup_sound = 'sound/items/handling/disk_pickup.ogg' - // DAT FUKKEN DISK. /obj/item/disk/nuclear name = "nuclear authentication disk" desc = "Better keep this safe." icon_state = "nucleardisk" max_integrity = 250 + sticker_icon_state = null armor_type = /datum/armor/disk_nuclear resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + read_only = TRUE + read_only_locked = TRUE + reskin_allowed = FALSE /// Whether we're a real nuke disk or not. var/fake = FALSE diff --git a/code/modules/bitrunning/objects/debug.dm b/code/modules/bitrunning/objects/debug.dm index 84f77e3a18c..770aecd21c3 100644 --- a/code/modules/bitrunning/objects/debug.dm +++ b/code/modules/bitrunning/objects/debug.dm @@ -1,7 +1,7 @@ /obj/item/bitrunning_debug name = "bitrunning debug item" desc = "Adds points and reduces cooldown time for debugging" - icon = 'icons/obj/devices/circuitry_n_data.dmi' + icon = 'icons/obj/devices/floppy_disks.dmi' base_icon_state = "datadisk" icon_state = "datadisk0" diff --git a/code/modules/bitrunning/objects/disks.dm b/code/modules/bitrunning/objects/disks.dm index f91aeaab043..3b1cd5de782 100644 --- a/code/modules/bitrunning/objects/disks.dm +++ b/code/modules/bitrunning/objects/disks.dm @@ -4,16 +4,17 @@ * You can make the custom cheese spells you've always wanted. * Just make it fun and engaging, it's PvE content. */ -/obj/item/bitrunning_disk +/obj/item/disk/bitrunning name = "generic bitrunning program" desc = "A disk containing source code." - icon = 'icons/obj/devices/circuitry_n_data.dmi' base_icon_state = "datadisk" icon_state = "datadisk0" + sticker_icon_state = "o_code" + reskin_allowed = FALSE /// Name of the choice made var/choice_made -/obj/item/bitrunning_disk/Initialize(mapload) +/obj/item/disk/bitrunning/Initialize(mapload) . = ..() icon_state = "[base_icon_state][rand(0, 7)]" @@ -23,7 +24,7 @@ load_callback = CALLBACK(src, PROC_REF(load_onto_avatar)), \ ) -/obj/item/bitrunning_disk/examine(mob/user) +/obj/item/disk/bitrunning/examine(mob/user) . = ..() . += span_infoplain("This disk must be carried on your person into a netpod to be used.") @@ -35,18 +36,17 @@ . += span_notice("It cannot make another selection.") /// Handles loading our stuff onto avatars -/obj/item/bitrunning_disk/proc/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags) +/obj/item/disk/bitrunning/proc/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags) return NONE - -/obj/item/bitrunning_disk/ability +/obj/item/disk/bitrunning/ability desc = "A disk containing source code. It can be used to preload abilities into the virtual domain. Duplicate abilities will be ignored." /// The selected ability that this grants var/datum/action/granted_action /// The list of actions that this can grant var/list/datum/action/selectable_actions = list() -/obj/item/bitrunning_disk/ability/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags) +/obj/item/disk/bitrunning/ability/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags) if(domain_flags & DOMAIN_FORBIDS_ABILITIES) return BITRUNNER_GEAR_LOAD_BLOCKED @@ -60,8 +60,8 @@ our_action.Grant(avatar) return NONE -/obj/item/bitrunning_disk/ability/attack_self(mob/user, modifiers) - . = ..() +/obj/item/disk/bitrunning/ability/attack_self(mob/user, modifiers) + // Not calling parent to not flip the protection tab if(choice_made) return @@ -86,7 +86,7 @@ choice_made = choice /// Tier 1 programs. Simple, funny, or helpful. -/obj/item/bitrunning_disk/ability/tier1 +/obj/item/disk/bitrunning/ability/tier1 name = "bitrunning program: basic" selectable_actions = list( /datum/action/cooldown/spell/conjure/cheese, @@ -94,7 +94,7 @@ ) /// Tier 2 programs. More complex, powerful, or useful. -/obj/item/bitrunning_disk/ability/tier2 +/obj/item/disk/bitrunning/ability/tier2 name = "bitrunning program: complex" selectable_actions = list( /datum/action/cooldown/spell/pointed/projectile/fireball, @@ -103,7 +103,7 @@ ) /// Tier 3 abilities. Very powerful, game breaking. -/obj/item/bitrunning_disk/ability/tier3 +/obj/item/disk/bitrunning/ability/tier3 name = "bitrunning program: elite" selectable_actions = list( /datum/action/cooldown/spell/shapeshift/dragon, @@ -111,14 +111,14 @@ ) -/obj/item/bitrunning_disk/item +/obj/item/disk/bitrunning/item desc = "A disk containing source code. It can be used to preload items into the virtual domain." /// The selected item that this grants var/obj/granted_item /// The list of actions that this can grant var/list/obj/selectable_items = list() -/obj/item/bitrunning_disk/item/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags) +/obj/item/disk/bitrunning/item/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags) if(domain_flags & DOMAIN_FORBIDS_ITEMS) return BITRUNNER_GEAR_LOAD_BLOCKED @@ -128,7 +128,7 @@ avatar.put_in_hands(new granted_item()) return NONE -/obj/item/bitrunning_disk/item/attack_self(mob/user, modifiers) +/obj/item/disk/bitrunning/item/attack_self(mob/user, modifiers) . = ..() if(choice_made) @@ -151,7 +151,7 @@ choice_made = choice /// Tier 1 items. Simple, funny, or helpful. -/obj/item/bitrunning_disk/item/tier1 +/obj/item/disk/bitrunning/item/tier1 name = "bitrunning gear: simple" selectable_items = list( /obj/item/pizzabox/infinite, @@ -160,7 +160,7 @@ ) /// Tier 2 items. More complex, powerful, or useful. -/obj/item/bitrunning_disk/item/tier2 +/obj/item/disk/bitrunning/item/tier2 name = "bitrunning gear: complex" selectable_items = list( /obj/item/reagent_containers/hypospray/medipen/survival/luxury, @@ -169,7 +169,7 @@ ) /// Tier 3 items. Very powerful, game breaking. -/obj/item/bitrunning_disk/item/tier3 +/obj/item/disk/bitrunning/item/tier3 name = "bitrunning gear: advanced" selectable_items = list( /obj/item/gun/energy/e_gun/nuclear, @@ -178,7 +178,7 @@ ) ///proto-kinetic accelerator mods, to be applied to pka's given inside domains -/obj/item/bitrunning_disk/item/pka_mods +/obj/item/disk/bitrunning/item/pka_mods name = "bitrunning gear: proto-kinetic accelerator mods" selectable_items = list( /obj/item/borg/upgrade/modkit/range, @@ -188,7 +188,7 @@ /obj/item/borg/upgrade/modkit/human_passthrough, ) -/obj/item/bitrunning_disk/item/pka_mods/premium +/obj/item/disk/bitrunning/item/pka_mods/premium name = "bitrunning gear: premium proto-kinetic accelerator mods" selectable_items = list( /obj/item/borg/upgrade/modkit/cooldown/repeater, @@ -199,7 +199,7 @@ ) ///proto-kinetic crusher trophies, to be applied to pkc's given inside domains -/obj/item/bitrunning_disk/item/pkc_mods +/obj/item/disk/bitrunning/item/pkc_mods name = "bitrunning gear: proto-kinetic crusher mods" selectable_items = list( /obj/item/crusher_trophy/watcher_wing, @@ -208,7 +208,7 @@ /obj/item/crusher_trophy/wolf_ear, ) -/obj/item/bitrunning_disk/item/pkc_mods/premium +/obj/item/disk/bitrunning/item/pkc_mods/premium name = "bitrunning gear: premium proto-kinetic crusher mods" selectable_items = list( /obj/item/crusher_trophy/watcher_wing/ice_wing, @@ -220,7 +220,7 @@ /obj/item/crusher_trophy/ice_demon_cube, ) -/obj/item/bitrunning_disk/item/mini_uzi +/obj/item/disk/bitrunning/item/mini_uzi name = "bitrunning gear: mini-uzi" selectable_items = list( /obj/item/gun/ballistic/automatic/mini_uzi, diff --git a/code/modules/bitrunning/objects/gimmick_disks/_gimmick_disk.dm b/code/modules/bitrunning/objects/gimmick_disks/_gimmick_disk.dm index 24702d1254a..3b22db05089 100644 --- a/code/modules/bitrunning/objects/gimmick_disks/_gimmick_disk.dm +++ b/code/modules/bitrunning/objects/gimmick_disks/_gimmick_disk.dm @@ -2,23 +2,23 @@ /** * Bitrunning tech disks which let you load full loadouts into the vdom on first avatar generation. */ -/obj/item/bitrunning_disk/gimmick +/obj/item/disk/bitrunning/gimmick desc = "A disk containing source code. It can be used to preload gimmick loadouts into the virtual domain." /// The selected loadout that this grants var/datum/bitrunning_gimmick/granted_loadout /// The list of loadouts that this can grant var/list/datum/bitrunning_gimmick/selectable_loadouts -/obj/item/bitrunning_disk/gimmick/Destroy() +/obj/item/disk/bitrunning/gimmick/Destroy() QDEL_NULL(granted_loadout) return ..() -/obj/item/bitrunning_disk/gimmick/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags) +/obj/item/disk/bitrunning/gimmick/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags) if(isnull(granted_loadout)) return BITRUNNER_GEAR_LOAD_FAILED return granted_loadout.grant_loadout(neo, avatar, domain_flags) -/obj/item/bitrunning_disk/gimmick/attack_self(mob/user, modifiers) +/obj/item/disk/bitrunning/gimmick/attack_self(mob/user, modifiers) . = ..() if(granted_loadout) diff --git a/code/modules/bitrunning/objects/gimmick_disks/dungeon_disk.dm b/code/modules/bitrunning/objects/gimmick_disks/dungeon_disk.dm index 3cf85bb2c66..b0968de86dd 100644 --- a/code/modules/bitrunning/objects/gimmick_disks/dungeon_disk.dm +++ b/code/modules/bitrunning/objects/gimmick_disks/dungeon_disk.dm @@ -3,7 +3,7 @@ * Bitrunning gimmick loadouts themed around dungeon crawling. * Mostly for fun, have niche but not insignificant advantages. */ -/obj/item/bitrunning_disk/gimmick/dungeon +/obj/item/disk/bitrunning/gimmick/dungeon name = "bitrunning gimmick: dungeon crawling" selectable_loadouts = list( /datum/bitrunning_gimmick/alchemist, diff --git a/code/modules/bitrunning/objects/gimmick_disks/sports_disk.dm b/code/modules/bitrunning/objects/gimmick_disks/sports_disk.dm index 7024a9a4065..97e7cd1934e 100644 --- a/code/modules/bitrunning/objects/gimmick_disks/sports_disk.dm +++ b/code/modules/bitrunning/objects/gimmick_disks/sports_disk.dm @@ -3,7 +3,7 @@ * Bitrunning gimmick loadouts themed around sports. * Mostly for fun, have niche or little advantages. */ -/obj/item/bitrunning_disk/gimmick/sports +/obj/item/disk/bitrunning/gimmick/sports name = "bitrunning gimmick: sports" selectable_loadouts = list( /datum/bitrunning_gimmick/boxer, diff --git a/code/modules/bitrunning/orders/tech.dm b/code/modules/bitrunning/orders/tech.dm index d14cf7bf1a1..1844a38949b 100644 --- a/code/modules/bitrunning/orders/tech.dm +++ b/code/modules/bitrunning/orders/tech.dm @@ -3,42 +3,42 @@ /datum/orderable_item/bitrunning_tech/item_tier1 cost_per_order = 750 - purchase_path = /obj/item/bitrunning_disk/item/tier1 + purchase_path = /obj/item/disk/bitrunning/item/tier1 desc = "This disk contains a program that lets you equip a medical beamgun, a C4 explosive, or a box of infinite pizza." /datum/orderable_item/bitrunning_tech/item_tier2 cost_per_order = 1250 - purchase_path = /obj/item/bitrunning_disk/item/tier2 + purchase_path = /obj/item/disk/bitrunning/item/tier2 desc = "This disk contains a program that lets you equip a luxury medipen, a pistol, or an armour vest." /datum/orderable_item/bitrunning_tech/item_tier3 cost_per_order = 2000 - purchase_path = /obj/item/bitrunning_disk/item/tier3 + purchase_path = /obj/item/disk/bitrunning/item/tier3 desc = "This disk contains a program that lets you equip an advanced energy gun, a dual bladed energy sword, or a minibomb." /datum/orderable_item/bitrunning_tech/ability_tier1 cost_per_order = 750 - purchase_path = /obj/item/bitrunning_disk/ability/tier1 + purchase_path = /obj/item/disk/bitrunning/ability/tier1 desc = "This disk contains a program that lets you cast Summon Cheese or Lesser Heal." /datum/orderable_item/bitrunning_tech/ability_tier2 cost_per_order = 1500 - purchase_path = /obj/item/bitrunning_disk/ability/tier2 + purchase_path = /obj/item/disk/bitrunning/ability/tier2 desc = "This disk contains a program that lets you cast Fireball, Lightning Bolt, or Forcewall." /datum/orderable_item/bitrunning_tech/ability_tier3 cost_per_order = 2500 - purchase_path = /obj/item/bitrunning_disk/ability/tier3 + purchase_path = /obj/item/disk/bitrunning/ability/tier3 desc = "This disk contains a program that lets you shapeshift into a lesser ashdrake, or a polar bear." /datum/orderable_item/bitrunning_tech/gimmick_sports cost_per_order = 750 - purchase_path = /obj/item/bitrunning_disk/gimmick/sports + purchase_path = /obj/item/disk/bitrunning/gimmick/sports desc = "This disk contains a program that lets you equip a sports-themed gimmick loadout." /datum/orderable_item/bitrunning_tech/gimmick_dungeon_crawling cost_per_order = 1250 - purchase_path = /obj/item/bitrunning_disk/gimmick/dungeon + purchase_path = /obj/item/disk/bitrunning/gimmick/dungeon desc = "This disk contains a program that lets you equip a dungeon crawling-themed gimmick loadout." /datum/orderable_item/bitrunning_tech/flip_skillchip @@ -46,21 +46,21 @@ cost_per_order = 1500 /datum/orderable_item/bitrunning_tech/pka_mod - purchase_path = /obj/item/bitrunning_disk/item/pka_mods + purchase_path = /obj/item/disk/bitrunning/item/pka_mods cost_per_order = 750 desc = "This disk contains a program that lets you equip modkits for the proto-kinetic accelerator. Proto-kinetic accelerator not included." /datum/orderable_item/bitrunning_tech/pka_mod/premium - purchase_path = /obj/item/bitrunning_disk/item/pka_mods/premium + purchase_path = /obj/item/disk/bitrunning/item/pka_mods/premium cost_per_order = 1600 desc = "This disk contains a program that lets you equip stronger modkits for the proto-kinetic accelerator. Proto-kinetic accelerator not included." /datum/orderable_item/bitrunning_tech/pkc_mod - purchase_path = /obj/item/bitrunning_disk/item/pkc_mods + purchase_path = /obj/item/disk/bitrunning/item/pkc_mods cost_per_order = 750 desc = "This disk contains a program that lets you equip trophies for the proto-kinetic crusher. Proto-kinetic crusher no included." /datum/orderable_item/bitrunning_tech/pkc_mod/premium - purchase_path = /obj/item/bitrunning_disk/item/pkc_mods/premium + purchase_path = /obj/item/disk/bitrunning/item/pkc_mods/premium cost_per_order = 1600 desc = "This disk contains a program that lets you equip stronger trophies for the proto-kinetic crusher. Proto-kinetic crusher not included." diff --git a/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm b/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm index 39699072057..a8bf3a6e6a2 100644 --- a/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm +++ b/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm @@ -14,7 +14,7 @@ /obj/item/clothing/shoes/sandal = 1, /obj/item/clothing/glasses/sunglasses = 1, /obj/item/gun/energy/laser/chameleon/ballistic_only = 1, - /obj/item/bitrunning_disk/item/mini_uzi = 1, + /obj/item/disk/bitrunning/item/mini_uzi = 1, ) /datum/lazy_template/virtual_domain/island_brawl/setup_domain(list/created_atoms) diff --git a/code/modules/cargo/exports/parts.dm b/code/modules/cargo/exports/parts.dm index d5d672425ba..3d4aaef65af 100644 --- a/code/modules/cargo/exports/parts.dm +++ b/code/modules/cargo/exports/parts.dm @@ -19,19 +19,19 @@ /datum/export/advanced_disk cost = CARGO_CRATE_VALUE * 0.4 unit_name = "advanced data disk" - export_types = list(/obj/item/computer_disk/advanced) + export_types = list(/obj/item/disk/computer/advanced) include_subtypes = FALSE /datum/export/super_disk cost = CARGO_CRATE_VALUE * 0.6 unit_name = "super data disk" - export_types = list(/obj/item/computer_disk/super) + export_types = list(/obj/item/disk/computer/super) include_subtypes = FALSE /datum/export/standard_disk cost = CARGO_CRATE_VALUE * 0.2 unit_name = "data disk" - export_types = list(/obj/item/computer_disk) + export_types = list(/obj/item/disk/computer) include_subtypes = TRUE /datum/export/refill_canister diff --git a/code/modules/cargo/markets/market_items/tools.dm b/code/modules/cargo/markets/market_items/tools.dm index d8acad9e0dc..61ec8452e51 100644 --- a/code/modules/cargo/markets/market_items/tools.dm +++ b/code/modules/cargo/markets/market_items/tools.dm @@ -103,7 +103,7 @@ /datum/market_item/tool/program_disk name = "Bootleg Data Disk" desc = "A data disk containing EXCLUSIVE and LIMITED modular programs. Legally, we're not allowed to tell you how we acquired them." - item = /obj/item/computer_disk/black_market + item = /obj/item/disk/computer/black_market price_min = CARGO_CRATE_VALUE * 0.75 price_max = CARGO_CRATE_VALUE * 2 stock_max = 3 diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 08a0e649a11..6ecc77d4ebf 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -794,7 +794,6 @@ /obj/item/disk/cargo/bluespace_pod //Disk that can be inserted into the Express Console to allow for Advanced Bluespace Pods name = "Bluespace Drop Pod Upgrade" desc = "This disk provides a firmware update to the Express Supply Console, granting the use of Nanotrasen's Bluespace Drop Pods to the supply department." - icon = 'icons/obj/devices/circuitry_n_data.dmi' - icon_state = "cargodisk" - inhand_icon_state = "card-id" - w_class = WEIGHT_CLASS_SMALL + icon_state = "datadisk12" + sticker_icon_state = "o_cargopod" + reskin_allowed = FALSE diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index b98b18787ca..e4af75d9025 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -206,7 +206,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real balloon_alert(user, "headlamp repaired") return ITEM_INTERACT_SUCCESS - if(istype(tool, /obj/item/computer_disk)) + if(istype(tool, /obj/item/disk/computer)) if(!modularInterface) stack_trace("Cyborg [src] ( [type] ) was somehow missing their integrated tablet. Please make a bug report.") create_modularInterface() diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index c213b351e88..4b382d6d668 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -19,7 +19,7 @@ ///The alt slot, only used by certain UIs like the access app. var/obj/item/card/id/alt_stored_id ///The disk in this PDA. If set, this will be inserted on Initialize. - var/obj/item/computer_disk/inserted_disk + var/obj/item/disk/computer/inserted_disk ///The power cell the computer uses to run on. var/obj/item/stock_parts/power_store/internal_cell = /obj/item/stock_parts/power_store/cell ///A pAI currently loaded into the modular computer. @@ -927,7 +927,7 @@ if(istype(tool, /obj/item/paper_bin)) return paper_bin_act(user, tool) - if(istype(tool, /obj/item/computer_disk)) + if(istype(tool, /obj/item/disk/computer)) return computer_disk_act(user, tool) return NONE @@ -999,7 +999,7 @@ bin.update_appearance() return ITEM_INTERACT_SUCCESS -/obj/item/modular_computer/proc/computer_disk_act(mob/user, obj/item/computer_disk/disk) +/obj/item/modular_computer/proc/computer_disk_act(mob/user, obj/item/disk/computer/disk) if(!user.transferItemToLoc(disk, src)) return ITEM_INTERACT_BLOCKING if(inserted_disk) diff --git a/code/modules/modular_computers/computers/item/computer_files.dm b/code/modules/modular_computers/computers/item/computer_files.dm index b0ae073bdd6..62f06b131ba 100644 --- a/code/modules/modular_computers/computers/item/computer_files.dm +++ b/code/modules/modular_computers/computers/item/computer_files.dm @@ -74,7 +74,7 @@ * the same filename (disregarding extension), will return it. * If a computer disk is passed instead, it will check the disk over the computer. */ -/obj/item/modular_computer/proc/find_file_by_name(filename, obj/item/computer_disk/target_disk) +/obj/item/modular_computer/proc/find_file_by_name(filename, obj/item/disk/computer/target_disk) if(!istext(filename)) return null if(isnull(target_disk)) @@ -94,7 +94,7 @@ * A file's uid is always unique to them, so this proc is sometimes preferable over find_file_by_name. * If a computer disk is passed instead, it will check the disk over the computer. */ -/obj/item/modular_computer/proc/find_file_by_uid(uid, obj/item/computer_disk/target_disk) +/obj/item/modular_computer/proc/find_file_by_uid(uid, obj/item/disk/computer/target_disk) if(!isnum(uid)) return null if(isnull(target_disk)) diff --git a/code/modules/modular_computers/computers/item/disks/computer_disk.dm b/code/modules/modular_computers/computers/item/disks/computer_disk.dm index 3161be07921..6740aefbe12 100644 --- a/code/modules/modular_computers/computers/item/disks/computer_disk.dm +++ b/code/modules/modular_computers/computers/item/disks/computer_disk.dm @@ -1,26 +1,21 @@ -/obj/item/computer_disk - name = "data disk" - desc = "Removable disk used to store data." - icon = 'icons/obj/devices/circuitry_n_data.dmi' - icon_state = "datadisk6" - w_class = WEIGHT_CLASS_TINY - ///The amount of storage space is on the disk +/obj/item/disk/computer + /// The amount of free storage space var/max_capacity = 16 - ///The amount of storage space we've got filled + /// The amount of storage space occupied var/used_capacity = 0 - ///List of stored files on this drive. DO NOT MODIFY DIRECTLY! + /// List of stored files on this drive. Do NOT directly modify; use setters instead. var/list/datum/computer_file/stored_files = list() - ///List of all programs that the disk should start with. + /// List of all programs that the disk should start with var/list/datum/computer_file/starting_programs = list() -/obj/item/computer_disk/Initialize(mapload) +/obj/item/disk/computer/Initialize(mapload) . = ..() for(var/programs in starting_programs) var/datum/computer_file/program_type = new programs add_file(program_type) -/obj/item/computer_disk/Destroy(force) +/obj/item/disk/computer/Destroy(force) . = ..() QDEL_LIST(stored_files) @@ -29,7 +24,7 @@ * * Attempts to add an already existing file to the computer disk, then adds that capacity to the used capicity. */ -/obj/item/computer_disk/proc/add_file(datum/computer_file/file) +/obj/item/disk/computer/proc/add_file(datum/computer_file/file) if((file.size + used_capacity) > max_capacity) return FALSE stored_files.Add(file) @@ -42,7 +37,7 @@ * * Removes an app from the stored_files list, then removes their size from the capacity. */ -/obj/item/computer_disk/proc/remove_file(datum/computer_file/file) +/obj/item/disk/computer/proc/remove_file(datum/computer_file/file) if(!(file in stored_files)) return FALSE stored_files.Remove(file) @@ -50,12 +45,12 @@ qdel(file) return TRUE -/obj/item/computer_disk/advanced +/obj/item/disk/computer/advanced name = "advanced data disk" icon_state = "datadisk5" max_capacity = 64 -/obj/item/computer_disk/super +/obj/item/disk/computer/super name = "super data disk" desc = "Removable disk used to store large amounts of data." icon_state = "datadisk3" diff --git a/code/modules/modular_computers/computers/item/disks/maintenance_disks.dm b/code/modules/modular_computers/computers/item/disks/maintenance_disks.dm index 0fb2ccc2eef..3aa30b94f62 100644 --- a/code/modules/modular_computers/computers/item/disks/maintenance_disks.dm +++ b/code/modules/modular_computers/computers/item/disks/maintenance_disks.dm @@ -1,30 +1,30 @@ -/obj/item/computer_disk/maintenance +/obj/item/disk/computer/maintenance name = "maintenance data disk" desc = "A data disk forgotten in the depths of maintenance, might have some useful program on it." /// Medical health analyzer app -/obj/item/computer_disk/maintenance/scanner +/obj/item/disk/computer/maintenance/scanner starting_programs = list(/datum/computer_file/program/maintenance/phys_scanner) ///Camera app, forced to always have largest image size -/obj/item/computer_disk/maintenance/camera +/obj/item/disk/computer/maintenance/camera starting_programs = list(/datum/computer_file/program/maintenance/camera) ///MODsuit UI, in your PDA! -/obj/item/computer_disk/maintenance/modsuit_control +/obj/item/disk/computer/maintenance/modsuit_control starting_programs = list(/datum/computer_file/program/maintenance/modsuit_control) ///Returns A 'spookiness' value based on the number of ghastly creature and hauntium and their distance from the PC. -/obj/item/computer_disk/maintenance/spectre_meter +/obj/item/disk/computer/maintenance/spectre_meter starting_programs = list(/datum/computer_file/program/maintenance/spectre_meter) ///A version of the arcade program with less HP/MP for the enemy and more for the player -/obj/item/computer_disk/maintenance/arcade +/obj/item/disk/computer/maintenance/arcade starting_programs = list(/datum/computer_file/program/arcade/eazy) -/obj/item/computer_disk/maintenance/theme/Initialize(mapload) +/obj/item/disk/computer/maintenance/theme/Initialize(mapload) starting_programs = list(pick(subtypesof(/datum/computer_file/program/maintenance/theme))) return ..() -/obj/item/computer_disk/maintenance/cool_sword +/obj/item/disk/computer/maintenance/cool_sword starting_programs = list(/datum/computer_file/program/maintenance/cool_sword) diff --git a/code/modules/modular_computers/computers/item/disks/role_disks.dm b/code/modules/modular_computers/computers/item/disks/role_disks.dm index 2191aaccdff..073d21f873f 100644 --- a/code/modules/modular_computers/computers/item/disks/role_disks.dm +++ b/code/modules/modular_computers/computers/item/disks/role_disks.dm @@ -1,7 +1,7 @@ /** * Command */ -/obj/item/computer_disk/command +/obj/item/disk/computer/command icon_state = "datadisk7" max_capacity = 32 ///Static list of programss ALL command tablets have. @@ -10,13 +10,13 @@ /datum/computer_file/program/status, ) -/obj/item/computer_disk/command/Initialize(mapload) +/obj/item/disk/computer/command/Initialize(mapload) . = ..() for(var/programs in command_programs) var/datum/computer_file/program/program_type = new programs add_file(program_type) -/obj/item/computer_disk/command/captain +/obj/item/disk/computer/command/captain name = "captain data disk" desc = "Removable disk used to download essential Captain tablet apps." icon_state = "datadisk10" @@ -25,21 +25,21 @@ /datum/computer_file/program/records/medical, ) -/obj/item/computer_disk/command/cmo +/obj/item/disk/computer/command/cmo name = "chief medical officer data disk" desc = "Removable disk used to download essential CMO tablet apps." starting_programs = list( /datum/computer_file/program/records/medical, ) -/obj/item/computer_disk/command/rd +/obj/item/disk/computer/command/rd name = "research director data disk" desc = "Removable disk used to download essential RD tablet apps." starting_programs = list( /datum/computer_file/program/signal_commander, ) -/obj/item/computer_disk/command/hos +/obj/item/disk/computer/command/hos name = "head of security data disk" desc = "Removable disk used to download essential HoS tablet apps." icon_state = "datadisk9" @@ -47,7 +47,7 @@ /datum/computer_file/program/records/security, ) -/obj/item/computer_disk/command/hop +/obj/item/disk/computer/command/hop name = "head of personnel data disk" desc = "Removable disk used to download essential HoP tablet apps." starting_programs = list( @@ -55,7 +55,7 @@ /datum/computer_file/program/job_management, ) -/obj/item/computer_disk/command/ce +/obj/item/disk/computer/command/ce name = "chief engineer data disk" desc = "Removable disk used to download essential CE tablet apps." starting_programs = list( @@ -67,7 +67,7 @@ /** * Security */ -/obj/item/computer_disk/security +/obj/item/disk/computer/security name = "security officer data disk" desc = "Removable disk used to download security-related tablet apps." icon_state = "datadisk9" @@ -78,7 +78,7 @@ /** * Medical */ -/obj/item/computer_disk/medical +/obj/item/disk/computer/medical name = "medical doctor data disk" desc = "Removable disk used to download medical-related tablet apps." icon_state = "datadisk7" @@ -89,10 +89,10 @@ /** * Supply */ -/obj/item/computer_disk/quartermaster +/obj/item/disk/computer/quartermaster name = "cargo data disk" desc = "Removable disk used to download cargo-related tablet apps." - icon_state = "cargodisk" + icon_state = "datadisk12" starting_programs = list( /datum/computer_file/program/shipping, /datum/computer_file/program/budgetorders, @@ -102,7 +102,7 @@ /** * Science */ -/obj/item/computer_disk/ordnance +/obj/item/disk/computer/ordnance name = "ordnance data disk" desc = "Removable disk used to download ordnance-related tablet apps." icon_state = "datadisk5" @@ -114,7 +114,7 @@ /** * Engineering */ -/obj/item/computer_disk/engineering +/obj/item/disk/computer/engineering name = "engineering data disk" desc = "Removable disk used to download engineering-related tablet apps." icon_state = "datadisk6" diff --git a/code/modules/modular_computers/computers/item/disks/unique_disks.dm b/code/modules/modular_computers/computers/item/disks/unique_disks.dm index a5e9d9750f3..9251ffa7922 100644 --- a/code/modules/modular_computers/computers/item/disks/unique_disks.dm +++ b/code/modules/modular_computers/computers/item/disks/unique_disks.dm @@ -1,19 +1,27 @@ -/obj/item/computer_disk/syndicate +/obj/item/disk/computer/syndicate name = "golden data disk" desc = "A data disk with some high-tech programs, probably expensive as hell." - icon_state = "datadisk8" + icon_state = "datadisk9" custom_materials = list(/datum/material/gold = SMALL_MATERIAL_AMOUNT) -/obj/item/computer_disk/syndicate/camera_app +/obj/item/disk/computer/syndicate/Initialize(mapload) + . = ..() + add_overlay("o_syndicate") + +/obj/item/disk/computer/syndicate/camera_app starting_programs = list(/datum/computer_file/program/secureye/syndicate) -/obj/item/computer_disk/syndicate/contractor +/obj/item/disk/computer/syndicate/contractor starting_programs = list(/datum/computer_file/program/contract_uplink) -/obj/item/computer_disk/black_market +/obj/item/disk/computer/black_market desc = "Removable disk used to store data. This one has a smudged piece of paper glued to it, reading \"PC softwarez\"." -/obj/item/computer_disk/black_market/Initialize(mapload) +/obj/item/disk/computer/black_market/Initialize(mapload) + . = ..() + add_overlay("o_code") + +/obj/item/disk/computer/black_market/Initialize(mapload) icon_state = "datadisk[rand(0, 10)]" //Populated with programs not found in the verified downloader app or that require access to download (but not to run). var/list/potential_programs = list( diff --git a/code/modules/modular_computers/computers/item/disks/virus_disk.dm b/code/modules/modular_computers/computers/item/disks/virus_disk.dm index 585e7d31558..fdc336362a5 100644 --- a/code/modules/modular_computers/computers/item/disks/virus_disk.dm +++ b/code/modules/modular_computers/computers/item/disks/virus_disk.dm @@ -2,14 +2,14 @@ * Virus disk * Can't hold apps, instead does unique actions. */ -/obj/item/computer_disk/virus +/obj/item/disk/computer/virus name = "\improper generic virus disk" icon_state = "virusdisk" max_capacity = 0 ///How many charges the virus has left var/charges = 5 -/obj/item/computer_disk/virus/proc/send_virus(obj/item/modular_computer/pda/source, obj/item/modular_computer/pda/target, mob/living/user, message) +/obj/item/disk/computer/virus/proc/send_virus(obj/item/modular_computer/pda/source, obj/item/modular_computer/pda/target, mob/living/user, message) if(charges <= 0) to_chat(user, span_notice("ERROR: Out of charges.")) return FALSE @@ -23,10 +23,10 @@ * Makes people's PDA honk * Can also be used on open panel airlocks to make them honk on opening. */ -/obj/item/computer_disk/virus/clown +/obj/item/disk/computer/virus/clown name = "\improper H.O.N.K. disk" -/obj/item/computer_disk/virus/clown/send_virus(obj/item/modular_computer/pda/source, obj/item/modular_computer/pda/target, mob/living/user, message) +/obj/item/disk/computer/virus/clown/send_virus(obj/item/modular_computer/pda/source, obj/item/modular_computer/pda/target, mob/living/user, message) . = ..() if(!.) return FALSE @@ -40,10 +40,10 @@ * Mime virus * Makes PDA's silent, removing their ringtone. */ -/obj/item/computer_disk/virus/mime +/obj/item/disk/computer/virus/mime name = "\improper sound of silence disk" -/obj/item/computer_disk/virus/mime/send_virus(obj/item/modular_computer/pda/source, obj/item/modular_computer/pda/target, mob/living/user, message) +/obj/item/disk/computer/virus/mime/send_virus(obj/item/modular_computer/pda/source, obj/item/modular_computer/pda/target, mob/living/user, message) . = ..() if(!.) return FALSE @@ -60,11 +60,11 @@ * Detomatix virus * Sends a false message, and blows the PDA up if the target responds to it (or opens their messenger before a timer) */ -/obj/item/computer_disk/virus/detomatix +/obj/item/disk/computer/virus/detomatix name = "\improper D.E.T.O.M.A.T.I.X. disk" charges = 6 -/obj/item/computer_disk/virus/detomatix/send_virus(obj/item/modular_computer/pda/source, obj/item/modular_computer/pda/target, mob/living/user, message) +/obj/item/disk/computer/virus/detomatix/send_virus(obj/item/modular_computer/pda/source, obj/item/modular_computer/pda/target, mob/living/user, message) . = ..() if(!.) return FALSE @@ -101,7 +101,7 @@ * Creates and opens a false uplink on someone's PDA * Can be loaded with TC to show up on the false uplink. */ -/obj/item/computer_disk/virus/frame +/obj/item/disk/computer/virus/frame name = "\improper F.R.A.M.E. disk" ///How many telecrystals the uplink should have @@ -109,7 +109,7 @@ ///How much progression should be shown in the uplink, set on purchase of the item. var/current_progression = 0 -/obj/item/computer_disk/virus/frame/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers) +/obj/item/disk/computer/virus/frame/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers) . = ..() if(!istype(attacking_item, /obj/item/stack/telecrystal)) return @@ -122,7 +122,7 @@ telecrystal_stack.use(telecrystal_stack.amount) -/obj/item/computer_disk/virus/frame/send_virus(obj/item/modular_computer/pda/source, obj/item/modular_computer/pda/target, mob/living/user, message) +/obj/item/disk/computer/virus/frame/send_virus(obj/item/modular_computer/pda/source, obj/item/modular_computer/pda/target, mob/living/user, message) . = ..() if(!.) return FALSE diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm index 25ef899febb..1df3722a50f 100644 --- a/code/modules/modular_computers/computers/item/pda.dm +++ b/code/modules/modular_computers/computers/item/pda.dm @@ -112,9 +112,9 @@ if(!target_machine.panel_open && !istype(target, /obj/machinery/computer)) return ..() - if(!istype(inserted_disk, /obj/item/computer_disk/virus/clown)) + if(!istype(inserted_disk, /obj/item/disk/computer/virus/clown)) return ..() - var/obj/item/computer_disk/virus/clown/installed_cartridge = inserted_disk + var/obj/item/disk/computer/virus/clown/installed_cartridge = inserted_disk if(!installed_cartridge.charges) to_chat(user, span_notice("Out of virus charges.")) return ..() @@ -225,7 +225,7 @@ if(current_turf) current_turf.hotspot_expose(700,125) - if(istype(inserted_disk, /obj/item/computer_disk/virus/detomatix)) + if(istype(inserted_disk, /obj/item/disk/computer/virus/detomatix)) explosion(src, devastation_range = -1, heavy_impact_range = 1, light_impact_range = 3, flash_range = 4) else explosion(src, devastation_range = -1, heavy_impact_range = -1, light_impact_range = 2, flash_range = 3) diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index b77f273378f..2f655ac1d0c 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -326,7 +326,7 @@ icon = 'icons/obj/devices/modular_pda.dmi' icon_state = "pda-clown" post_init_icon_state = null - inserted_disk = /obj/item/computer_disk/virus/clown + inserted_disk = /obj/item/disk/computer/virus/clown greyscale_config = null greyscale_colors = null inserted_item = /obj/item/toy/crayon/rainbow @@ -358,7 +358,7 @@ /obj/item/modular_computer/pda/clown/proc/AfterSlip(mob/living/carbon/human/M) if (istype(M) && (M.real_name != saved_identification)) - var/obj/item/computer_disk/virus/clown/cart = inserted_disk + var/obj/item/disk/computer/virus/clown/cart = inserted_disk if(istype(cart) && cart.charges < 5) cart.charges++ playsound(src,'sound/machines/ping.ogg',30,TRUE) @@ -368,7 +368,7 @@ /obj/item/modular_computer/pda/mime name = "mime PDA" - inserted_disk = /obj/item/computer_disk/virus/mime + inserted_disk = /obj/item/disk/computer/virus/mime icon_state = "/obj/item/modular_computer/pda/mime" greyscale_config = /datum/greyscale_config/tablet/mime greyscale_colors = "#FAFAFA#EA3232" diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm index 05f3272d833..d719fe5bd36 100644 --- a/code/modules/modular_computers/file_system/computer_file.dm +++ b/code/modules/modular_computers/file_system/computer_file.dm @@ -14,7 +14,7 @@ ///The modular computer hosting the file. var/obj/item/modular_computer/computer ///The computer disk hosting the file. - var/obj/item/computer_disk/disk_host + var/obj/item/disk/computer/disk_host /datum/computer_file/New() ..() diff --git a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm index 0cd3595c437..48e19516dad 100644 --- a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm +++ b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm @@ -276,7 +276,7 @@ return FALSE if(sending_virus) - var/obj/item/computer_disk/virus/disk = computer.inserted_disk + var/obj/item/disk/computer/virus/disk = computer.inserted_disk if(!istype(disk)) return FALSE @@ -376,7 +376,7 @@ data["selected_photo_path"] = !isnull(selected_image) ? SSassets.transport.get_asset_url(selected_image) : null data["on_spam_cooldown"] = !can_send_everyone_message() - var/obj/item/computer_disk/virus/disk = computer.inserted_disk + var/obj/item/disk/computer/virus/disk = computer.inserted_disk if(istype(disk)) data["virus_attach"] = TRUE data["sending_virus"] = sending_virus diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 1c1c45fe59a..b2064b0acdf 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -628,7 +628,7 @@ /obj/item/emitter_disk name = "\improper Diode Disk: Debugger" desc = "This disk can be used on an emitter with an open panel to reset its projectile. Unless this was handed to you by an admin, you should report this on github." - icon = 'icons/obj/devices/circuitry_n_data.dmi' + icon = 'icons/obj/devices/floppy_disks.dmi' icon_state = "datadisk6" var/laser_color = COLOR_VIBRANT_LIME var/stored_proj = /obj/projectile/beam/emitter/hitscan diff --git a/code/modules/research/designs/computer_part_designs.dm b/code/modules/research/designs/computer_part_designs.dm index 7a8242642a1..948073f9f15 100644 --- a/code/modules/research/designs/computer_part_designs.dm +++ b/code/modules/research/designs/computer_part_designs.dm @@ -7,7 +7,7 @@ id = "portadrive_basic" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT) - build_path = /obj/item/computer_disk + build_path = /obj/item/disk/computer category = list( RND_CATEGORY_INITIAL, RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS @@ -19,7 +19,7 @@ id = "portadrive_advanced" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2) - build_path = /obj/item/computer_disk/advanced + build_path = /obj/item/disk/computer/advanced category = list( RND_CATEGORY_INITIAL, RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS @@ -31,7 +31,7 @@ id = "portadrive_super" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 4) - build_path = /obj/item/computer_disk/super + build_path = /obj/item/disk/computer/super category = list( RND_CATEGORY_INITIAL, RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS diff --git a/code/modules/research/ordnance/doppler_array.dm b/code/modules/research/ordnance/doppler_array.dm index fda438e4f4e..c516cd38f6a 100644 --- a/code/modules/research/ordnance/doppler_array.dm +++ b/code/modules/research/ordnance/doppler_array.dm @@ -15,7 +15,7 @@ /// List of all explosion records in the form of /datum/data/tachyon_record var/list/records = list() /// Reference to a disk we are going to print to. - var/obj/item/computer_disk/inserted_disk + var/obj/item/disk/computer/inserted_disk // Lighting system to better communicate the directions. light_system = OVERLAY_LIGHT_DIRECTIONAL @@ -49,8 +49,8 @@ . += span_notice("It is currently facing [dir2text(dir)]") /obj/machinery/doppler_array/attackby(obj/item/item, mob/user, list/modifiers, list/attack_modifiers) - if(istype(item, /obj/item/computer_disk)) - var/obj/item/computer_disk/disk = item + if(istype(item, /obj/item/disk/computer)) + var/obj/item/disk/computer/disk = item eject_disk(user) if(user.transferItemToLoc(disk, src)) inserted_disk = disk diff --git a/code/modules/research/ordnance/tank_compressor.dm b/code/modules/research/ordnance/tank_compressor.dm index 06069123f94..189ab23a3a0 100644 --- a/code/modules/research/ordnance/tank_compressor.dm +++ b/code/modules/research/ordnance/tank_compressor.dm @@ -19,7 +19,7 @@ var/record_number = 1 var/obj/item/tank/inserted_tank /// Reference to a disk we are going to print to. - var/obj/item/computer_disk/inserted_disk + var/obj/item/disk/computer/inserted_disk pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY @@ -60,8 +60,8 @@ RegisterSignal(inserted_tank, COMSIG_QDELETING, PROC_REF(tank_destruction)) update_appearance() return - if(istype(item, /obj/item/computer_disk)) - var/obj/item/computer_disk/attacking_disk = item + if(istype(item, /obj/item/disk/computer)) + var/obj/item/disk/computer/attacking_disk = item eject_disk(user) if(user.transferItemToLoc(attacking_disk, src)) inserted_disk = attacking_disk diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 2c591e0fe11..6b900f0e83b 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -116,7 +116,7 @@ /obj/machinery/rnd/server/master max_integrity = 1800 //takes roughly ~15s longer to break then full deconstruction. circuit = null - var/obj/item/computer_disk/hdd_theft/source_code_hdd + var/obj/item/disk/computer/hdd_theft/source_code_hdd var/deconstruction_state = HDD_PANEL_CLOSED var/front_panel_screws = 4 var/hdd_wires = 6 @@ -166,7 +166,7 @@ return ..() /obj/machinery/rnd/server/master/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers) - if(istype(attacking_item, /obj/item/computer_disk/hdd_theft)) + if(istype(attacking_item, /obj/item/disk/computer/hdd_theft)) switch(deconstruction_state) if(HDD_PANEL_CLOSED) balloon_alert(user, "you can't find a place to insert it!") diff --git a/code/modules/uplink/uplink_items/device_tools.dm b/code/modules/uplink/uplink_items/device_tools.dm index 83ebc1e737d..9696cd1bbb7 100644 --- a/code/modules/uplink/uplink_items/device_tools.dm +++ b/code/modules/uplink/uplink_items/device_tools.dm @@ -104,7 +104,7 @@ /datum/uplink_item/device_tools/camera_app name = "SyndEye Program" desc = "A data disk containing a unique PC app that allows you to watch cameras and track crewmembers." - item = /obj/item/computer_disk/syndicate/camera_app + item = /obj/item/disk/computer/syndicate/camera_app cost = 1 surplus = 90 purchasable_from = ~UPLINK_ALL_SYNDIE_OPS @@ -137,14 +137,14 @@ when used cause the targeted tablet to become a new uplink with zero TCs, and immediately become unlocked. \ You will receive the unlock code upon activating the virus, and the new uplink may be charged with \ telecrystals normally." - item = /obj/item/computer_disk/virus/frame + item = /obj/item/disk/computer/virus/frame cost = 4 restricted = TRUE purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/device_tools/frame/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source) . = ..() - var/obj/item/computer_disk/virus/frame/target = . + var/obj/item/disk/computer/virus/frame/target = . if(!target) return target.current_progression = uplink_handler.progression_points diff --git a/code/modules/uplink/uplink_items/explosive.dm b/code/modules/uplink/uplink_items/explosive.dm index 6eb0c05bddd..89d0d9d23ea 100644 --- a/code/modules/uplink/uplink_items/explosive.dm +++ b/code/modules/uplink/uplink_items/explosive.dm @@ -51,7 +51,7 @@ desc = "When inserted into a tablet, this cartridge gives you four opportunities to \ detonate tablets of crewmembers who have their message feature enabled. \ The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer." - item = /obj/item/computer_disk/virus/detomatix + item = /obj/item/disk/computer/virus/detomatix cost = 6 restricted = TRUE diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm index 37ee8997aee..971517074fb 100644 --- a/code/modules/uplink/uplink_items/nukeops.dm +++ b/code/modules/uplink/uplink_items/nukeops.dm @@ -820,7 +820,7 @@ /datum/uplink_item/suits/synd_ai_upgrade name = "Syndicate AI Upgrade" desc = "...unless you buy the Syndicate Upgrade! This data chip allows the captured AI to increase its interaction range by two tiles per application. The Syndicate recommends three or four purchases at most, for a total of seven or infinite meters of range." - item = /obj/item/computer_disk/syndie_ai_upgrade + item = /obj/item/disk/computer/syndie_ai_upgrade cost = 4 purchasable_from = UPLINK_ALL_SYNDIE_OPS cant_discount = TRUE diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm index 9e5a3c4d8ec..1f368e4afdd 100644 --- a/code/modules/vending/assist.dm +++ b/code/modules/vending/assist.dm @@ -8,7 +8,7 @@ /obj/item/assembly/igniter = 3, /obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, - /obj/item/computer_disk/ordnance = 4, + /obj/item/disk/computer/ordnance = 4, /obj/item/stock_parts/capacitor = 3, /obj/item/stock_parts/servo = 3, /obj/item/stock_parts/matter_bin = 3, diff --git a/code/modules/vending/cartridge.dm b/code/modules/vending/cartridge.dm index ccc13b7de72..043782d5366 100644 --- a/code/modules/vending/cartridge.dm +++ b/code/modules/vending/cartridge.dm @@ -7,12 +7,12 @@ icon_deny = "cart-deny" panel_type = "panel6" products = list( - /obj/item/computer_disk/medical = 10, - /obj/item/computer_disk/engineering = 10, - /obj/item/computer_disk/security = 10, - /obj/item/computer_disk/ordnance = 10, - /obj/item/computer_disk/quartermaster = 10, - /obj/item/computer_disk/command/captain = 3, + /obj/item/disk/computer/medical = 10, + /obj/item/disk/computer/engineering = 10, + /obj/item/disk/computer/security = 10, + /obj/item/disk/computer/ordnance = 10, + /obj/item/disk/computer/quartermaster = 10, + /obj/item/disk/computer/command/captain = 3, /obj/item/modular_computer/pda = 10, ) refill_canister = /obj/item/vending_refill/cart diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm index 415329366c7..c3363cde229 100644 --- a/code/modules/vending/modularpc.dm +++ b/code/modules/vending/modularpc.dm @@ -8,7 +8,7 @@ product_ads = "Get your gamer gear!;The best GPUs for all of your space-crypto needs!;The most robust cooling!;The finest RGB in space!" vend_reply = "Game on!" products = list( - /obj/item/computer_disk = 8, + /obj/item/disk/computer = 8, /obj/item/modular_computer/laptop = 4, /obj/item/modular_computer/pda = 4, ) diff --git a/icons/obj/devices/circuitry_n_data.dmi b/icons/obj/devices/circuitry_n_data.dmi index cacf3cf13b73647728dce63a3aaeaa989a8a51b1..c35a1a60272b98beba5eaa526fa1c902584f477d 100644 GIT binary patch literal 17163 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 bv-$ueh;0E<^02D|P+xK~N^dKr4gCKH%c1qM literal 23033 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 literal 3663 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 diff --git a/tgstation.dme b/tgstation.dme index 4e22afe16c1..6f10c88246d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2544,6 +2544,7 @@ #include "code\game\objects\items\fireaxe.dm" #include "code\game\objects\items\flamethrower.dm" #include "code\game\objects\items\flatpacks.dm" +#include "code\game\objects\items\floppy_disk.dm" #include "code\game\objects\items\forensicsspoofer.dm" #include "code\game\objects\items\frog_statue.dm" #include "code\game\objects\items\gift.dm" diff --git a/tools/UpdatePaths/Scripts/94112_disk_repath.txt b/tools/UpdatePaths/Scripts/94112_disk_repath.txt new file mode 100644 index 00000000000..f5f6ecd21e9 --- /dev/null +++ b/tools/UpdatePaths/Scripts/94112_disk_repath.txt @@ -0,0 +1,7 @@ +# Replaces /obj/item/bitrunning_disk with /obj/item/disk/bitrunning + +/obj/item/bitrunning_disk : /obj/item/disk/bitrunning{@OLD} +/obj/item/bitrunning_disk/@SUBTYPES : /obj/item/disk/bitrunning/@SUBTYPES{@OLD} + +/obj/item/computer_disk : /obj/item/disk/computer{@OLD} +/obj/item/computer_disk/@SUBTYPES : /obj/item/disk/computer/@SUBTYPES{@OLD}