diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm index 19ff35c86b..d9a5f7a847 100644 --- a/code/__defines/mobs.dm +++ b/code/__defines/mobs.dm @@ -112,25 +112,24 @@ #define MAX_SUPPLIED_LAW_NUMBER 50 //default item on-mob icons -#define INV_HEAD_DEF_ICON 'icons/mob/head.dmi' -#define INV_BACK_DEF_ICON 'icons/mob/back.dmi' #define INV_L_HAND_DEF_ICON 'icons/mob/items/lefthand.dmi' #define INV_R_HAND_DEF_ICON 'icons/mob/items/righthand.dmi' -#define INV_W_UNIFORM_DEF_ICON "icons/mob/uniform" -#define INV_ACCESSORIES_DEF_ICON 'icons/mob/ties.dmi' -#define INV_TIE_DEF_ICON 'icons/mob/ties.dmi' -#define INV_SUIT_DEF_ICON "icons/mob/suit" -#define INV_SPACESUIT_DEF_ICON 'icons/mob/spacesuit.dmi' #define INV_WEAR_ID_DEF_ICON 'icons/mob/mob.dmi' -#define INV_GLOVES_DEF_ICON 'icons/mob/hands.dmi' -#define INV_EYES_DEF_ICON 'icons/mob/eyes.dmi' -#define INV_EARS_DEF_ICON 'icons/mob/ears.dmi' -#define INV_FEET_DEF_ICON 'icons/mob/feet.dmi' -#define INV_BELT_DEF_ICON 'icons/mob/belt.dmi' -#define INV_MASK_DEF_ICON 'icons/mob/mask.dmi' #define INV_HCUFF_DEF_ICON 'icons/mob/mob.dmi' #define INV_LCUFF_DEF_ICON 'icons/mob/mob.dmi' +#define INV_HEAD_DEF_ICON 'icons/inventory/head/mob.dmi' +#define INV_BACK_DEF_ICON 'icons/inventory/back/mob.dmi' +#define INV_W_UNIFORM_DEF_ICON 'icons/inventory/uniform/mob.dmi' +#define INV_ACCESSORIES_DEF_ICON 'icons/inventory/accessory/mob.dmi' +#define INV_SUIT_DEF_ICON 'icons/inventory/suit/mob.dmi' +#define INV_GLOVES_DEF_ICON 'icons/inventory/hands/mob.dmi' +#define INV_EYES_DEF_ICON 'icons/inventory/eyes/mob.dmi' +#define INV_EARS_DEF_ICON 'icons/inventory/ears/mob.dmi' +#define INV_FEET_DEF_ICON 'icons/inventory/feet/mob.dmi' +#define INV_BELT_DEF_ICON 'icons/inventory/belt/mob.dmi' +#define INV_MASK_DEF_ICON 'icons/inventory/face/mob.dmi' + // Character's economic class #define CLASS_UPPER "Wealthy" #define CLASS_UPMID "Well-off" diff --git a/code/__defines/subsystems.dm b/code/__defines/subsystems.dm index 1d09ecc799..8ed8125dac 100644 --- a/code/__defines/subsystems.dm +++ b/code/__defines/subsystems.dm @@ -59,7 +59,6 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G #define INIT_ORDER_INPUT 37 #define INIT_ORDER_CHEMISTRY 35 #define INIT_ORDER_VIS 32 -#define INIT_ORDER_SKYBOX 30 #define INIT_ORDER_MAPPING 25 #define INIT_ORDER_SOUNDS 23 #define INIT_ORDER_INSTRUMENTS 22 @@ -86,10 +85,12 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G #define INIT_ORDER_AI_FAST -23 #define INIT_ORDER_GAME_MASTER -24 #define INIT_ORDER_PERSISTENCE -25 +#define INIT_ORDER_SKYBOX -30 //Visual only, irrelevant to gameplay, but needs to be late enough to have overmap populated fully #define INIT_ORDER_TICKER -50 #define INIT_ORDER_CHAT -100 //Should be last to ensure chat remains smooth during init. + // Subsystem fire priority, from lowest to highest priority // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child) #define FIRE_PRIORITY_SHUTTLES 5 diff --git a/code/controllers/subsystems/skybox.dm b/code/controllers/subsystems/skybox.dm index 05053fbb0f..99f69ec595 100644 --- a/code/controllers/subsystems/skybox.dm +++ b/code/controllers/subsystems/skybox.dm @@ -93,13 +93,17 @@ SUBSYSTEM_DEF(skybox) . = ..() /datum/controller/subsystem/skybox/proc/get_skybox(z) + if(!subsystem_initialized) + return // WAIT if(!skybox_cache["[z]"]) skybox_cache["[z]"] = generate_skybox(z) return skybox_cache["[z]"] /datum/controller/subsystem/skybox/proc/generate_skybox(z) var/datum/skybox_settings/settings = global.using_map.get_skybox_datum(z) - + + var/new_overlays = list() + var/image/res = image(settings.icon) res.appearance_flags = KEEP_TOGETHER @@ -111,23 +115,26 @@ SUBSYSTEM_DEF(skybox) stars.appearance_flags = RESET_COLOR base.overlays += stars - res.overlays += base + new_overlays += base if(global.using_map.use_overmap && settings.use_overmap_details) var/obj/effect/overmap/visitable/O = get_overmap_sector(z) if(istype(O)) - var/image/overmap = image(settings.icon) - overmap.overlays += O.generate_skybox() + var/image/self_image = O.generate_skybox(z) + new_overlays += self_image for(var/obj/effect/overmap/visitable/other in O.loc) if(other != O) - overmap.overlays += other.get_skybox_representation() - overmap.appearance_flags = RESET_COLOR - res.overlays += overmap + new_overlays += other.get_skybox_representation(z) // Allow events to apply custom overlays to skybox! (Awesome!) for(var/datum/event/E in SSevents.active_events) if(E.has_skybox_image && E.isRunning && (z in E.affecting_z)) - res.overlays += E.get_skybox_image() + new_overlays += E.get_skybox_image() + + for(var/image/I in new_overlays) + I.appearance_flags |= RESET_COLOR + + res.overlays = new_overlays return res diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm index 28ed9f07bf..69f198bbd4 100644 --- a/code/datums/supplypacks/medical.dm +++ b/code/datums/supplypacks/medical.dm @@ -66,8 +66,7 @@ /obj/item/weapon/surgical/bonegel, /obj/item/weapon/surgical/retractor, /obj/item/weapon/surgical/bonesetter, - /obj/item/weapon/surgical/circular_saw, - /obj/item/weapon/surgical/bioregen + /obj/item/weapon/surgical/circular_saw ) cost = 25 containertype = /obj/structure/closet/crate/secure/veymed diff --git a/code/datums/supplypacks/medical_vr.dm b/code/datums/supplypacks/medical_vr.dm index 2d6a340f0a..4f2dc7e8fe 100644 --- a/code/datums/supplypacks/medical_vr.dm +++ b/code/datums/supplypacks/medical_vr.dm @@ -50,4 +50,4 @@ cost = 90 containertype = /obj/structure/closet/crate/secure containername = "Compact Defibrillator crate" - access = access_medical_equip + access = access_medical_equip \ No newline at end of file diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm index 88aa93f4c2..b976e34d51 100644 --- a/code/game/gamemodes/technomancer/core_obj.dm +++ b/code/game/gamemodes/technomancer/core_obj.dm @@ -13,7 +13,7 @@ TECH_COMBAT = 7, TECH_MAGNET = 9, TECH_DATA = 5 ) sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi' + SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi' ) var/energy = 10000 var/max_energy = 10000 diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index c1cdc8a969..a086a490e0 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -404,6 +404,13 @@ icon_state_closing = "closing" icon_state = "closed" +/obj/machinery/door/blast/multi_tile/four_tile_ver_sec + icon = 'icons/obj/doors/1x4blast_vert_sec.dmi' + bound_height = 128 + width = 4 + dir = NORTH + autoclose = TRUE + /obj/machinery/door/blast/multi_tile/four_tile_ver icon = 'icons/obj/doors/1x4blast_vert.dmi' bound_height = 128 @@ -422,6 +429,13 @@ width = 2 dir = NORTH +/obj/machinery/door/blast/multi_tile/four_tile_hor_sec + icon = 'icons/obj/doors/1x4blast_hor_sec.dmi' + bound_width = 128 + width = 4 + dir = EAST + autoclose = TRUE + /obj/machinery/door/blast/multi_tile/four_tile_hor icon = 'icons/obj/doors/1x4blast_hor.dmi' bound_width = 128 diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index ea618e4219..9e8f68921b 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -83,12 +83,11 @@ data["linked"] = linked var/list/filter = list() - if(LAZYLEN(freq_listening)) - for(var/x in freq_listening) - filter.Add(list(list( - "name" = "[format_frequency(x)]", - "freq" = x, - ))) + for(var/x in freq_listening) + filter.Add(list(list( + "name" = "[format_frequency(x)]", + "freq" = x, + ))) data["filter"] = filter return data diff --git a/code/game/objects/effects/map_effects/portal.dm b/code/game/objects/effects/map_effects/portal.dm index 094de59e2a..9f40c87f1b 100644 --- a/code/game/objects/effects/map_effects/portal.dm +++ b/code/game/objects/effects/map_effects/portal.dm @@ -50,8 +50,8 @@ when portals are shortly lived, or when portals are made to be obvious with spec opacity = TRUE plane = TURF_PLANE layer = ABOVE_TURF_LAYER - appearance_flags = PIXEL_SCALE|KEEP_TOGETHER // Removed TILE_BOUND so things not visible on the other side stay hidden from the viewer. - + appearance_flags = NONE + var/obj/effect/map_effect/portal/counterpart = null // The portal line or master that this is connected to, on the 'other side'. // Information used to apply `pixel_[x|y]` offsets so that the visuals line up. diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 8c527334c0..7abfa3ea5f 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -843,9 +843,9 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. return icon_override //2: species-specific sprite sheets (skipped for inhands) - if(LAZYLEN(sprite_sheets)) + if(LAZYLEN(sprite_sheets) && !inhands) var/sheet = sprite_sheets[body_type] - if(sheet && !inhands) + if(sheet) return sheet //3: slot-specific sprite sheets diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 09cee5bb4c..b8dc28b2e9 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -11,7 +11,7 @@ var/can_use = 1 var/obj/effect/dummy/chameleon/active_dummy = null var/saved_item = /obj/item/trash/cigbutt - var/saved_icon = 'icons/obj/clothing/masks.dmi' + var/saved_icon = 'icons/inventory/face/item.dmi' var/saved_icon_state = "cigbutt" var/saved_overlays diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 258fa02632..22cfcad31d 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -8,7 +8,7 @@ subspace_transmission = 1 canhear_range = 0 // can't hear headsets from very far away slot_flags = SLOT_EARS - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi') var/translate_binary = 0 var/translate_hive = 0 diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm index 1285ae0709..ce4e3377a9 100644 --- a/code/game/objects/items/devices/radio/headset_vr.dm +++ b/code/game/objects/items/devices/radio/headset_vr.dm @@ -22,8 +22,8 @@ icon_state = "nt_headset_alt" /obj/item/device/radio/headset - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/ears.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi', + SPECIES_WEREBEAST = 'icons/inventory/ears/mob_werebeast.dmi') /obj/item/device/radio/headset/mob_headset //Adminbus headset for simplemob shenanigans. name = "nonhuman radio receiver" diff --git a/code/game/objects/items/devices/radio/radiopack.dm b/code/game/objects/items/devices/radio/radiopack.dm index 3bc222373f..98cbd1064b 100644 --- a/code/game/objects/items/devices/radio/radiopack.dm +++ b/code/game/objects/items/devices/radio/radiopack.dm @@ -2,7 +2,7 @@ name = "bluespace radio" desc = "A powerful radio that uses a tiny bluespace wormhole to send signals directly to subspace receivers and transmitters, bypassing the limitations of subspace." icon = 'icons/obj/device_vr.dmi' // VOREStation Edit - icon_override = 'icons/mob/back_vr.dmi' // VOREStation Edit + icon_override = 'icons/inventory/back/mob_vr.dmi' // VOREStation Edit icon_state = "radiopack" item_state = "radiopack" slot_flags = SLOT_BACK diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm index 2f76c830ca..8586c7dbf9 100644 --- a/code/game/objects/items/devices/translocator_vr.dm +++ b/code/game/objects/items/devices/translocator_vr.dm @@ -390,7 +390,7 @@ or don't wish to potentially have a random person teleported into you, it's sugg not carry this around."}, "OOC Warning", list("Take It","Leave It")) if(choice == "Leave It") return - ..() + return ..() /obj/item/device/perfect_tele_beacon/stationary name = "stationary translocator beacon" diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 06b0e9edce..ddeac74b58 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -42,20 +42,20 @@ name = "\proper thermal vision" sight_mode = BORGTHERM icon_state = "thermal" - icon = 'icons/obj/clothing/glasses.dmi' + icon = 'icons/inventory/eyes/item.dmi' /obj/item/borg/sight/meson name = "\proper meson vision" sight_mode = BORGMESON icon_state = "meson" - icon = 'icons/obj/clothing/glasses.dmi' + icon = 'icons/inventory/eyes/item.dmi' /obj/item/borg/sight/material name = "\proper material scanner vision" sight_mode = BORGMATERIAL icon_state = "material" - icon = 'icons/obj/clothing/glasses.dmi' + icon = 'icons/inventory/eyes/item.dmi' /obj/item/borg/sight/hud name = "hud" @@ -65,7 +65,7 @@ /obj/item/borg/sight/hud/med name = "medical hud" icon_state = "healthhud" - icon = 'icons/obj/clothing/glasses.dmi' + icon = 'icons/inventory/eyes/item.dmi' /obj/item/borg/sight/hud/med/New() ..() @@ -76,7 +76,7 @@ /obj/item/borg/sight/hud/sec name = "security hud" icon_state = "securityhud" - icon = 'icons/obj/clothing/glasses.dmi' + icon = 'icons/inventory/eyes/item.dmi' /obj/item/borg/sight/hud/sec/New() ..() diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 062feaeaa7..0e16a7f8c5 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -1442,7 +1442,7 @@ name = "inflatable duck" desc = "No bother to sink or swim when you can just float!" icon_state = "inflatable" - icon = 'icons/obj/clothing/belts.dmi' + icon = 'icons/inventory/belt/item.dmi' slot_flags = SLOT_BELT drop_sound = 'sound/items/drop/rubber.ogg' diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index e09c9b1e5d..1a109bab91 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -190,7 +190,7 @@ /obj/item/trash/spitgum name = "old gum" desc = "A disgusting chewed up wad of gum." - icon = 'icons/obj/clothing/masks.dmi' + icon = 'icons/inventory/face/item.dmi' icon_state = "spit-gum" drop_sound = 'sound/items/drop/flesh.ogg' pickup_sound = 'sound/items/pickup/flesh.ogg' @@ -198,7 +198,7 @@ /obj/item/trash/lollibutt name = "lollipop stick" desc = "A lollipop stick devoid of pop." - icon = 'icons/obj/clothing/masks.dmi' + icon = 'icons/inventory/face/item.dmi' icon_state = "pop-stick" drop_sound = 'sound/items/drop/component.ogg' pickup_sound = 'sound/items/pickup/component.ogg' @@ -206,7 +206,7 @@ /obj/item/trash/spitwad name = "spit wad" desc = "A disgusting spitwad." - icon = 'icons/obj/clothing/masks.dmi' + icon = 'icons/inventory/face/item.dmi' icon_state = "spit-chew" drop_sound = 'sound/items/drop/flesh.ogg' pickup_sound = 'sound/items/pickup/flesh.ogg' diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index 2ab2c95c72..93a2df1615 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -1,7 +1,7 @@ /obj/item/clothing/mask/chewable name = "chewable item master" desc = "If you are seeing this, ahelp it." - icon = 'icons/obj/clothing/masks.dmi' + icon = 'icons/inventory/face/item.dmi' drop_sound = 'sound/items/drop/food.ogg' body_parts_covered = 0 diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 15170138d3..ade55cbeca 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -376,7 +376,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/trash/cigbutt name = "cigarette butt" desc = "A manky old cigarette butt." - icon = 'icons/obj/clothing/masks.dmi' + icon = 'icons/inventory/face/item.dmi' icon_state = "cigbutt" randpixel = 10 w_class = ITEMSIZE_TINY diff --git a/code/game/objects/items/weapons/implants/neuralbasic.dm b/code/game/objects/items/weapons/implants/neuralbasic.dm index 18d472154b..5743640aa8 100644 --- a/code/game/objects/items/weapons/implants/neuralbasic.dm +++ b/code/game/objects/items/weapons/implants/neuralbasic.dm @@ -16,7 +16,7 @@ my_brain.implant_assist(target_state) if(H.isSynthetic() && H.get_FBP_type() != FBP_CYBORG) //If this on an FBP, it's just an extra inefficient attachment to whatever their brain is. robotic_brain = TRUE - if(my_brain && my_brain.can_assist()) + if(istype(my_brain) && my_brain.can_assist()) START_PROCESSING(SSobj, src) /obj/item/weapon/implant/neural/Destroy() diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index e6370499a0..ad016d0d85 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -5,10 +5,10 @@ /obj/item/weapon/storage/backpack name = "backpack" desc = "You wear this on your back and put items into it." - icon = 'icons/obj/clothing/backpack.dmi' + icon = 'icons/inventory/back/item.dmi' icon_state = "backpack" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi' + SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi' ) w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index 59505d3f71..c98b1dcfc9 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -1,8 +1,8 @@ /obj/item/weapon/storage/backpack/saddlebag name = "Horse Saddlebags" desc = "A saddle that holds items. Seems slightly bulky." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' item_state = "saddlebag" icon_state = "saddlebag" max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Saddlebags can hold more, like dufflebags @@ -29,8 +29,8 @@ /obj/item/weapon/storage/backpack/saddlebag_common //Shared bag for other taurs with sturdy backs name = "Taur Saddlebags" desc = "A saddle that holds items. Seems slightly bulky." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' item_state = "saddlebag" icon_state = "saddlebag" var/icon_base = "saddlebag" @@ -53,8 +53,8 @@ /obj/item/weapon/storage/backpack/saddlebag_common/robust //Shared bag for other taurs with sturdy backs name = "Robust Saddlebags" desc = "A saddle that holds items. Seems robust." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' item_state = "robustsaddle" icon_state = "robustsaddle" icon_base = "robustsaddle" @@ -62,8 +62,8 @@ /obj/item/weapon/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs name = "Taur Duty Vest" desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though. Holds less than a saddle." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' item_state = "taurvest" icon_state = "taurvest" icon_base = "taurvest" @@ -77,8 +77,8 @@ /obj/item/weapon/storage/backpack sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/back.dmi') + SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi', + SPECIES_WEREBEAST = 'icons/inventory/back/mob_werebeast.dmi') /obj/item/weapon/storage/backpack/ert max_storage_space = INVENTORY_DUFFLEBAG_SPACE @@ -88,31 +88,31 @@ /obj/item/weapon/storage/backpack/explorer name = "exploration backpack" desc = "A backpack for carrying a large number of supplies easily." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "explorer" /obj/item/weapon/storage/backpack/satchel/explorer name = "exploration satchel" desc = "A satchel for carrying a large number of supplies easily." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "explorer_satchel" item_state_slots = null /obj/item/weapon/storage/backpack/messenger/explorer name = "exploration messenger bag" desc = "A sturdy backpack worn over one shoulder." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "explorer_courier" item_state_slots = null /obj/item/weapon/storage/backpack/dufflebag/explorer name = "exploration dufflebag" desc = "A large dufflebag for holding extra supplies." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "explorer_duffle" ///Talon Bags/// @@ -120,31 +120,31 @@ /obj/item/weapon/storage/backpack/talon name = "ITV backpack" desc = "A backpack for carrying a large number of supplies easily." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "talon" /obj/item/weapon/storage/backpack/satchel/talon name = "ITV satchel" desc = "A satchel for carrying a large number of supplies easily." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "talon_satchel" item_state_slots = null /obj/item/weapon/storage/backpack/messenger/talon name = "ITV messenger bag" desc = "A sturdy backpack worn over one shoulder." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "talon_courier" item_state_slots = null /obj/item/weapon/storage/backpack/dufflebag/talon name = "ITV dufflebag" desc = "A large dufflebag for holding extra supplies." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "talon_duffle" ///Roboticist Bags/// @@ -152,16 +152,16 @@ /obj/item/weapon/storage/backpack/satchel/roboticist name = "roboticist satchel" desc = "A satchel for carrying a large number of spare parts easily." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' item_state = "satchel-robo" icon_state = "satchel-robo" /obj/item/weapon/storage/backpack/roboticist name = "roboticist backpack" desc = "A backpack for carrying a large number of spare parts easily." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' item_state = "backpack-robo" icon_state = "backpack-robo" @@ -170,23 +170,23 @@ /obj/item/weapon/storage/backpack/vietnam name = "vietnam backpack" desc = "There are tangos in the trees! We need napalm right now! Why is my gun jammed?" - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' item_state = "nambackpack" icon_state = "nambackpack" /obj/item/weapon/storage/backpack/russian name = "russian backpack" desc = "Useful for carrying large quantities of vodka." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' item_state = "ru_rucksack" icon_state = "ru_rucksack" /obj/item/weapon/storage/backpack/korean name = "korean backpack" desc = "Insert witty description here." - icon = 'icons/obj/clothing/backpack_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' item_state = "kr_rucksack" icon_state = "kr_rucksack" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 5412fab07c..dbe0292263 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -1,7 +1,7 @@ /obj/item/weapon/storage/belt name = "belt" desc = "Can hold various things." - icon = 'icons/obj/clothing/belts.dmi' + icon = 'icons/inventory/belt/item.dmi' icon_state = "utility" storage_slots = 7 max_storage_space = ITEMSIZE_COST_NORMAL * 7 //This should ensure belts always have enough room to store whatever. @@ -11,7 +11,7 @@ equip_sound = 'sound/items/toolbelt_equip.ogg' drop_sound = 'sound/items/drop/toolbelt.ogg' pickup_sound = 'sound/items/pickup/toolbelt.ogg' - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi') var/show_above_suit = 0 diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm index b07630de39..92da577c31 100644 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ b/code/game/objects/items/weapons/storage/belt_vr.dm @@ -1,13 +1,13 @@ /obj/item/weapon/storage/belt sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/belt.dmi') + SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi', + SPECIES_WEREBEAST = 'icons/inventory/belt/mob_werebeast.dmi') /obj/item/weapon/storage/belt/explorer name = "explorer's belt" desc = "A versatile belt with several pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find." - icon = 'icons/obj/clothing/belts_vr.dmi' - icon_override = 'icons/mob/belt_vr.dmi' + icon = 'icons/inventory/belt/item_vr.dmi' + icon_override = 'icons/inventory/belt/mob_vr.dmi' icon_state = "explo_belt" item_state = "explorer_belt" storage_slots = 5 //makes it strictly inferior to any specialized belt as they have seven slots, but it's far more versatile @@ -54,7 +54,7 @@ /obj/item/weapon/storage/belt/explorer/pathfinder name = "pathfinder's belt" desc = "A deluxe belt with many pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find." - icon = 'icons/obj/clothing/belts_vr.dmi' + icon = 'icons/inventory/belt/item_vr.dmi' icon_state = "pathfinder_belt" item_state = "explorer_belt" storage_slots = 7 //two more, bringing it on par with normal belts diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index ca9709b3fb..2bc47b43f5 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -137,8 +137,7 @@ /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/nanopaste, /obj/item/device/healthanalyzer/advanced, - /obj/item/weapon/autopsy_scanner, - /obj/item/weapon/surgical/bioregen + /obj/item/weapon/autopsy_scanner ) starts_with = list( @@ -153,8 +152,7 @@ /obj/item/weapon/surgical/FixOVein, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/device/healthanalyzer/advanced, - /obj/item/weapon/autopsy_scanner, - /obj/item/weapon/surgical/bioregen + /obj/item/weapon/autopsy_scanner ) /obj/item/weapon/storage/firstaid/clotting diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm index bd8c68a240..2e6936d2bd 100644 --- a/code/game/objects/items/weapons/storage/firstaid_vr.dm +++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm @@ -83,7 +83,8 @@ /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/nanopaste, /obj/item/device/healthanalyzer, - /obj/item/weapon/autopsy_scanner + /obj/item/weapon/autopsy_scanner, + /obj/item/weapon/surgical/bioregen ) starts_with = list( @@ -98,9 +99,11 @@ /obj/item/weapon/surgical/FixOVein, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/device/healthanalyzer, - /obj/item/weapon/autopsy_scanner + /obj/item/weapon/autopsy_scanner, + /obj/item/weapon/surgical/bioregen ) + /obj/item/weapon/storage/firstaid/clotting icon_state = "clottingkit" diff --git a/code/game/objects/items/weapons/storage/pouches.dm b/code/game/objects/items/weapons/storage/pouches.dm index 24a81f4112..62e04c0764 100644 --- a/code/game/objects/items/weapons/storage/pouches.dm +++ b/code/game/objects/items/weapons/storage/pouches.dm @@ -4,7 +4,7 @@ /obj/item/weapon/storage/pouch name = "storage pouch (medium)" desc = "This storage pouch can be used to provide some additional storage for quick access." - icon = 'icons/obj/clothing/pouches.dmi' + icon = 'icons/inventory/pockets/item.dmi' slot_flags = SLOT_POCKET drop_sound = 'sound/items/drop/backpack.ogg' pickup_sound = 'sound/items/pickup/backpack.ogg' diff --git a/code/game/objects/items/weapons/tanks/tank_types_vr.dm b/code/game/objects/items/weapons/tanks/tank_types_vr.dm index 68c18aebd2..b40ae4a210 100644 --- a/code/game/objects/items/weapons/tanks/tank_types_vr.dm +++ b/code/game/objects/items/weapons/tanks/tank_types_vr.dm @@ -2,7 +2,7 @@ name = "double emergency phoron tank" desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." icon = 'icons/obj/tank_vr.dmi' - icon_override = 'icons/mob/belt_vr.dmi' + icon_override = 'icons/inventory/belt/mob_vr.dmi' icon_state = "emergency_double_vox" gauge_icon = "indicator_double" gauge_cap = 3 @@ -39,7 +39,7 @@ /obj/item/weapon/tank/vox //Can't be a child of phoron or the gas amount gets screwey. icon = 'icons/obj/tank_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "phoron_vox" gauge_cap = 3 gauge_icon = "indicator_double" @@ -82,7 +82,7 @@ /obj/item/weapon/tank/emergency/phoron icon = 'icons/obj/tank_vr.dmi' - icon_override = 'icons/mob/belt_vr.dmi' + icon_override = 'icons/inventory/belt/mob_vr.dmi' icon_state = "emergency_phoron_vox" gauge_icon = "indicator_smalltank" volume = 6 diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 69e795cb6b..0c6c78dbbe 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -6,7 +6,7 @@ var/list/global/tank_gauge_cache = list() name = "tank" icon = 'icons/obj/tank.dmi' sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi' + SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi' ) drop_sound = 'sound/items/drop/gascan.ogg' pickup_sound = 'sound/items/pickup/gascan.ogg' diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm index 77e1c43960..119c9d7419 100644 --- a/code/game/objects/items/weapons/towels.dm +++ b/code/game/objects/items/weapons/towels.dm @@ -15,11 +15,11 @@ ..() switch(slot) if(slot_head) - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi') if(slot_wear_suit) - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi') if(slot_belt) - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi') /obj/item/weapon/towel/attack_self(mob/living/user as mob) user.visible_message(text("[] uses [] to towel themselves off.", user, src)) diff --git a/code/game/objects/items/weapons/traps_vr.dm b/code/game/objects/items/weapons/traps_vr.dm index f1338f691d..0b7c543f02 100644 --- a/code/game/objects/items/weapons/traps_vr.dm +++ b/code/game/objects/items/weapons/traps_vr.dm @@ -1,7 +1,7 @@ /obj/item/weapon/beartrap slot_flags = SLOT_MASK item_icons = list( - slot_wear_mask_str = 'icons/mob/mask_vr.dmi' + slot_wear_mask_str = 'icons/inventory/face/mob_vr.dmi' ) /obj/item/weapon/beartrap/equipped() diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index d0fabd7eb7..099aa16390 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -952,7 +952,7 @@ /obj/random/thermalponcho name = "random thermal poncho" desc = "This is a thermal poncho spawn." - icon = 'icons/obj/clothing/ties.dmi' + icon = 'icons/inventory/accessory/item.dmi' icon_state = "classicponcho" /obj/random/thermalponcho/item_to_spawn() @@ -965,7 +965,7 @@ /obj/random/pouch name = "Random Storage Pouch" desc = "This is a random storage pouch." - icon = 'icons/obj/clothing/pouches.dmi' + icon = 'icons/inventory/pockets/item.dmi' icon_state = "random" /obj/random/pouch/item_to_spawn() diff --git a/code/game/objects/random/spacesuits.dm b/code/game/objects/random/spacesuits.dm index 2d394625b9..5db5bbb074 100644 --- a/code/game/objects/random/spacesuits.dm +++ b/code/game/objects/random/spacesuits.dm @@ -4,7 +4,7 @@ /obj/random/multiple/voidsuit name = "Random Voidsuit" desc = "This is a random voidsuit." - icon = 'icons/obj/clothing/spacesuits.dmi' + icon = 'icons/inventory/suit/item.dmi' icon_state = "void" /obj/random/multiple/voidsuit/item_to_spawn() @@ -98,7 +98,7 @@ /obj/random/multiple/voidsuit/mining name = "Random Mining Voidsuit" desc = "This is a random mining voidsuit." - icon = 'icons/obj/clothing/spacesuits.dmi' + icon = 'icons/inventory/suit/item.dmi' icon_state = "rig-mining" /obj/random/multiple/voidsuit/mining/item_to_spawn() @@ -116,7 +116,7 @@ /obj/random/multiple/voidsuit/engineering name = "Random Engineering Voidsuit" desc = "This is a random engineering voidsuit." - icon = 'icons/obj/clothing/spacesuits.dmi' + icon = 'icons/inventory/suit/item.dmi' icon_state = "rig-engineering" /obj/random/multiple/voidsuit/engineering/item_to_spawn() @@ -146,7 +146,7 @@ /obj/random/multiple/voidsuit/security name = "Random Security Voidsuit" desc = "This is a random security voidsuit." - icon = 'icons/obj/clothing/spacesuits.dmi' + icon = 'icons/inventory/suit/item.dmi' icon_state = "rig-sec" /obj/random/multiple/voidsuit/security/item_to_spawn() @@ -168,7 +168,7 @@ /obj/random/multiple/voidsuit/medical name = "Random Medical Voidsuit" desc = "This is a random medical voidsuit." - icon = 'icons/obj/clothing/spacesuits.dmi' + icon = 'icons/inventory/suit/item.dmi' icon_state = "rig-medical" /obj/random/multiple/voidsuit/medical/item_to_spawn() @@ -194,7 +194,7 @@ /obj/random/multiple/voidsuit/vintage name = "Random Vintage Voidsuit" desc = "This is a random vintage voidsuit." - icon = 'icons/obj/clothing/spacesuits.dmi' + icon = 'icons/inventory/suit/item.dmi' icon_state = "rig-vintagecrew" /obj/random/multiple/voidsuit/vintage/item_to_spawn() diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 0eb4775c23..d41b8057a7 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -11,7 +11,7 @@ var/glass = 1 var/datum/tgui_module/appearance_changer/mirror/M -/obj/structure/mirror/New(var/loc, var/dir, var/building = 0, mob/user as mob) +/obj/structure/mirror/Initialize(mapload, var/dir, var/building = 0, mob/user as mob) M = new(src, null) if(building) glass = 0 diff --git a/code/game/objects/stumble_into_vr.dm b/code/game/objects/stumble_into_vr.dm index e52a2f6ce5..d282648303 100644 --- a/code/game/objects/stumble_into_vr.dm +++ b/code/game/objects/stumble_into_vr.dm @@ -77,7 +77,9 @@ M.Weaken(2) M.stop_flying() if(get_turf(M) == get_turf(src)) - M.forceMove(get_step(src, src.dir)) + var/turf/T = get_step(src, src.dir) + if(T?.Enter(M, get_turf(src))) + M.forceMove(T) else M.forceMove(get_turf(src)) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index fe21599691..88ef0db1c1 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -862,7 +862,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/view = src.view if(view == world.view) - view = tgui_input_list(usr, "Select view range:", "FUCK YE", 7, list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,128)) + view = tgui_input_list(usr, "Select view range:", "FUCK YE", list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,128)) else view = world.view mob.set_viewsize(view) diff --git a/code/modules/admin/view_variables/modify_variables.dm b/code/modules/admin/view_variables/modify_variables.dm index b270fc1bc8..6f354e9b63 100644 --- a/code/modules/admin/view_variables/modify_variables.dm +++ b/code/modules/admin/view_variables/modify_variables.dm @@ -98,7 +98,7 @@ GLOBAL_PROTECT(VVpixelmovement) L += var_value if(IS_VALID_ASSOC_KEY(var_value)) - switch(tgui_alert(usr, "Would you like to associate a value with the list entry?","List VV","Yes","No")) + switch(tgui_alert(usr, "Would you like to associate a value with the list entry?","List VV",list("Yes","No"))) if("Yes") L[var_value] = mod_list_add_ass(O) //hehe if (O) @@ -117,7 +117,7 @@ GLOBAL_PROTECT(VVpixelmovement) return if(L.len > 1000) - var/confirm = tgui_alert(src, "The list you're trying to edit is very long, continuing may crash the server.", "Warning", "Continue", "Abort") + var/confirm = tgui_alert(src, "The list you're trying to edit is very long, continuing may crash the server.", "Long List!", list("Warning", "Continue", "Abort")) if(confirm != "Continue") return @@ -181,7 +181,7 @@ GLOBAL_PROTECT(VVpixelmovement) return var/assoc = 0 if(IS_VALID_ASSOC_KEY(L[index])) - var/prompt = tgui_alert(src, "Do you want to edit the key or its assigned value?", "Associated List", "Key", "Assigned Value", "Cancel") + var/prompt = tgui_alert(src, "Do you want to edit the key or its assigned value?", "Associated List", list("Key", "Assigned Value", "Cancel")) if (prompt == "Cancel") return if (prompt == "Assigned Value") diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 3c4540679c..e66a89f7a6 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -388,14 +388,6 @@ if(ispath(item, /obj/item/weapon/reagent_containers/food/drinks/glass2) && !ispath(item, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask)) var/obj/item/weapon/reagent_containers/food/drinks/glass2/G = item icon_state = initial(G.base_icon) - if(ispath(item, /obj/item/clothing/suit)) - var/obj/item/clothing/suit/U = item - if(initial(U.index)) - icon_file = "icons/obj/clothing/suits_[initial(U.index)].dmi" - if(ispath(item, /obj/item/clothing/under)) - var/obj/item/clothing/under/U = item - if(initial(U.index)) - icon_file = "icons/obj/clothing/uniforms_[initial(U.index)].dmi" if(ispath(item, /obj/item/weapon/reagent_containers/hypospray/autoinjector)) icon_state += "0" diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index b9abfabf04..08c594153d 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -336,7 +336,6 @@ /obj/item/weapon/storage/belt/chameleon name = "belt" desc = "Can hold various things. It also has a small dial inside one of the pouches." - icon = 'icons/obj/clothing/belts.dmi' icon_state = "utilitybelt" origin_tech = list(TECH_ILLEGAL = 3) var/global/list/clothing_choices @@ -376,7 +375,7 @@ /obj/item/clothing/accessory/chameleon name = "black tie" desc = "Looks like a black tie, but his one also has a dial inside." - icon = 'icons/obj/clothing/ties.dmi' + icon = 'icons/inventory/accessory/item.dmi' icon_state = "blacktie" origin_tech = list(TECH_ILLEGAL = 3) var/global/list/clothing_choices diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 1e92a5fb75..d862e4066b 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -26,8 +26,6 @@ var/ear_protection = 0 var/blood_sprite_state - var/index //null by default, if set, will change which dmi it uses - var/update_icon_define = null // Only needed if you've got multiple files for the same type of clothing var/polychromic = FALSE //VOREStation edit @@ -229,7 +227,7 @@ throwforce = 2 slot_flags = SLOT_EARS sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi') + SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi') /obj/item/clothing/ears/attack_hand(mob/user as mob) if (!user) return @@ -312,7 +310,7 @@ ) gender = PLURAL //Carn: for grammarically correct text-parsing w_class = ITEMSIZE_SMALL - icon = 'icons/obj/clothing/gloves.dmi' + icon = 'icons/inventory/hands/item.dmi' siemens_coefficient = 0.9 blood_sprite_state = "bloodyhands" var/wired = 0 @@ -328,8 +326,8 @@ slot_flags = SLOT_GLOVES attack_verb = list("challenged") sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/gloves.dmi', - SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi' + SPECIES_TESHARI = 'icons/inventory/hands/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/hands/mob_vox.dmi' ) drop_sound = 'sound/items/drop/gloves.ogg' pickup_sound = 'sound/items/pickup/gloves.ogg' @@ -438,7 +436,7 @@ /obj/item/clothing/gloves/ring name = "ring" w_class = ITEMSIZE_TINY - icon = 'icons/obj/clothing/rings.dmi' + icon = 'icons/inventory/hands/item.dmi' gender = NEUTER species_restricted = list("exclude", SPECIES_DIONA) siemens_coefficient = 1 @@ -453,7 +451,7 @@ //Head /obj/item/clothing/head name = "head" - icon = 'icons/obj/clothing/hats.dmi' + icon = 'icons/inventory/head/item.dmi' item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_hats.dmi', slot_r_hand_str = 'icons/mob/items/righthand_hats.dmi', @@ -470,8 +468,8 @@ var/image/helmet_light sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', - SPECIES_VOX = 'icons/mob/species/vox/head.dmi' + SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi' ) drop_sound = 'sound/items/drop/hat.ogg' pickup_sound = 'sound/items/pickup/hat.ogg' @@ -564,7 +562,7 @@ //Mask /obj/item/clothing/mask name = "mask" - icon = 'icons/obj/clothing/masks.dmi' + icon = 'icons/inventory/face/item.dmi' item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_masks.dmi', slot_r_hand_str = 'icons/mob/items/righthand_masks.dmi', @@ -574,10 +572,10 @@ body_parts_covered = FACE|EYES blood_sprite_state = "maskblood" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/masks.dmi', - SPECIES_VOX = 'icons/mob/species/vox/masks.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/mask.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/mask.dmi', + SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/face/mob_vox.dmi', + SPECIES_TAJ = 'icons/inventory/face/mob_tajaran.dmi', + SPECIES_UNATHI = 'icons/inventory/face/mob_unathi.dmi', SPECIES_GREY_YW = 'icons/mob/species/grey/mask.dmi'/*ywedit*/ ) @@ -600,7 +598,7 @@ //Shoes /obj/item/clothing/shoes name = "shoes" - icon = 'icons/obj/clothing/shoes.dmi' + icon = 'icons/inventory/feet/item.dmi' item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_shoes.dmi', slot_r_hand_str = 'icons/mob/items/righthand_shoes.dmi', @@ -629,8 +627,8 @@ var/overshoes = 0 species_restricted = list("exclude",SPECIES_TESHARI, SPECIES_VOX) sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/shoes.dmi', - SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi' + SPECIES_TESHARI = 'icons/inventory/feet/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/feet/mob_vox.dmi' ) drop_sound = 'sound/items/drop/shoes.ogg' pickup_sound = 'sound/items/pickup/shoes.ogg' @@ -730,7 +728,7 @@ /////////////////////////////////////////////////////////////////////// //Suit /obj/item/clothing/suit - icon = 'icons/obj/clothing/suits.dmi' + icon = 'icons/inventory/suit/item.dmi' item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_suits.dmi', slot_r_hand_str = 'icons/mob/items/righthand_suits.dmi', @@ -752,34 +750,18 @@ sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi', - SPECIES_VOX = 'icons/mob/species/vox/suit.dmi' + SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi' ) valid_accessory_slots = (ACCESSORY_SLOT_OVER | ACCESSORY_SLOT_ARMBAND) restricted_accessory_slots = (ACCESSORY_SLOT_ARMBAND) -/obj/item/clothing/suit/set_clothing_index() - ..() - - if(index && !icon_override) - icon = new /icon("icons/obj/clothing/suits_[index].dmi") - item_icons = list( - slot_l_hand_str = new /icon("icons/mob/items/lefthand_suits_[index].dmi"), - slot_r_hand_str = new /icon("icons/mob/items/righthand_suits_[index].dmi"), - ) - - return 1 - - return 0 - /obj/item/clothing/suit/update_clothing_icon() if (ismob(src.loc)) var/mob/M = src.loc M.update_inv_wear_suit() - set_clothing_index() - /obj/item/clothing/suit/equipped(var/mob/user, var/slot) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -820,7 +802,7 @@ /////////////////////////////////////////////////////////////////////// //Under clothing /obj/item/clothing/under - icon = 'icons/obj/clothing/uniforms.dmi' + icon = 'icons/inventory/uniform/item.dmi' item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_uniforms.dmi', slot_r_hand_str = 'icons/mob/items/righthand_uniforms.dmi', @@ -846,8 +828,8 @@ var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled var/rolled_sleeves = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/uniform.dmi', - SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi', + SPECIES_TESHARI = 'icons/inventory/uniform/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/uniform/mob_vox.dmi', SPECIES_GREY_YW = 'icons/mob/species/grey/uniform.dmi'/*YWedit*/ ) @@ -874,8 +856,8 @@ |ACCESSORY_SLOT_DEPT\ |ACCESSORY_SLOT_OVER) - var/icon/rolled_down_icon = 'icons/mob/uniform_rolled_down.dmi' - var/icon/rolled_down_sleeves_icon = 'icons/mob/uniform_sleeves_rolled.dmi' + var/icon/rolled_down_icon = 'icons/inventory/uniform/mob_rolled_down.dmi' + var/icon/rolled_down_sleeves_icon = 'icons/inventory/uniform/mob_sleeves_rolled.dmi' /obj/item/clothing/under/attack_hand(var/mob/user) if(LAZYLEN(accessories)) @@ -895,7 +877,7 @@ //autodetect rollability if(rolled_down < 0) - if(("[worn_state]_d_s" in cached_icon_states(icon)) || ("[worn_state]_s" in cached_icon_states(rolled_down_icon)) || ("[worn_state]_d_s" in cached_icon_states(icon_override))) + if(("[worn_state]_d" in cached_icon_states(icon)) || (worn_state in cached_icon_states(rolled_down_icon)) || ("[worn_state]_d" in cached_icon_states(icon_override))) rolled_down = 0 if(rolled_down == -1) @@ -903,23 +885,6 @@ if(rolled_sleeves == -1) verbs -= /obj/item/clothing/under/verb/rollsleeves -/obj/item/clothing/under/set_clothing_index() - ..() - - if(index && !icon_override) - icon = new /icon("icons/obj/clothing/uniforms_[index].dmi") - - item_icons = list( - slot_l_hand_str = new /icon("icons/mob/items/lefthand_uniforms_[index].dmi"), - slot_r_hand_str = new /icon("icons/mob/items/righthand_uniforms_[index].dmi"), - ) - - rolled_down_icon = new /icon("icons/mob/uniform_rolled_down_[index].dmi") - rolled_down_sleeves_icon = new /icon("icons/mob/uniform_sleeves_rolled_[index].dmi") - return 1 - - return 0 - /obj/item/clothing/under/proc/update_rolldown_status() var/mob/living/carbon/human/H if(istype(src.loc, /mob/living/carbon/human)) @@ -932,11 +897,11 @@ under_icon = sprite_sheets[H.species.get_bodytype(H)] else if(item_icons && item_icons[slot_w_uniform_str]) under_icon = item_icons[slot_w_uniform_str] - else if ("[worn_state]_s" in cached_icon_states(rolled_down_icon)) + else if (worn_state in cached_icon_states(rolled_down_icon)) under_icon = rolled_down_icon // The _s is because the icon update procs append it. - if((under_icon == rolled_down_icon && ("[worn_state]_s" in cached_icon_states(under_icon))) || ("[worn_state]_d_s" in cached_icon_states(under_icon))) + if((under_icon == rolled_down_icon && ("[worn_state]" in cached_icon_states(under_icon))) || ("[worn_state]_d" in cached_icon_states(under_icon))) if(rolled_down != 1) rolled_down = 0 else @@ -955,13 +920,13 @@ under_icon = sprite_sheets[H.species.get_bodytype(H)] else if(item_icons && item_icons[slot_w_uniform_str]) under_icon = item_icons[slot_w_uniform_str] - else if ("[worn_state]_s" in cached_icon_states(rolled_down_sleeves_icon)) + else if (worn_state in cached_icon_states(rolled_down_sleeves_icon)) under_icon = rolled_down_sleeves_icon - else if(index) - under_icon = new /icon("[INV_W_UNIFORM_DEF_ICON]_[index].dmi") + else + under_icon = new /icon(INV_W_UNIFORM_DEF_ICON) // The _s is because the icon update procs append it. - if((under_icon == rolled_down_sleeves_icon && ("[worn_state]_s" in cached_icon_states(under_icon))) || ("[worn_state]_r_s" in cached_icon_states(under_icon))) + if((under_icon == rolled_down_sleeves_icon && ("[worn_state]" in cached_icon_states(under_icon))) || ("[worn_state]_r" in cached_icon_states(under_icon))) if(rolled_sleeves != 1) rolled_sleeves = 0 else @@ -1044,9 +1009,9 @@ if(rolled_down) body_parts_covered = initial(body_parts_covered) body_parts_covered &= ~(UPPER_TORSO|ARMS) - if("[worn_state]_s" in cached_icon_states(rolled_down_icon)) + if(worn_state in cached_icon_states(rolled_down_icon)) icon_override = rolled_down_icon - item_state_slots[slot_w_uniform_str] = "[worn_state]" + item_state_slots[slot_w_uniform_str] = worn_state else item_state_slots[slot_w_uniform_str] = "[worn_state]_d" @@ -1055,7 +1020,7 @@ body_parts_covered = initial(body_parts_covered) if(icon_override == rolled_down_icon) icon_override = initial(icon_override) - item_state_slots[slot_w_uniform_str] = "[worn_state]" + item_state_slots[slot_w_uniform_str] = worn_state to_chat(usr, "You roll up your [src].") update_clothing_icon() @@ -1077,9 +1042,9 @@ rolled_sleeves = !rolled_sleeves if(rolled_sleeves) body_parts_covered &= ~(ARMS) - if("[worn_state]_s" in cached_icon_states(rolled_down_sleeves_icon)) + if(worn_state in cached_icon_states(rolled_down_sleeves_icon)) icon_override = rolled_down_sleeves_icon - item_state_slots[slot_w_uniform_str] = "[worn_state]" + item_state_slots[slot_w_uniform_str] = worn_state else item_state_slots[slot_w_uniform_str] = "[worn_state]_r" to_chat(usr, "You roll up your [src]'s sleeves.") @@ -1087,7 +1052,7 @@ body_parts_covered = initial(body_parts_covered) if(icon_override == rolled_down_sleeves_icon) icon_override = initial(icon_override) - item_state_slots[slot_w_uniform_str] = "[worn_state]" + item_state_slots[slot_w_uniform_str] = worn_state to_chat(usr, "You roll down your [src]'s sleeves.") update_clothing_icon() diff --git a/code/modules/clothing/clothing_icons.dm b/code/modules/clothing/clothing_icons.dm index 1762d09201..c28d60a9ff 100644 --- a/code/modules/clothing/clothing_icons.dm +++ b/code/modules/clothing/clothing_icons.dm @@ -10,12 +10,6 @@ bloodsies.color = blood_color standing.add_overlay(bloodsies) -//UNIFORM: Always appends "_s" to iconstate, stupidly. -/obj/item/clothing/under/get_worn_icon_state(var/slot_name) - var/state2use = ..() - state2use += "_s" - return state2use - //HELMET: May have a lighting overlay /obj/item/clothing/head/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0,var/icon/clip_mask = null) var/image/standing = ..() diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index e6935a30e9..0005755270 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -5,9 +5,9 @@ var/list/inside_emotes = list() var/recent_squish = 0 sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/shoes.dmi', - SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/feet.dmi') + SPECIES_TESHARI = 'icons/inventory/feet/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/feet/mob_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/feet/mob_werebeast.dmi') /obj/item/clothing/shoes/New() inside_emotes = list( @@ -85,14 +85,14 @@ /obj/item/clothing/gloves sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/gloves.dmi', - SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/hands.dmi') + SPECIES_TESHARI = 'icons/inventory/hands/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/hands/mob_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/hands/mob_werebeast.dmi') /obj/item/clothing/ears sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/ears.dmi') + SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi', + SPECIES_WEREBEAST = 'icons/inventory/ears/mob_werebeast.dmi') /obj/item/clothing/relaymove(var/mob/living/user,var/direction) @@ -119,7 +119,7 @@ //Mask /obj/item/clothing/mask name = "mask" - icon = 'icons/obj/clothing/masks_vr.dmi' // This is intentional because of our custom species. + icon = 'icons/inventory/face/item_vr.dmi' // This is intentional because of our custom species. item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_masks.dmi', slot_r_hand_str = 'icons/mob/items/righthand_masks.dmi', @@ -128,40 +128,40 @@ slot_flags = SLOT_MASK body_parts_covered = FACE|EYES item_icons = list( - slot_wear_mask_str = 'icons/mob/mask_vr.dmi' + slot_wear_mask_str = 'icons/inventory/face/mob_vr.dmi' ) sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/masks_vr.dmi', - SPECIES_VOX = 'icons/mob/species/vox/masks.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/mask_vr.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/mask_vr.dmi', - SPECIES_SERGAL = 'icons/mob/species/sergal/mask_vr.dmi', - SPECIES_NEVREAN = 'icons/mob/species/nevrean/mask_vr.dmi', - SPECIES_ZORREN_HIGH = 'icons/mob/species/fox/mask_vr.dmi', - SPECIES_ZORREN_FLAT = 'icons/mob/species/fennec/mask_vr.dmi', - SPECIES_AKULA = 'icons/mob/species/akula/mask_vr.dmi', - SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/mask.dmi', - SPECIES_XENOCHIMERA = 'icons/mob/species/tajaran/mask_vr.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/masks.dmi', - SPECIES_GREY_YW = 'icons/mob/species/grey/mask.dmi'/*ywedit*/ + SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/face/mob_vox.dmi', + SPECIES_TAJ = 'icons/inventory/face/mob_tajaran.dmi', + SPECIES_UNATHI = 'icons/inventory/face/mob_unathi.dmi', + SPECIES_SERGAL = 'icons/inventory/face/mob_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/face/mob_nevrean.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/face/mob_fox.dmi', + SPECIES_ZORREN_FLAT = 'icons/inventory/face/mob_fennec.dmi', + SPECIES_AKULA = 'icons/inventory/face/mob_akula.dmi', + SPECIES_VULPKANIN = 'icons/inventory/face/mob_vulpkanin.dmi', + SPECIES_XENOCHIMERA = 'icons/inventory/face/mob_tajaran.dmi', + SPECIES_WEREBEAST = 'icons/inventory/face/mob_werebeast.dmi', + SPECIES_GREY_YW = 'icons/inventory/face/mob_grey.dmi'/*ywedit*/ ) -//"Spider" = 'icons/mob/species/spider/mask_vr.dmi' Add this later when they have custom mask sprites and everything. +//"Spider" = 'icons/inventory/mask/mob_spider.dmi' Add this later when they have custom mask sprites and everything. //Switch to taur sprites if a taur equips /obj/item/clothing/suit sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi', - SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi') + SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/suit/mob_werebeast.dmi') /obj/item/clothing/under sensor_mode = 3 var/sensorpref = 5 sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/uniform.dmi', - SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/uniform.dmi', - SPECIES_GREY_YW = 'icons/mob/species/grey/uniform.dmi'/*ywedit*/ + SPECIES_TESHARI = 'icons/inventory/uniform/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/uniform/mob_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/uniform/mob_werebeast.dmi', + SPECIES_GREY_YW = 'icons/inventory/uniform/mob_grey.dmi'/*ywedit*/ ) /obj/item/clothing/under/New(var/mob/living/carbon/human/H) @@ -179,6 +179,6 @@ /obj/item/clothing/head sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', - SPECIES_VOX = 'icons/mob/species/vox/head.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi') + SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/head/mob_werebeast.dmi') diff --git a/code/modules/clothing/ears/earrings.dm b/code/modules/clothing/ears/earrings.dm index 154f69f44a..82746980bd 100644 --- a/code/modules/clothing/ears/earrings.dm +++ b/code/modules/clothing/ears/earrings.dm @@ -2,7 +2,7 @@ /obj/item/clothing/ears/earring name = "earring" desc = "An earring of some kind." - icon = 'icons/obj/clothing/ears.dmi' + icon = 'icons/inventory/ears/item.dmi' /obj/item/clothing/ears/earring/stud name = "pearl stud earrings" diff --git a/code/modules/clothing/ears/ears.dm b/code/modules/clothing/ears/ears.dm index 07e74d7321..99f9b00912 100644 --- a/code/modules/clothing/ears/ears.dm +++ b/code/modules/clothing/ears/ears.dm @@ -43,7 +43,7 @@ /obj/item/clothing/ears/skrell name = "skrell tentacle wear" desc = "Some stuff worn by skrell to adorn their head tentacles." - icon = 'icons/obj/clothing/ears.dmi' + icon = 'icons/inventory/ears/item.dmi' w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS species_restricted = list(SPECIES_SKRELL) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 61df668692..f6f457a4d5 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -13,7 +13,7 @@ BLIND // can't see anything /obj/item/clothing/glasses name = "glasses" - icon = 'icons/obj/clothing/glasses.dmi' + icon = 'icons/inventory/eyes/item.dmi' w_class = ITEMSIZE_SMALL slot_flags = SLOT_EYES plane_slots = list(slot_glasses) @@ -31,8 +31,8 @@ BLIND // can't see anything pickup_sound = 'sound/items/pickup/accessory.ogg' sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/eyes.dmi', - SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi' + SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi' ) /obj/item/clothing/glasses/update_clothing_icon() diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index aa0335ddf3..2a01488a63 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -64,8 +64,8 @@ /obj/item/clothing/glasses/graviton/medgravpatch name = "medical graviton eyepatch" desc = "A graviton eyepatch with a medical overlay." - icon = 'icons/obj/clothing/glasses_vr.dmi' - icon_override = 'icons/mob/eyes_vr.dmi' + icon = 'icons/inventory/eyes/item_vr.dmi' + icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "medgravpatch" item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") action_button_name = "Toggle Eyepatch" @@ -77,8 +77,8 @@ /obj/item/clothing/glasses/tajblind name = "embroidered veil" desc = "An Tajaran made veil that allows the user to see while obscuring their eyes." - icon = 'icons/obj/clothing/glasses_vr.dmi' - icon_override = 'icons/mob/eyes_vr.dmi' + icon = 'icons/inventory/eyes/item_vr.dmi' + icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "tajblind" item_state = "tajblind" prescription = 1 @@ -87,8 +87,8 @@ /obj/item/clothing/glasses/hud/health/tajblind name = "lightweight veil" desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an installed medical HUD." - icon = 'icons/obj/clothing/glasses_vr.dmi' - icon_override = 'icons/mob/eyes_vr.dmi' + icon = 'icons/inventory/eyes/item_vr.dmi' + icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "tajblind_med" item_state = "tajblind_med" body_parts_covered = EYES @@ -96,8 +96,8 @@ /obj/item/clothing/glasses/sunglasses/sechud/tajblind name = "sleek veil" desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an in-built security HUD." - icon = 'icons/obj/clothing/glasses_vr.dmi' - icon_override = 'icons/mob/eyes_vr.dmi' + icon = 'icons/inventory/eyes/item_vr.dmi' + icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "tajblind_sec" item_state = "tajblind_sec" prescription = 1 @@ -106,8 +106,8 @@ /obj/item/clothing/glasses/meson/prescription/tajblind name = "industrial veil" desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has installed mesons." - icon = 'icons/obj/clothing/glasses_vr.dmi' - icon_override = 'icons/mob/eyes_vr.dmi' + icon = 'icons/inventory/eyes/item_vr.dmi' + icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "tajblind_meson" item_state = "tajblind_meson" off_state = "tajblind" @@ -116,8 +116,8 @@ /obj/item/clothing/glasses/material/prescription/tajblind name = "mining veil" desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an installed material scanner." - icon = 'icons/obj/clothing/glasses_vr.dmi' - icon_override = 'icons/mob/eyes_vr.dmi' + icon = 'icons/inventory/eyes/item_vr.dmi' + icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "tajblind_meson" item_state = "tajblind_meson" off_state = "tajblind" @@ -125,8 +125,8 @@ /obj/item/clothing/glasses sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/eyes.dmi', - SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/eyes.dmi', + SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/eyes/mob_werebeast.dmi', SPECIES_GREY_YW = 'icons/mob/species/grey/eyes.dmi'/*ywedit*/ ) diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm index c5ea5d5044..6093034dd1 100644 --- a/code/modules/clothing/glasses/hud_vr.dm +++ b/code/modules/clothing/glasses/hud_vr.dm @@ -116,8 +116,8 @@ /obj/item/clothing/glasses/omnihud/visor name = "AR visor" desc = "The VZR-AR are a product based upon the classic AR Glasses, just more fashionable." - icon_override = 'icons/mob/eyes_vr.dmi' - icon = 'icons/mob/eyes_vr.dmi' + icon_override = 'icons/inventory/eyes/mob_vr.dmi' + icon = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "visor_CIV" item_state = "visor_CIV" diff --git a/code/modules/clothing/gloves/arm_guards_vr.dm b/code/modules/clothing/gloves/arm_guards_vr.dm index 00f78dcc5d..69b3bee05d 100644 --- a/code/modules/clothing/gloves/arm_guards_vr.dm +++ b/code/modules/clothing/gloves/arm_guards_vr.dm @@ -2,5 +2,5 @@ name = "imperial gauntlets" desc = "Made of some exotic metal, and crafted by space elves. Elves have delicate hands." icon_state = "ge_gloves" - icon = 'icons/obj/clothing/gloves_vr.dmi' - icon_override = 'icons/mob/hands_vr.dmi' \ No newline at end of file + icon = 'icons/inventory/hands/item_vr.dmi' + icon = 'icons/inventory/hands/mob_vr.dmi' \ No newline at end of file diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 4b410163fe..bb4e035196 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -10,8 +10,8 @@ desc = "an ultra rare hat. It commands a certain respect." icon_state = "petehat" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', - SPECIES_VOX = 'icons/mob/species/vox/head.dmi' + SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi' ) /obj/item/clothing/head/collectable/slime diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index cf0527c6a6..bbe3f21b44 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -172,8 +172,8 @@ icon_state = "swathelm" item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat") sprite_sheets = list( - SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi', + SPECIES_TAJ = 'icons/inventory/head/mob_tajaran.dmi', + SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi', ) armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) diff --git a/code/modules/clothing/head/helmet_vr.dm b/code/modules/clothing/head/helmet_vr.dm index 6f36aef383..53e9c581af 100644 --- a/code/modules/clothing/head/helmet_vr.dm +++ b/code/modules/clothing/head/helmet_vr.dm @@ -11,30 +11,30 @@ desc = "If you wanna to keep your brain inside yo' head, you'd best put this on!" icon_state = "unsc_helm" item_state = "unsc_helm" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' /obj/item/clothing/head/helmet/combat/imperial name = "imperial soldier helmet" desc = "Veni, vidi, vici; I came, I saw, I conquered." icon_state = "ge_helm" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' /obj/item/clothing/head/helmet/combat/imperial/centurion name = "imperial centurion helmet" desc = "Vendi, vidi, visa; I came, I saw, I realised this hat was too expensive." icon_state = "ge_helmcent" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' // Armor Versions Here /obj/item/clothing/head/helmet/combat/crusader name = "crusader helmet" desc = "ye olde armored helmet" icon_state = "crusader" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/obj/clothing/hats_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/item_vr.dmi' armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 2 @@ -42,8 +42,8 @@ name = "bedevere's helmet" desc = "ye olde armored helmet" icon_state = "bedevere_helmet" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/obj/clothing/hats_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/item_vr.dmi' armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) tint = TINT_HEAVY siemens_coefficient = 2 @@ -90,8 +90,8 @@ name = "crusader costume helmet" desc = "ye olde armored helmet" icon_state = "crusader" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/obj/clothing/hats_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/item_vr.dmi' armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 1 @@ -99,8 +99,8 @@ name = "bedevere's costume helmet" desc = "ye olde armored helmet" icon_state = "bedevere_helmet" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/obj/clothing/hats_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/item_vr.dmi' armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) tint = TINT_HEAVY siemens_coefficient = 1 diff --git a/code/modules/clothing/head/hood_vr.dm b/code/modules/clothing/head/hood_vr.dm index c1de0bafc3..906bc98b02 100644 --- a/code/modules/clothing/head/hood_vr.dm +++ b/code/modules/clothing/head/hood_vr.dm @@ -32,5 +32,5 @@ /obj/item/clothing/head/hood/winter/talon name = "ITV winter hood" desc = "A cozy winter hood attached to a heavy winter jacket." - icon_override = 'icons/mob/head_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' icon_state = "winterhood_talon" \ No newline at end of file diff --git a/code/modules/clothing/head/jobs_vr.dm b/code/modules/clothing/head/jobs_vr.dm index 19a3a8163d..d77ff798ba 100644 --- a/code/modules/clothing/head/jobs_vr.dm +++ b/code/modules/clothing/head/jobs_vr.dm @@ -2,7 +2,7 @@ name = "Type-34C Semi-Enclosed Headwear" desc = "Civilian model of a popular helmet used by certain law enforcement agencies. It does not have any armor plating, but has a neo-laminated fiber lining." icon_state = "cyberpunkgoggle" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' flags_inv = HIDEEARS|HIDEEYES|BLOCKHAIR \ No newline at end of file diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 780333ae7e..d096eb5883 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -186,10 +186,10 @@ /obj/item/clothing/head/kitty/update_icon(var/mob/living/carbon/human/user) if(!istype(user)) return - var/icon/ears = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty") + var/icon/ears = new/icon("icon" = 'icons/inventory/head/mob.dmi', "icon_state" = "kitty") ears.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD) - var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner") + var/icon/earbit = new/icon("icon" = 'icons/inventory/head/mob.dmi', "icon_state" = "kittyinner") ears.Blend(earbit, ICON_OVERLAY) /obj/item/clothing/head/richard diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm index 991afd077e..22008602da 100644 --- a/code/modules/clothing/head/misc_vr.dm +++ b/code/modules/clothing/head/misc_vr.dm @@ -5,23 +5,23 @@ name = "fish skull" desc = "You... you're not actually going to wear that, right?" icon_state = "fishskull" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' flags_inv = HIDEEARS|BLOCKHAIR /obj/item/clothing/head/crown name = "crown" desc = "How regal!" icon_state = "crown" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' /obj/item/clothing/head/fancy_crown name = "fancy crown" desc = "How extraordinarily regal!" icon_state = "fancycrown" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' /obj/item/clothing/head/shiny_hood icon_override = 'icons/mob/modular_shiny_vr.dmi' @@ -51,8 +51,8 @@ /obj/item/clothing/head/pelt name = "Bear pelt" desc = "A luxurious bear pelt, good to keep warm in winter. Or to sleep through winter." - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' icon_state = "bearpelt_brown" item_state = "bearpelt_brown" @@ -92,16 +92,16 @@ name = "pizza delivery visor" desc = "A fancy visor showing alignment to pizza delivery service. Extremely risky career choice." icon_state = "pizzadelivery" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' //////////TALON HATS////////// /obj/item/clothing/head/soft/talon name = "ITV baseball cap" desc = "It's a ballcap bearing the colors of ITV." - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' icon_state = "talonsoft" item_state = "talonsoft" item_state_slots = list(slot_r_hand_str = "blacksoft", slot_l_hand_str = "blacksoft") @@ -109,23 +109,23 @@ /obj/item/clothing/head/caphat/talon name = "ITV nautical hat" desc = "It's a classic nautical hat bearing the colors of ITV. Perfect for commanding the Talon." - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' icon_state = "talon_captain_cap" item_state = "taloncaptaincap" /obj/item/clothing/head/beret/talon name = "ITV beret" desc = "It's a basic baret colored to match ITV's uniforms." - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' icon_state = "beret_talon" item_state = "baret_talon" /obj/item/clothing/head/beret/talon/command name = "ITV officer beret" desc = "It's a basic baret colored to match ITV's uniforms with a badge pinned on the front. Perfect for commanders." - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' icon_state = "beret_talon_officer" item_state = "baret_talon_command" \ No newline at end of file diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm index 519f7cd1a7..f2c3956e47 100644 --- a/code/modules/clothing/head/pilot_helmet.dm +++ b/code/modules/clothing/head/pilot_helmet.dm @@ -6,7 +6,7 @@ icon_state = "pilot_helmet1" item_icons = list(slot_head_str = 'icons/mob/pilot_helmet.dmi') sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/pilot_helmet.dmi' + SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi' ) flags = THICKMATERIAL armor = list(melee = 20, bullet = 10, laser = 10, energy = 5, bomb = 10, bio = 0, rad = 0) diff --git a/code/modules/clothing/head/pilot_helmet_vr.dm b/code/modules/clothing/head/pilot_helmet_vr.dm index 55afe6f713..26557b2ca3 100644 --- a/code/modules/clothing/head/pilot_helmet_vr.dm +++ b/code/modules/clothing/head/pilot_helmet_vr.dm @@ -2,7 +2,7 @@ /obj/item/clothing/head/pilot_vr name = "standard pilot helmet" desc = "Standard pilot gear. Protects the head from impacts. This one has a retractable visor" - icon = 'icons/obj/clothing/helmets_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' icon_state = "pilot1" armor = list(melee = 20, bullet = 10, laser = 10, energy = 5, bomb = 10, bio = 0, rad = 0) flags_inv = HIDEEARS @@ -11,9 +11,9 @@ heat_protection = HEAD max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE w_class = ITEMSIZE_NORMAL - item_icons = list(slot_head_str = 'icons/mob/head_vr.dmi') + item_icons = list(slot_head_str = 'icons/inventory/head/mob_vr.dmi') sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi' + SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi' ) action_button_name = "Toggle Visor" @@ -30,9 +30,9 @@ name = "colored pilot helmet" desc = "A colored version of the standard pilot helmet. Protects the head from impacts. This one has a retractable visor" icon_state = "pilot2" - item_icons = list(slot_head_str = 'icons/mob/head_vr.dmi') + item_icons = list(slot_head_str = 'icons/inventory/head/mob_vr.dmi') sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi' + SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi' ) action_button_name = "Toggle Visor" @@ -51,9 +51,9 @@ name = "ITV pilot helmet" desc = "An ITV version of the standard pilot helmet. Protects the head from impacts. This one has a retractable visor" icon_state = "pilot3" - item_icons = list(slot_head_str = 'icons/mob/head_vr.dmi') + item_icons = list(slot_head_str = 'icons/inventory/head/mob_vr.dmi') sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi' + SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi' ) action_button_name = "Toggle Visor" diff --git a/code/modules/clothing/masks/gasmask_vr.dm b/code/modules/clothing/masks/gasmask_vr.dm index 81b9f7ced0..cdc7d52e0c 100644 --- a/code/modules/clothing/masks/gasmask_vr.dm +++ b/code/modules/clothing/masks/gasmask_vr.dm @@ -6,15 +6,15 @@ // Since we changed the gas mask sprite, if we want the old one for some reason use this. /obj/item/clothing/mask/gas/wwii - icon = 'icons/obj/clothing/masks.dmi' - icon_override = 'icons/mob/mask.dmi' + icon = 'icons/inventory/face/item.dmi' + icon_override = 'icons/inventory/face/mob.dmi' flags_inv = HIDEEARS|HIDEEYES|HIDEFACE /obj/item/clothing/mask/gas/imperial name = "imperial soldier facemask" desc = "A close-fitting tactical mask that can be connected to an air supply." icon_state = "ge_visor" - icon = 'icons/obj/clothing/masks_vr.dmi' - icon_override = 'icons/mob/mask_vr.dmi' + icon = 'icons/inventory/face/item_vr.dmi' + icon_override = 'icons/inventory/face/mob_vr.dmi' body_parts_covered = FACE|EYES flags_inv = HIDEEARS|HIDEEYES|HIDEFACE \ No newline at end of file diff --git a/code/modules/clothing/rings/material.dm b/code/modules/clothing/rings/material.dm index 3607b6bc8a..218065b253 100644 --- a/code/modules/clothing/rings/material.dm +++ b/code/modules/clothing/rings/material.dm @@ -1,7 +1,7 @@ ///////////////////////////////////////// //Material Rings /obj/item/clothing/gloves/ring/material - icon = 'icons/obj/clothing/rings.dmi' + icon = 'icons/inventory/hands/item.dmi' icon_state = "material" /obj/item/clothing/gloves/ring/material/New(var/newloc, var/new_material) diff --git a/code/modules/clothing/rings/rings_vr.dm b/code/modules/clothing/rings/rings_vr.dm index 56c72cc7c5..45306a7acc 100644 --- a/code/modules/clothing/rings/rings_vr.dm +++ b/code/modules/clothing/rings/rings_vr.dm @@ -1,7 +1,7 @@ /obj/item/clothing/gloves/ring/wedding name = "golden wedding ring" desc = "For showing your devotion to another person. It has a golden glimmer to it." - icon = 'icons/obj/clothing/gloves_vr.dmi' + icon = 'icons/inventory/hands/item_vr.dmi' icon_state = "wedring_g" item_state = "wedring_g" var/partnername = "" diff --git a/code/modules/clothing/shoes/boots_vr.dm b/code/modules/clothing/shoes/boots_vr.dm index 4c62209499..9f2f044f70 100644 --- a/code/modules/clothing/shoes/boots_vr.dm +++ b/code/modules/clothing/shoes/boots_vr.dm @@ -2,5 +2,5 @@ name = "hoofboots" desc = "A pair of high-heeled boots with hooves on the front of the soles, for use with a hobby horse or to disguise your footprints." icon_state = "hoofboots" - icon = 'icons/obj/clothing/shoes_vr.dmi' - icon_override = 'icons/mob/feet_vr.dmi' \ No newline at end of file + icon = 'icons/inventory/feet/item_vr.dmi' + icon_override = 'icons/inventory/feet/mob_vr.dmi' \ No newline at end of file diff --git a/code/modules/clothing/shoes/leg_guards_vr.dm b/code/modules/clothing/shoes/leg_guards_vr.dm index 52903bafa5..5000ef6670 100644 --- a/code/modules/clothing/shoes/leg_guards_vr.dm +++ b/code/modules/clothing/shoes/leg_guards_vr.dm @@ -2,5 +2,5 @@ name = "imperial leg guards" desc = "Good for Roman around." icon_state = "ge_boots" - icon = 'icons/obj/clothing/shoes_vr.dmi' - icon_override = 'icons/mob/feet_vr.dmi' \ No newline at end of file + icon = 'icons/inventory/feet/item_vr.dmi' + icon_override = 'icons/inventory/feet/mob_vr.dmi' \ No newline at end of file diff --git a/code/modules/clothing/shoes/miscellaneous_vr.dm b/code/modules/clothing/shoes/miscellaneous_vr.dm index 9e68be33dd..0e7accaa34 100644 --- a/code/modules/clothing/shoes/miscellaneous_vr.dm +++ b/code/modules/clothing/shoes/miscellaneous_vr.dm @@ -3,16 +3,16 @@ desc = "A pair of costume boots fashioned after bird talons." icon_state = "griffinboots" item_state = "griffinboots" - icon = 'icons/obj/clothing/shoes_vr.dmi' - icon_override = 'icons/mob/feet_vr.dmi' + icon = 'icons/inventory/feet/item_vr.dmi' + icon_override = 'icons/inventory/feet/mob_vr.dmi' /obj/item/clothing/shoes/bhop name = "jump boots" desc = "A specialized pair of combat boots with a built-in propulsion system for rapid foward movement." icon_state = "jetboots" item_state = "jetboots" - icon = 'icons/obj/clothing/shoes_vr.dmi' - icon_override = 'icons/mob/feet_vr.dmi' + icon = 'icons/inventory/feet/item_vr.dmi' + icon_override = 'icons/inventory/feet/mob_vr.dmi' // resistance_flags = FIRE_PROOF action_button_name = "Activate Jump Boots" permeability_coefficient = 0.05 @@ -44,8 +44,8 @@ /obj/item/clothing/shoes/magboots/adv name = "advanced magboots" desc = "Advanced magnetic boots for a trained user. They have a lower magnetic force, allowing the user to move more quickly." - icon = 'icons/obj/clothing/shoes_vr.dmi' - icon_override = 'icons/mob/feet_vr.dmi' + icon = 'icons/inventory/feet/item_vr.dmi' + icon_override = 'icons/inventory/feet/mob_vr.dmi' icon_state = "advmag0" item_flags = PHORONGUARD @@ -66,8 +66,8 @@ desc = "A pair of olde knight boots." icon_state = "knight_boots1" item_state = "knight_boots1" - icon = 'icons/obj/clothing/shoes_vr.dmi' - icon_override = 'icons/obj/clothing/shoes_vr.dmi' + icon = 'icons/inventory/feet/item_vr.dmi' + icon_override = 'icons/inventory/feet/item_vr.dmi' armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/shoes/knight/black @@ -82,8 +82,8 @@ desc = "A pair of olde knight boots." icon_state = "knight_boots1" item_state = "knight_boots1" - icon = 'icons/obj/clothing/shoes_vr.dmi' - icon_override = 'icons/obj/clothing/shoes_vr.dmi' + icon = 'icons/inventory/feet/item_vr.dmi' + icon_override = 'icons/inventory/feet/item_vr.dmi' /obj/item/clothing/shoes/knight_costume/black name = "knight boots" diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 3c1843698c..600e89a82c 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -11,11 +11,11 @@ cold_protection = HEAD|FACE|EYES light_range = 4 sprite_sheets = list( - SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_VOX = 'icons/mob/species/vox/head.dmi', - SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi' + SPECIES_TAJ = 'icons/inventory/head/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi', + SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi' ) species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them max_pressure_protection = null @@ -54,10 +54,10 @@ resilience = 0.2 can_breach = 1 sprite_sheets = list( - SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi', - SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', - SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' + SPECIES_TAJ = 'icons/inventory/suit/mob_tajaran.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', + SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi' ) supporting_limbs = list() species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm index 0975109b8c..7f37bf826b 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm @@ -1,38 +1,36 @@ /obj/item/clothing/head/helmet/space/rig sprite_sheets = list( - SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_AKULA = 'icons/mob/species/akula/helmet_vr.dmi', - SPECIES_SERGAL = 'icons/mob/species/sergal/helmet_vr.dmi', - SPECIES_NEVREAN = 'icons/mob/species/sergal/helmet_vr.dmi', - SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet.dmi', - SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet.dmi', - SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet.dmi', - SPECIES_PROMETHEAN = 'icons/mob/species/skrell/helmet.dmi', - SPECIES_VOX = 'icons/mob/species/vox/head.dmi', - SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', - SPECIES_GREY_YW = 'icons/mob/species/grey/helmet.dmi' /*ywedit*/ + SPECIES_TAJ = 'icons/inventory/head/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/head/mob_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/head/mob_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/head/mob_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/head/mob_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/head/mob_vulpkanin.dmi', + SPECIES_PROMETHEAN = 'icons/inventory/head/mob_skrell.dmi', + SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi', + SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi', + SPECIES_GREY_YW = 'icons/inventory/head/mob_grey.dmi' /*ywedit*/ ) - - /obj/item/clothing/suit/space/rig sprite_sheets = list( - SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi', - SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit.dmi', - SPECIES_AKULA = 'icons/mob/species/akula/suit_vr.dmi', - SPECIES_SERGAL = 'icons/mob/species/sergal/suit_vr.dmi', - SPECIES_NEVREAN = 'icons/mob/species/sergal/suit_vr.dmi', - SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit.dmi', - SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit.dmi', - SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit.dmi', - SPECIES_PROMETHEAN = 'icons/mob/species/skrell/suit.dmi', - SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', - SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' + SPECIES_TAJ = 'icons/inventory/suit/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/suit/mob_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/mob_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/suit/mob_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_PROMETHEAN = 'icons/inventory/suit/mob_skrell.dmi', + SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', + SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi' ) /obj/item/clothing/head/helmet/space/rig diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index dbc1e34709..56f69bda52 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -74,7 +74,7 @@ name = "talons" species_restricted = list(SPECIES_VOX) sprite_sheets = list( - SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi' + SPECIES_VOX = 'icons/inventory/feet/mob_vox.dmi' ) /obj/item/clothing/suit/space/rig/vox @@ -84,7 +84,7 @@ siemens_coefficient = 0 species_restricted = list(SPECIES_VOX) sprite_sheets = list( - SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi' + SPECIES_VOX = 'icons/inventory/hands/mob_vox.dmi' ) /obj/item/weapon/rig/vox/carapace diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index b67b11fab8..ed51525e25 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -37,7 +37,7 @@ verbs |= /obj/item/clothing/head/helmet/space/proc/toggle_camera if(type == /obj/item/clothing/head/helmet/space) //VOREStation edit - use the specially refitted sprites by KBraid. Done this way to avoid breaking subtypes. - sprite_sheets[SPECIES_TESHARI] = 'icons/mob/species/teshari/helmet_vr.dmi' + sprite_sheets[SPECIES_TESHARI] = 'icons/inventory/head/mob_vr_teshari.dmi' /obj/item/clothing/head/helmet/space/proc/toggle_camera() set name = "Toggle Helmet Camera" @@ -68,8 +68,7 @@ /obj/item/clothing/suit/space name = "Space suit" desc = "A suit that protects against low pressure environments." - icon = 'icons/obj/clothing/spacesuits.dmi' - update_icon_define = INV_SPACESUIT_DEF_ICON + icon = 'icons/inventory/suit/item.dmi' icon_state = "space" w_class = ITEMSIZE_HUGE // So you can't fit this in your bag and be prepared at all times. gas_transfer_coefficient = 0.01 @@ -95,7 +94,7 @@ /obj/item/clothing/suit/space/Initialize() . = ..() if(type == /obj/item/clothing/suit/space) - sprite_sheets[SPECIES_TESHARI] = 'icons/mob/species/teshari/suit_vr.dmi' + sprite_sheets[SPECIES_TESHARI] = 'icons/inventory/suit/mob_vr_teshari.dmi' // aAAAaaAAAAA //VOREStation edit end. /obj/item/clothing/suit/space/equipped(mob/M) diff --git a/code/modules/clothing/spacesuits/void/ert_vr.dm b/code/modules/clothing/spacesuits/void/ert_vr.dm index c771132f18..d49e4da8d9 100644 --- a/code/modules/clothing/spacesuits/void/ert_vr.dm +++ b/code/modules/clothing/spacesuits/void/ert_vr.dm @@ -7,7 +7,8 @@ slowdown = 0.5 siemens_coefficient = 0.5 species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI) //this thing can autoadapt - icon = 'icons/obj/clothing/suits_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' w_class = ITEMSIZE_NORMAL //the mark vii packs itself down when not in use, thanks future-materials breach_threshold = 16 //Extra Thicc resilience = 0.05 //Military Armor @@ -109,7 +110,8 @@ species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI) //this thing can autoadapt too armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100) siemens_coefficient = 0.5 - icon = 'icons/obj/clothing/hats_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED) var/away_planes = null plane_slots = list(slot_head) @@ -166,75 +168,75 @@ /obj/item/clothing/suit/space/void/responseteam sprite_sheets = list( - SPECIES_HUMAN = 'icons/mob/spacesuit_vr.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/suit_vr.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/suit_vr.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/suit_vr.dmi', - SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit_vr.dmi', - SPECIES_AKULA = 'icons/mob/species/akula/suit_vr.dmi', - SPECIES_SERGAL = 'icons/mob/species/sergal/suit_vr.dmi', - SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit_vr.dmi', - SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit_vr.dmi', - SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit_vr.dmi', - SPECIES_SHADEKIN_CREW = 'icons/mob/species/vulpkanin/suit_vr.dmi', - SPECIES_VASILISSAN = 'icons/mob/spacesuit_vr.dmi', - SPECIES_NEVREAN = 'icons/mob/spacesuit_vr.dmi', - SPECIES_RAPALA = 'icons/mob/spacesuit_vr.dmi', - SPECIES_ALRAUNE = 'icons/mob/spacesuit_vr.dmi', - SPECIES_ZADDAT = 'icons/mob/spacesuit_vr.dmi' + SPECIES_HUMAN = 'icons/inventory/suit/mob_vr.dmi', + SPECIES_TAJ = 'icons/inventory/suit/mob_vr_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/mob_vr_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/mob_vr_unathi.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_vr_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/suit/mob_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/mob_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', + SPECIES_SHADEKIN_CREW = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', + SPECIES_VASILISSAN = 'icons/inventory/suit/mob_vr.dmi', + SPECIES_NEVREAN = 'icons/inventory/suit/mob_vr.dmi', + SPECIES_RAPALA = 'icons/inventory/suit/mob_vr.dmi', + SPECIES_ALRAUNE = 'icons/inventory/suit/mob_vr.dmi', + SPECIES_ZADDAT = 'icons/inventory/suit/mob_vr.dmi' ) sprite_sheets_obj = list( - SPECIES_TAJ = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_SKRELL = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_UNATHI = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_XENOHYBRID = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_AKULA = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_SERGAL = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_VULPKANIN = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_ZORREN_HIGH = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_FENNEC = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_SHADEKIN_CREW = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_VASILISSAN = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_NEVREAN = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_RAPALA = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_ALRAUNE = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_ZADDAT = 'icons/obj/clothing/suits_vr.dmi' + SPECIES_TAJ = 'icons/inventory/suit/item_vr.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/item_vr.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/item_vr.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/item_vr.dmi', + SPECIES_AKULA = 'icons/inventory/suit/item_vr.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/item_vr.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/item_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item_vr.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/item_vr.dmi', + SPECIES_SHADEKIN_CREW = 'icons/inventory/suit/item_vr.dmi', + SPECIES_VASILISSAN = 'icons/inventory/suit/item_vr.dmi', + SPECIES_NEVREAN = 'icons/inventory/suit/item_vr.dmi', + SPECIES_RAPALA = 'icons/inventory/suit/item_vr.dmi', + SPECIES_ALRAUNE = 'icons/inventory/suit/item_vr.dmi', + SPECIES_ZADDAT = 'icons/inventory/suit/item_vr.dmi' ) /obj/item/clothing/head/helmet/space/void/responseteam sprite_sheets = list( - SPECIES_HUMAN = 'icons/mob/head_vr.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/helmet_vr.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/helmet_vr.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/helmet_vr.dmi', - SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet_vr.dmi', - SPECIES_AKULA = 'icons/mob/species/unathi/helmet_vr.dmi', - SPECIES_SERGAL = 'icons/mob/species/unathi/helmet_vr.dmi', - SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet_vr.dmi', - SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet_vr.dmi', - SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet_vr.dmi', - SPECIES_SHADEKIN_CREW = 'icons/mob/species/vulpkanin/helmet_vr.dmi', - SPECIES_VASILISSAN = 'icons/mob/head_vr.dmi', - SPECIES_NEVREAN = 'icons/mob/head_vr.dmi', - SPECIES_RAPALA = 'icons/mob/head_vr.dmi', - SPECIES_ALRAUNE = 'icons/mob/head_vr.dmi', - SPECIES_ZADDAT = 'icons/mob/head_vr.dmi' + SPECIES_HUMAN = 'icons/inventory/head/mob_vr.dmi', + SPECIES_TAJ = 'icons/inventory/head/mob_vr_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/head/mob_vr_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/head/mob_vr_unathi.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/head/mob_vr_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/head/mob_vr_unathi.dmi', + SPECIES_SERGAL = 'icons/inventory/head/mob_vr_unathi.dmi', + SPECIES_VULPKANIN = 'icons/inventory/head/mob_vr_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vr_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/head/mob_vr_vulpkanin.dmi', + SPECIES_SHADEKIN_CREW = 'icons/inventory/head/mob_vulpkanin.dmi', + SPECIES_VASILISSAN = 'icons/inventory/head/mob_vr.dmi', + SPECIES_NEVREAN = 'icons/inventory/head/mob_vr.dmi', + SPECIES_RAPALA = 'icons/inventory/head/mob_vr.dmi', + SPECIES_ALRAUNE = 'icons/inventory/head/mob_vr.dmi', + SPECIES_ZADDAT = 'icons/inventory/head/mob_vr.dmi' ) sprite_sheets_obj = list( - SPECIES_TAJ = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_SKRELL = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_UNATHI = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_XENOHYBRID = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_AKULA = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_SERGAL = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_VULPKANIN = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_ZORREN_HIGH = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_FENNEC = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_SHADEKIN_CREW = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_VASILISSAN = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_NEVREAN = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_RAPALA = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_ALRAUNE = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_ZADDAT = 'icons/obj/clothing/hats_vr.dmi' + SPECIES_TAJ = 'icons/inventory/head/item_vr.dmi', + SPECIES_SKRELL = 'icons/inventory/head/item_vr.dmi', + SPECIES_UNATHI = 'icons/inventory/head/item_vr.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/head/item_vr.dmi', + SPECIES_AKULA = 'icons/inventory/head/item_vr.dmi', + SPECIES_SERGAL = 'icons/inventory/head/item_vr.dmi', + SPECIES_VULPKANIN = 'icons/inventory/head/item_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/head/item_vr.dmi', + SPECIES_FENNEC = 'icons/inventory/head/item_vr.dmi', + SPECIES_SHADEKIN_CREW = 'icons/inventory/head/item_vr.dmi', + SPECIES_VASILISSAN = 'icons/inventory/head/item_vr.dmi', + SPECIES_NEVREAN = 'icons/inventory/head/item_vr.dmi', + SPECIES_RAPALA = 'icons/inventory/head/item_vr.dmi', + SPECIES_ALRAUNE = 'icons/inventory/head/item_vr.dmi', + SPECIES_ZADDAT = 'icons/inventory/head/item_vr.dmi' ) sprite_sheets_refit = list() //have to nullify this as well just to be thorough \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void/military_vr.dm b/code/modules/clothing/spacesuits/void/military_vr.dm index 94355ba9c4..8eb7ff9ebd 100644 --- a/code/modules/clothing/spacesuits/void/military_vr.dm +++ b/code/modules/clothing/spacesuits/void/military_vr.dm @@ -31,8 +31,8 @@ icon_state = "rig0-odst" item_state = "rig0-odst" item_state_slots = null - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' light_overlay = "helmet_light_dual" species_restricted = null @@ -40,9 +40,9 @@ name = "\improper Ace's ODST Helmet" icon = 'icons/obj/custom_items.dmi' icon_state = "rig0-odst_ace" - desc = "Etched under the inner visor is the phrase \"Don’t let your past define you; let it mold you into the person you want to be.\"" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi'*/ + desc = "Etched under the inner visor is the phrase \"Don�t let your past define you; let it mold you into the person you want to be.\"" + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi'*/ /obj/item/clothing/suit/space/void/merc/odst name = "ODST Armor" @@ -50,8 +50,8 @@ icon_state = "odst" item_state = "odst" item_state_slots = null - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' species_restricted = null breach_threshold = 16 //Extra Thicc resilience = 0.05 //Military Armor diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 430727921b..ebf63f2f87 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -204,16 +204,16 @@ /obj/item/clothing/head/helmet/space/void/medical/alt sprite_sheets = list( - SPECIES_HUMAN = 'icons/mob/head.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi' - ) + SPECIES_HUMAN = 'icons/inventory/head/mob.dmi', + SPECIES_TAJ = 'icons/inventory/head/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi' + ) sprite_sheets_obj = list( - SPECIES_TAJ = 'icons/obj/clothing/hats.dmi', - SPECIES_SKRELL = 'icons/obj/clothing/hats.dmi', - SPECIES_UNATHI = 'icons/obj/clothing/hats.dmi' - ) + SPECIES_TAJ = 'icons/inventory/head/item.dmi', + SPECIES_SKRELL = 'icons/inventory/head/item.dmi', + SPECIES_UNATHI = 'icons/inventory/head/item.dmi' + ) /obj/item/clothing/head/helmet/space/void/medical/alt/tesh name = "streamlined teshari medical voidsuit helmet" @@ -223,10 +223,10 @@ /obj/item/clothing/head/helmet/space/void/medical/alt/tesh sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi' + SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi' ) sprite_sheets_obj = list( - SPECIES_TESHARI = 'icons/obj/clothing/hats.dmi' + SPECIES_TESHARI = 'icons/inventory/head/item.dmi' ) /obj/item/clothing/suit/space/void/medical/alt @@ -240,15 +240,15 @@ /obj/item/clothing/suit/space/void/medical/alt sprite_sheets = list( - SPECIES_HUMAN = 'icons/mob/spacesuit.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi' + SPECIES_HUMAN = 'icons/inventory/suit/mob.dmi', + SPECIES_TAJ = 'icons/inventory/suit/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi' ) sprite_sheets_obj = list( - SPECIES_TAJ = 'icons/obj/clothing/spacesuits.dmi', - SPECIES_SKRELL = 'icons/obj/clothing/spacesuits.dmi', - SPECIES_UNATHI = 'icons/obj/clothing/spacesuits.dmi' + SPECIES_TAJ = 'icons/inventory/suit/item.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/item.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/item.dmi' ) /obj/item/clothing/suit/space/void/medical/alt/tesh @@ -259,10 +259,10 @@ /obj/item/clothing/suit/space/void/medical/alt/tesh sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' + SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi' ) sprite_sheets_obj = list( - SPECIES_TESHARI = 'icons/obj/clothing/spacesuits.dmi' + SPECIES_TESHARI = 'icons/inventory/suit/item.dmi' ) //Security diff --git a/code/modules/clothing/spacesuits/void/station_vr.dm b/code/modules/clothing/spacesuits/void/station_vr.dm index 0684095afb..0c35f5a62b 100644 --- a/code/modules/clothing/spacesuits/void/station_vr.dm +++ b/code/modules/clothing/spacesuits/void/station_vr.dm @@ -1,49 +1,49 @@ /obj/item/clothing/head/helmet/space/void/medical/alt sprite_sheets = list( - SPECIES_HUMAN = 'icons/mob/head.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_AKULA = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_SERGAL = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet.dmi', - SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet.dmi', - SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet.dmi' + SPECIES_HUMAN = 'icons/inventory/head/mob.dmi', + SPECIES_TAJ = 'icons/inventory/head/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_SERGAL = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_VULPKANIN = 'icons/inventory/head/mob_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/head/mob_vulpkanin.dmi' ) sprite_sheets_obj = list( - SPECIES_TAJ = 'icons/obj/clothing/hats.dmi', - SPECIES_SKRELL = 'icons/obj/clothing/hats.dmi', - SPECIES_UNATHI = 'icons/obj/clothing/hats.dmi', - SPECIES_XENOHYBRID = 'icons/obj/clothing/hats.dmi', - SPECIES_AKULA = 'icons/obj/clothing/hats.dmi', - SPECIES_SERGAL = 'icons/obj/clothing/hats.dmi', - SPECIES_VULPKANIN = 'icons/obj/clothing/hats.dmi', - SPECIES_ZORREN_HIGH = 'icons/obj/clothing/hats.dmi', - SPECIES_FENNEC = 'icons/obj/clothing/hats.dmi' + SPECIES_TAJ = 'icons/inventory/head/item.dmi', + SPECIES_SKRELL = 'icons/inventory/head/item.dmi', + SPECIES_UNATHI = 'icons/inventory/head/item.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/head/item.dmi', + SPECIES_AKULA = 'icons/inventory/head/item.dmi', + SPECIES_SERGAL = 'icons/inventory/head/item.dmi', + SPECIES_VULPKANIN = 'icons/inventory/head/item.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/head/item.dmi', + SPECIES_FENNEC = 'icons/inventory/head/item.dmi' ) /obj/item/clothing/suit/space/void/medical/alt sprite_sheets = list( - SPECIES_HUMAN = 'icons/mob/spacesuit.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi', - SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit.dmi', - SPECIES_AKULA = 'icons/mob/species/akula/suit_vr.dmi', - SPECIES_SERGAL = 'icons/mob/species/sergal/suit_vr.dmi', - SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit.dmi', - SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit.dmi', - SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit.dmi' + SPECIES_HUMAN = 'icons/inventory/suit/mob.dmi', + SPECIES_TAJ = 'icons/inventory/suit/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/suit/mob_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/mob_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/mob_vulpkanin.dmi' ) sprite_sheets_obj = list( - SPECIES_TAJ = 'icons/obj/clothing/spacesuits.dmi', - SPECIES_SKRELL = 'icons/obj/clothing/spacesuits.dmi', - SPECIES_UNATHI = 'icons/obj/clothing/spacesuits.dmi', - SPECIES_XENOHYBRID = 'icons/obj/clothing/spacesuits.dmi', - SPECIES_AKULA = 'icons/obj/clothing/spacesuits.dmi', - SPECIES_SERGAL = 'icons/obj/clothing/spacesuits.dmi', - SPECIES_VULPKANIN = 'icons/obj/clothing/spacesuits.dmi', - SPECIES_ZORREN_HIGH = 'icons/obj/clothing/spacesuits.dmi', - SPECIES_FENNEC = 'icons/obj/clothing/spacesuits.dmi' + SPECIES_TAJ = 'icons/inventory/suit/item.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/item.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/item.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/item.dmi', + SPECIES_AKULA = 'icons/inventory/suit/item.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/item.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/item.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/item.dmi' ) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 72d500579a..3d2c6b24d5 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -15,16 +15,16 @@ //Species-specific stuff. species_restricted = list("Human", "Promethean") sprite_sheets_refit = list( - SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi' + SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_TAJ = 'icons/inventory/head/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi' //Teshari have a general sprite sheet defined in modules/clothing/clothing.dm ) sprite_sheets_obj = list( - SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/hats.dmi', - SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/hats.dmi', - SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi', - SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/hats.dmi' + SPECIES_UNATHI = 'icons/inventory/head/item_unathi.dmi', + SPECIES_TAJ = 'icons/inventory/head/item_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/head/item_skrell.dmi', + SPECIES_TESHARI = 'icons/inventory/head/item_teshari.dmi' ) light_overlay = "helmet_light" @@ -45,16 +45,16 @@ species_restricted = list("Human", SPECIES_SKRELL, "Promethean") sprite_sheets_refit = list( - SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi' + SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_TAJ = 'icons/inventory/suit/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi' //Teshari have a general sprite sheet defined in modules/clothing/clothing.dm ) sprite_sheets_obj = list( - SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi', - SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/suits.dmi', - SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi', - SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/suits.dmi' + SPECIES_UNATHI = 'icons/inventory/suit/item_unathi.dmi', + SPECIES_TAJ = 'icons/inventory/suit/item_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/item_skrell.dmi', + SPECIES_TESHARI = 'icons/inventory/suit/item_teshari.dmi' ) //Breach thresholds, should ideally be inherited by most (if not all) voidsuits. diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index c3768e1afb..d0eefd625f 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -8,60 +8,60 @@ /obj/item/clothing/head/helmet/space/void species_restricted = list(SPECIES_HUMAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA) sprite_sheets = list( - SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', - SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_AKULA = 'icons/mob/species/akula/helmet_vr.dmi', - SPECIES_SERGAL = 'icons/mob/species/sergal/helmet_vr.dmi', - SPECIES_NEVREAN = 'icons/mob/species/sergal/helmet_vr.dmi', - SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet.dmi', - SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet.dmi', - SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet.dmi', - SPECIES_GREY_YW = 'icons/mob/species/grey/helmet.dmi' /*ywedit*/ + SPECIES_TAJ = 'icons/inventory/head/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/head/mob_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/head/mob_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/head/mob_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/head/mob_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/head/mob_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/head/mob_vulpkanin.dmi', + SPECIES_GREY_YW = 'icons/inventory/head/mob_grey.dmi' /*ywedit*/ ) sprite_sheets_obj = list( - SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/hats.dmi', // Copied from void.dm - SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi', // Copied from void.dm - SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/hats.dmi', // Copied from void.dm - SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/hats.dmi', // Copied from void.dm - SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/hats.dmi', - SPECIES_AKULA = 'icons/obj/clothing/species/akula/hats.dmi', - SPECIES_SERGAL = 'icons/obj/clothing/species/sergal/hats.dmi', - SPECIES_NEVREAN = 'icons/obj/clothing/species/sergal/hats.dmi', - SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/hats.dmi', - SPECIES_ZORREN_HIGH = 'icons/obj/clothing/species/vulpkanin/hats.dmi', - SPECIES_FENNEC = 'icons/obj/clothing/species/vulpkanin/hats.dmi' + SPECIES_TAJ = 'icons/inventory/head/item_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/head/item_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/head/item_unathi.dmi', + SPECIES_TESHARI = 'icons/inventory/head/item_teshari.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/head/item_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/head/item_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/head/item_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/head/item_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/head/item_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/head/item_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/head/item_vulpkanin.dmi' ) /obj/item/clothing/suit/space/void species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA) sprite_sheets = list( - SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi', - SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi', - SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit.dmi', - SPECIES_AKULA = 'icons/mob/species/akula/suit_vr.dmi', - SPECIES_SERGAL = 'icons/mob/species/sergal/suit_vr.dmi', - SPECIES_NEVREAN = 'icons/mob/species/sergal/suit_vr.dmi', - SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit.dmi', - SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit.dmi', - SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit.dmi' + SPECIES_TAJ = 'icons/inventory/suit/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/suit/mob_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/mob_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/suit/mob_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/mob_vulpkanin.dmi' ) sprite_sheets_obj = list( - SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/suits.dmi', // Copied from void.dm - SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi', // Copied from void.dm - SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi', // Copied from void.dm - SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/suits.dmi', // Copied from void.dm - SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/suits.dmi', - SPECIES_AKULA = 'icons/obj/clothing/species/akula/suits.dmi', - SPECIES_SERGAL = 'icons/obj/clothing/species/sergal/suits.dmi', - SPECIES_NEVREAN = 'icons/obj/clothing/species/sergal/suits.dmi', - SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/suits.dmi', - SPECIES_ZORREN_HIGH = 'icons/obj/clothing/species/vulpkanin/suits.dmi', - SPECIES_FENNEC = 'icons/obj/clothing/species/vulpkanin/suits.dmi' + SPECIES_TAJ = 'icons/inventory/suit/item_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/item_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/item_unathi.dmi', + SPECIES_TESHARI = 'icons/inventory/suit/item_teshari.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/item_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/suit/item_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/item_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/suit/item_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/item_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/item_vulpkanin.dmi' ) // This is a hack to prevent the item_state variable on the suits from taking effect @@ -75,8 +75,8 @@ desc = "Hostile Environiment Cross-Kinetic Helmet: A helmet designed to withstand the wide variety of hazards from \[REDACTED\]. It wasn't enough for its last owner." icon_state = "hostile_env" item_state = "hostile_env" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20) /obj/item/clothing/head/helmet/space/void/heck/Initialize() @@ -97,8 +97,8 @@ desc = "Hostile Environment Cross-Kinetic Suit: A suit designed to withstand the wide variety of hazards from \[REDACTED\]. It wasn't enough for its last owner." icon_state = "hostile_env" item_state = "hostile_env" - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' slowdown = 1.5 armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20) @@ -107,8 +107,8 @@ desc = "A free helmet, gifted you by your new not-quite-corporate master!" icon_state = "syndicate-contract" item_state = "syndicate-contract" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.6 camera_networks = list(NETWORK_MERCENARY) @@ -118,8 +118,8 @@ desc = "A free suit, gifted you by your new not-quite-corporate master!" icon_state = "syndicate-contract" item_state = "syndicate-contract" - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.6 @@ -128,21 +128,21 @@ desc = "From out of space and time, this helmet will protect you while you perform your duties." icon_state = "chronohelmet" item_state = "chronohelmet" - icon = 'icons/obj/clothing/hats_vr.dmi' - icon_override = 'icons/mob/head_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' /obj/item/clothing/suit/space/void/chrono name = "chrono-suit" desc = "From out of space and time, this helmet will protect you while you perform your duties." icon_state = "chronosuit" item_state = "chronosuit" - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' /obj/item/clothing/suit/space/void/autolok name = "AutoLok pressure suit" desc = "A high-tech snug-fitting pressure suit. Fits any species. It offers very little physical protection, but is equipped with sensors that will automatically deploy the integral helmet to protect the wearer." - icon = 'icons/obj/clothing/suits_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' icon_state = "autoloksuit" item_state = "autoloksuit" item_state_slots = list(slot_r_hand_str = "space_suit_syndicate", slot_l_hand_str = "space_suit_syndicate") @@ -152,32 +152,33 @@ species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX) //this thing can autoadapt breach_threshold = 6 //this thing is basically tissue paper w_class = ITEMSIZE_NORMAL //if it's snug, high-tech, and made of relatively soft materials, it should be much easier to store! + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' /obj/item/clothing/suit/space/void/autolok sprite_sheets = list( - SPECIES_HUMAN = 'icons/mob/spacesuit_vr.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/suit_vr.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/suit_vr.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/suit_vr.dmi', - SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit_vr.dmi', - SPECIES_AKULA = 'icons/mob/species/unathi/suit_vr.dmi', - SPECIES_SERGAL = 'icons/mob/species/unathi/suit_vr.dmi', - SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit_vr.dmi', - SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit_vr.dmi', - SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit_vr.dmi', - SPECIES_TESHARI = 'icons/mob/species/teshari/suit_vr.dmi' + SPECIES_HUMAN = 'icons/inventory/suit/mob_vr.dmi', + SPECIES_TAJ = 'icons/inventory/suit/mob_vr_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/mob_vr_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/mob_vr_unathi.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_vr_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/suit/mob_vr_unathi.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/mob_vr_unathi.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', + SPECIES_TESHARI = 'icons/inventory/suit/mob_vr_teshari.dmi' ) sprite_sheets_obj = list( - SPECIES_TAJ = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_SKRELL = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_UNATHI = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_XENOHYBRID = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_AKULA = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_SERGAL = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_VULPKANIN = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_ZORREN_HIGH = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_FENNEC = 'icons/obj/clothing/suits_vr.dmi', - SPECIES_TESHARI = 'icons/obj/clothing/suits_vr.dmi' + SPECIES_TAJ = 'icons/inventory/suit/item_vr.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/item_vr.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/item_vr.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/item_vr.dmi', + SPECIES_AKULA = 'icons/inventory/suit/item_vr.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/item_vr.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/item_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item_vr.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/item_vr.dmi', + SPECIES_TESHARI = 'icons/inventory/suit/item_vr.dmi' ) /obj/item/clothing/suit/space/void/autolok/Initialize() @@ -226,36 +227,37 @@ /obj/item/clothing/head/helmet/space/void/autolok name = "AutoLok pressure helmet" desc = "A rather close-fitting helmet designed to protect the wearer from hazardous conditions. Automatically deploys when the suit's sensors detect an environment that is hazardous to the wearer." + icon = 'icons/inventory/head/item_vr.dmi' icon_state = "autolokhelmet" item_state = "autolokhelmet" species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX) //this thing can autoadapt too - icon = 'icons/obj/clothing/hats_vr.dmi' flags_inv = HIDEEARS|BLOCKHAIR //removed HIDEFACE/MASK/EYES flags so sunglasses or facemasks don't disappear. still gotta have BLOCKHAIR or it'll clip out tho. + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' /obj/item/clothing/head/helmet/space/void/autolok sprite_sheets = list( - SPECIES_HUMAN = 'icons/mob/head_vr.dmi', - SPECIES_TAJ = 'icons/mob/species/tajaran/helmet_vr.dmi', - SPECIES_SKRELL = 'icons/mob/species/skrell/helmet_vr.dmi', - SPECIES_UNATHI = 'icons/mob/species/unathi/helmet_vr.dmi', - SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet_vr.dmi', - SPECIES_AKULA = 'icons/mob/species/unathi/helmet_vr.dmi', - SPECIES_SERGAL = 'icons/mob/species/unathi/helmet_vr.dmi', - SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet_vr.dmi', - SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet_vr.dmi', - SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet_vr.dmi', - SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi' + SPECIES_HUMAN = 'icons/inventory/head/mob_vr.dmi', + SPECIES_TAJ = 'icons/inventory/head/mob_vr_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/head/mob_vr_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/head/mob_vr_unathi.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/head/mob_vr_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/head/mob_vr_unathi.dmi', + SPECIES_SERGAL = 'icons/inventory/head/mob_vr_unathi.dmi', + SPECIES_VULPKANIN = 'icons/inventory/head/mob_vr_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vr_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/head/mob_vr_vulpkanin.dmi', + SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi' ) sprite_sheets_obj = list( - SPECIES_TAJ = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_SKRELL = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_UNATHI = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_XENOHYBRID = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_AKULA = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_SERGAL = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_VULPKANIN = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_ZORREN_HIGH = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_FENNEC = 'icons/obj/clothing/hats_vr.dmi', - SPECIES_TESHARI = 'icons/obj/clothing/hats_vr.dmi' + SPECIES_TAJ = 'icons/inventory/head/item_vr.dmi', + SPECIES_SKRELL = 'icons/inventory/head/item_vr.dmi', + SPECIES_UNATHI = 'icons/inventory/head/item_vr.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/head/item_vr.dmi', + SPECIES_AKULA = 'icons/inventory/head/item_vr.dmi', + SPECIES_SERGAL = 'icons/inventory/head/item_vr.dmi', + SPECIES_VULPKANIN = 'icons/inventory/head/item_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/head/item_vr.dmi', + SPECIES_FENNEC = 'icons/inventory/head/item_vr.dmi', + SPECIES_TESHARI = 'icons/inventory/head/item_vr.dmi' ) sprite_sheets_refit = list() //have to nullify this as well just to be thorough \ No newline at end of file diff --git a/code/modules/clothing/suits/aliens/teshari.dm b/code/modules/clothing/suits/aliens/teshari.dm index 65a19bf8c2..ee3450c64f 100644 --- a/code/modules/clothing/suits/aliens/teshari.dm +++ b/code/modules/clothing/suits/aliens/teshari.dm @@ -2,8 +2,8 @@ /obj/item/clothing/suit/storage/teshari/cloak name = "black cloak" desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets convienently placed inside." - icon = 'icons/mob/species/teshari/teshari_cloak.dmi' - icon_override = 'icons/mob/species/teshari/teshari_cloak.dmi' + icon = 'icons/inventory/suit/item_teshari.dmi' + icon = 'icons/inventory/suit/mob_teshari.dmi' icon_state = "tesh_cloak_bn" item_state = "tesh_cloak_bn" species_restricted = list(SPECIES_TESHARI) @@ -131,10 +131,6 @@ // Job Cloaks -/obj/item/clothing/suit/storage/teshari/cloak/jobs - icon = 'icons/mob/species/teshari/deptcloak.dmi' - icon_override = 'icons/mob/species/teshari/deptcloak.dmi' - /obj/item/clothing/suit/storage/teshari/cloak/jobs/cap name = "facility director cloak" desc = "A soft Teshari cloak made for the Facility Director" @@ -278,16 +274,12 @@ /obj/item/clothing/suit/storage/toggle/labcoat/teshari name = "Teshari labcoat" desc = "A small suit that protects against minor chemical spills. This one is a good fit on Teshari." - icon = 'icons/obj/clothing/species/teshari/suits.dmi' - icon_override = 'icons/mob/species/teshari/suit.dmi' icon_state = "tesh_labcoat" species_restricted = list(SPECIES_TESHARI) /obj/item/clothing/suit/storage/toggle/tesharicoat name = "small black coat" desc = "A coat that seems too small to fit a human." - icon = 'icons/obj/clothing/species/teshari/suits.dmi' - icon_override = 'icons/mob/species/teshari/suit.dmi' icon_state = "tesharicoat" body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS species_restricted = list(SPECIES_TESHARI) @@ -295,8 +287,6 @@ /obj/item/clothing/suit/storage/toggle/tesharicoatwhite name = "small coat" desc = "A coat that seems too small to fit a human." - icon = 'icons/obj/clothing/species/teshari/suits.dmi' - icon_override = 'icons/mob/species/teshari/suit.dmi' icon_state = "tesharicoatwhite" body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS species_restricted = list(SPECIES_TESHARI) @@ -305,8 +295,6 @@ /obj/item/clothing/suit/storage/hooded/teshari name = "Hooded Teshari Cloak" desc = "A soft teshari cloak with an added hood." - icon_override = 'icons/mob/species/teshari/teshari_hood.dmi' - icon = 'icons/mob/species/teshari/teshari_hood.dmi' icon_state = "tesh_hcloak_bo" item_state_slots = list(slot_r_hand_str = "tesh_hcloak_bo", slot_l_hand_str = "tesh_hcloak_bo") body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS @@ -319,8 +307,6 @@ /obj/item/clothing/head/tesh_hood name = "Cloak Hood" desc = "A hood attached to a teshari cloak." - icon_override = 'icons/mob/species/teshari/teshari_hood.dmi' - icon = 'icons/mob/species/teshari/teshari_hood.dmi' icon_state = "tesh_hood_bo" item_state_slots = list(slot_r_hand_str = "tesh_hood_bo", slot_l_hand_str = "tesh_hood_bo") flags_inv = BLOCKHAIR @@ -606,8 +592,6 @@ /obj/item/clothing/suit/storage/teshari/beltcloak name = "belted cloak" desc = "A more ridged and stylized Teshari cloak." - icon = 'icons/mob/species/teshari/teshari_cloak.dmi' - icon_override = 'icons/mob/species/teshari/teshari_cloak.dmi' icon_state = "tesh_beltcloak_bo" item_state = "tesh_beltcloak_bo" species_restricted = list(SPECIES_TESHARI) @@ -739,10 +723,6 @@ item_state = "tesh_beltcloak_brg" //Belted job cloaks -/obj/item/clothing/suit/storage/teshari/beltcloak/jobs - icon = 'icons/mob/species/teshari/deptcloak.dmi' - icon_override = 'icons/mob/species/teshari/deptcloak.dmi' - /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cargo name = "cargo belted cloak" desc = "A soft Teshari cloak made for the Cargo department" diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index ba7afecefb..695b2e21ea 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -61,16 +61,16 @@ name = "marine body armor" desc = "When I joined the Corps, we didn't have any fancy-schmanzy armor. We had sticks! Two sticks, and a rock for the whole platoon-and we had to share the rock!" icon_state = "unsc_armor" - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' body_parts_covered = UPPER_TORSO|LOWER_TORSO // ToDo: Break up the armor into smaller bits. /obj/item/clothing/suit/armor/combat/imperial name = "imperial soldier armor" desc = "Made out of an especially light metal, it lets you conquer in style." icon_state = "ge_armor" - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' body_parts_covered = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/suit/armor/combat/imperial/centurion @@ -79,12 +79,12 @@ icon_state = "ge_armorcent" /obj/item/clothing/suit/storage/vest/wardencoat/alt2 - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' /obj/item/clothing/suit/storage/vest/hoscoat/jensen/alt - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' // Armor Versions Here /obj/item/clothing/suit/armor/combat/crusader diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm index 8d0b6a9c38..47d0bb1274 100644 --- a/code/modules/clothing/suits/hooded_vr.dm +++ b/code/modules/clothing/suits/hooded_vr.dm @@ -5,8 +5,8 @@ /obj/item/clothing/suit/storage/hooded/techpriest name = "tech priest robe" desc = "Praise be to the Omnissiah." - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' icon_state = "techpriest" hoodtype = /obj/item/clothing/head/hood/techpriest armor = list(melee = 20, bullet = 10, laser = 10, energy = 10, bomb = 25, bio = 50, rad = 25) @@ -73,8 +73,8 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/talon name = "ITV winter coat" desc = "A cozy winter coat, covered in thick fur and baring the colors of ITV." - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' icon_state = "taloncoat" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/talon diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 5d5f168096..1119079e2a 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -242,7 +242,7 @@ /obj/item/clothing/suit/suspenders name = "suspenders" desc = "They suspend the illusion of the mime's play." - icon = 'icons/obj/clothing/belts.dmi' + icon = 'icons/inventory/belt/item.dmi' icon_state = "suspenders" blood_overlay_type = "armor" //it's the less thing that I can put here body_parts_covered = 0 diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 2560692656..71cd7e81a6 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -8,7 +8,6 @@ flags_inv = HIDEHOLSTER allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) - index = 1 /obj/item/clothing/suit/storage/toggle/labcoat/red name = "red labcoat" @@ -110,4 +109,3 @@ name = "golden plague doctor suit" desc = "If it worked then, it works now. This classic design comes in gold." icon_state = "plaguedoctor2" - index = 1 diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 0e80d23cb4..a4b59ac612 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -43,7 +43,7 @@ /obj/item/clothing/suit/poncho name = "poncho" desc = "A simple, comfortable poncho." - icon = 'icons/mob/suit.dmi' + icon = 'icons/inventory/suit/mob.dmi' icon_state = "poncho" item_state = "poncho" item_icons = list( @@ -105,9 +105,7 @@ /obj/item/clothing/suit/syndicatefake name = "red space suit replica" - icon = 'icons/obj/clothing/spacesuits.dmi' icon_state = "syndicate" - default_worn_icon = 'icons/mob/spacesuit.dmi' desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" w_class = ITEMSIZE_NORMAL allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/toy) @@ -436,7 +434,6 @@ icon_state = "militaryjacket_tan" item_state_slots = list(slot_r_hand_str = "suit_orange", slot_l_hand_str = "suit_orange") flags_inv = HIDEHOLSTER - index = 1 /obj/item/clothing/suit/storage/miljacket/grey name = "grey military jacket" @@ -444,7 +441,6 @@ icon_state = "militaryjacket_grey" item_state_slots = list(slot_r_hand_str = "suit_grey", slot_l_hand_str = "suit_grey") flags_inv = HIDEHOLSTER - index = 1 /obj/item/clothing/suit/storage/miljacket/navy name = "navy military jacket" @@ -452,7 +448,6 @@ icon_state = "militaryjacket_navy" item_state_slots = list(slot_r_hand_str = "suit_navy", slot_l_hand_str = "suit_navy") flags_inv = HIDEHOLSTER - index = 1 /obj/item/clothing/suit/storage/miljacket/black name = "black military jacket" @@ -460,7 +455,6 @@ icon_state = "militaryjacket_black" item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black") flags_inv = HIDEHOLSTER - index = 1 /obj/item/clothing/suit/storage/miljacket/white name = "white military jacket" @@ -468,7 +462,6 @@ icon_state = "militaryjacket_white" item_state_slots = list(slot_r_hand_str = "med_dep_jacket", slot_l_hand_str = "med_dep_jacket") flags_inv = HIDEHOLSTER - index = 1 /obj/item/clothing/suit/storage/toggle/bomber name = "bomber jacket" diff --git a/code/modules/clothing/suits/miscellaneous_vr.dm b/code/modules/clothing/suits/miscellaneous_vr.dm index 6a6554b51c..34d5d71ac9 100644 --- a/code/modules/clothing/suits/miscellaneous_vr.dm +++ b/code/modules/clothing/suits/miscellaneous_vr.dm @@ -4,16 +4,16 @@ /obj/item/clothing/suit/chiton name = "chiton" desc = "A traditional piece of clothing from Greece." - icon = 'icons/obj/clothing/suits_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' icon_state = "chiton" - icon_override = 'icons/mob/suit_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' /obj/item/clothing/suit/oversize name = "oversized t-shirt" desc = "This ain't your daddy's shirt! Well, it might be..." - icon = 'icons/obj/clothing/suits_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' icon_state = "oversize" - icon_override = 'icons/mob/suit_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' //HERE BE TAUR RELATED CLOTHES @@ -88,16 +88,16 @@ /obj/item/clothing/suit/storage/det_trench/alt name = "sleek modern coat" desc = "A sleek overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside." - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' icon_state = "cyberpunksleek" item_state = "cyberpunksleek" /obj/item/clothing/suit/storage/det_trench/alt2 name = "sleek modern coat (long)" desc = "A sleek long overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside." - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' icon_state = "cyberpunksleek_long" item_state = "cyberpunksleek_long" @@ -105,7 +105,7 @@ /obj/item/clothing/suit/storage/toggle/hoodie/talon name = "ITV hoodie" desc = "A warm, blue sweatshirt bearing ITV markings." - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' icon_state = "talonhoodie" item_state_slots = list(slot_r_hand_str = "suit_blue", slot_l_hand_str = "suit_blue") \ No newline at end of file diff --git a/code/modules/clothing/suits/solgov.dm b/code/modules/clothing/suits/solgov.dm index 73463c002c..a20ce165ee 100644 --- a/code/modules/clothing/suits/solgov.dm +++ b/code/modules/clothing/suits/solgov.dm @@ -1,8 +1,8 @@ //SolGov Uniform Suits /obj/item/clothing/suit/storage/solgov name = "master solgov jacket" - icon = 'icons/obj/clothing/suits_solgov.dmi' - icon_override = 'icons/mob/suit_solgov.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' //Service @@ -262,8 +262,8 @@ desc = "A uniform dress jacket, fancy." icon_state = "blackdress" item_state = "blackdress" - icon = 'icons/obj/clothing/suits_solgov.dmi' - icon_override = 'icons/mob/suit_solgov.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' body_parts_covered = UPPER_TORSO|ARMS armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 @@ -293,8 +293,8 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/solgov name = "\improper SifGuard winter coat" icon_state = "coatec" - icon = 'icons/obj/clothing/suits_solgov.dmi' - icon_override = 'icons/mob/suit_solgov.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' armor = list(melee = 25, bullet = 10, laser = 5, energy = 10, bomb = 20, bio = 0, rad = 10) valid_accessory_slots = (ACCESSORY_SLOT_INSIGNIA|ACCESSORY_SLOT_RANK) @@ -344,8 +344,8 @@ desc = "An Stealth Assault Enterprises . Black and undecorated." icon_state = "terranservice" item_state = "terranservice" - icon = 'icons/obj/clothing/suits_solgov.dmi' - icon_override = 'icons/mob/suit_solgov.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' /obj/item/clothing/suit/storage/saare/service/command name = "SAARE command coat" @@ -360,8 +360,8 @@ desc = "A Stealth Assault Enterprises uniform dress jacket, fancy." icon_state = "terrandress" item_state = "terrandress" - icon = 'icons/obj/clothing/suits_solgov.dmi' - icon_override = 'icons/mob/suit_solgov.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' body_parts_covered = UPPER_TORSO|ARMS armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 0dde614e04..fb1494f4bc 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -103,15 +103,15 @@ /obj/item/clothing/suit/radiation/teshari name = "Small radiation suit" desc = "A specialist suit that protects against radiation, designed specifically for use by Teshari. Made to order by Aether." - icon = 'icons/obj/clothing/species/teshari/suits.dmi' - icon_override = 'icons/mob/species/teshari/suit.dmi' + icon = 'icons/inventory/suit/item_teshari.dmi' + icon_override = 'icons/inventory/suit/mob_teshari.dmi' icon_state = "rad_fitted" species_restricted = list(SPECIES_TESHARI) /obj/item/clothing/head/radiation/teshari name = "Small radiation hood" desc = "A specialist hood with radiation protective properties, designed specifically for use by Teshari. Made to order by Aether." - icon = 'icons/obj/clothing/species/teshari/hats.dmi' - icon_override = 'icons/mob/species/teshari/head.dmi' + icon = 'icons/inventory/suit/item_teshari.dmi' + icon_override = 'icons/inventory/head/mob_teshari.dmi' icon_state = "rad_fitted" species_restricted = list(SPECIES_TESHARI) \ No newline at end of file diff --git a/code/modules/clothing/suits/utility_vr.dm b/code/modules/clothing/suits/utility_vr.dm index 529547469b..b932f6af4b 100644 --- a/code/modules/clothing/suits/utility_vr.dm +++ b/code/modules/clothing/suits/utility_vr.dm @@ -5,8 +5,8 @@ /obj/item/clothing/suit/storage/toggle/paramedic name = "paramedic vest" desc = "A vest that protects against minor chemical spills." - icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' icon_state = "paramedic-vest" item_state = "paramedic-vest" item_state_slots = list(slot_r_hand_str = "blue_labcoat", slot_l_hand_str = "blue_labcoat") @@ -15,18 +15,17 @@ flags_inv = HIDEHOLSTER allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) - index = 1 /obj/item/clothing/head/radiation sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi', - SPECIES_VOX = 'icons/mob/species/vox/head.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi' + SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi', + SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/head/mob_werebeast.dmi' ) /obj/item/clothing/suit/radiation sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/suit_vr.dmi', - SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi' + SPECIES_TESHARI = 'icons/inventory/suit/mob_vr_teshari.dmi', + SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/suit/mob_werebeast.dmi' ) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 290cb32888..30cb8daec8 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -1,7 +1,7 @@ /obj/item/clothing/accessory name = "tie" desc = "A neosilk clip-on tie." - icon = 'icons/obj/clothing/ties.dmi' + icon = 'icons/inventory/accessory/item.dmi' icon_state = "bluetie" item_state_slots = list(slot_r_hand_str = "", slot_l_hand_str = "") appearance_flags = RESET_COLOR // Stops has_suit's color from being multiplied onto the accessory @@ -15,7 +15,7 @@ var/concealed_holster = 0 var/mob/living/carbon/human/wearer = null // To check if the wearer changes, so species spritesheets change properly. var/list/on_rolled = list() // Used when jumpsuit sleevels are rolled ("rolled" entry) or it's rolled down ("down"). Set to "none" to hide in those states. - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ties.dmi') //Teshari can into webbing, too! + sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/accessory/mob_teshari.dmi') //Teshari can into webbing, too! drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' @@ -360,7 +360,7 @@ /obj/item/clothing/accessory/bracelet name = "bracelet" desc = "A simple silver bracelet with a clasp." - icon = 'icons/obj/clothing/ties.dmi' + icon = 'icons/inventory/accessory/item.dmi' icon_state = "bracelet" w_class = ITEMSIZE_TINY slot_flags = SLOT_TIE diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index b64ad331fa..ea35860168 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -6,15 +6,15 @@ name = "plain choker" slot_flags = SLOT_TIE | SLOT_OCLOTHING desc = "A simple, plain choker. Or maybe it's a collar? Use in-hand to customize it." - icon = 'icons/obj/clothing/ties_vr.dmi' - icon_override = 'icons/mob/ties_vr.dmi' + icon = 'icons/inventory/accessory/item_vr.dmi' + icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "choker_cst" item_state = "choker_cst" overlay_state = "choker_cst" var/customized = 0 var/icon_previous_override sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/ties_vr.dmi' + SPECIES_TESHARI = 'icons/inventory/accessory/mob_vr_teshari.dmi' ) //Forces different sprite sheet on equip @@ -58,14 +58,14 @@ /obj/item/clothing/accessory/collar slot_flags = SLOT_TIE | SLOT_OCLOTHING - icon = 'icons/obj/clothing/ties_vr.dmi' - icon_override = 'icons/mob/ties_vr.dmi' + icon = 'icons/inventory/accessory/item_vr.dmi' + icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "collar_blk" var/writtenon = 0 var/icon_previous_override sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/ties_vr.dmi' - ) + SPECIES_TESHARI = 'icons/inventory/accessory/mob_vr_teshari.dmi' + ) //Forces different sprite sheet on equip /obj/item/clothing/accessory/collar/New() @@ -360,8 +360,8 @@ desc = "A silver medal awarded to a group which has demonstrated exceptional teamwork to achieve a notable feat." /obj/item/clothing/accessory/medal/silver/unity/tabiranth - icon = 'icons/obj/clothing/ties_vr.dmi' - icon_override = 'icons/mob/ties_vr.dmi' + icon = 'icons/inventory/accessory/item_vr.dmi' + icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "silverthree" item_state = "silverthree" overlay_state = "silverthree" @@ -370,8 +370,8 @@ /obj/item/clothing/accessory/talon name = "ITV pin" desc = "A collectable enamel pin that resembles ITV's company logo." - icon = 'icons/obj/clothing/ties_vr.dmi' - icon_override = 'icons/mob/ties_vr.dmi' + icon = 'icons/inventory/accessory/item_vr.dmi' + icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "talon_pin" item_state = "talonpin" overlay_state = "talonpin" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 79a603b9aa..b4e748713f 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -397,7 +397,7 @@ /obj/item/clothing/accessory/armor/helmcover name = "helmet cover" desc = "A fabric cover for armored helmets." - icon_override = 'icons/mob/ties.dmi' + icon_override = 'icons/inventory/accessory/mob.dmi' icon = 'icons/obj/clothing/modular_armor.dmi' icon_state = "helmcover_blue" slot = ACCESSORY_SLOT_HELM_C diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index dcd59bdd77..19fde8809b 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -48,7 +48,7 @@ desc = "A simple, comfortable poncho." icon_state = "classicponcho" item_state = "classicponcho" - icon_override = 'icons/mob/ties.dmi' + icon_override = 'icons/inventory/accessory/mob.dmi' var/fire_resist = T0C+100 allowed = list(/obj/item/weapon/tank/emergency/oxygen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) @@ -58,7 +58,7 @@ w_class = ITEMSIZE_NORMAL slot = ACCESSORY_SLOT_OVER sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' + SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi' ) @@ -76,9 +76,9 @@ var/mob/living/carbon/human/H = loc if(istype(H) && H.wear_suit == src) if(H.species.name == SPECIES_TESHARI) - icon_override = 'icons/mob/species/teshari/suit.dmi' + icon_override = 'icons/inventory/suit/mob_teshari.dmi' else - icon_override = 'icons/mob/ties.dmi' + icon_override = 'icons/inventory/accessory/mob.dmi' update_clothing_icon() /obj/item/clothing/accessory/poncho/dropped() //Resets the override to prevent the wrong .dmi from being used because equipped only triggers when wearing ponchos as suits. @@ -272,7 +272,7 @@ desc = "For some classy, murderous fun." icon_state = "vest" item_state = "vest" - icon_override = 'icons/mob/ties.dmi' + icon_override = 'icons/inventory/accessory/mob.dmi' item_state_slots = list(slot_r_hand_str = "wcoat", slot_l_hand_str = "wcoat") allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) @@ -323,7 +323,7 @@ /obj/item/clothing/accessory/sweater name = "sweater" desc = "A warm knit sweater." - icon_override = 'icons/mob/ties.dmi' + icon_override = 'icons/inventory/accessory/mob.dmi' icon_state = "sweater" slot_flags = SLOT_OCLOTHING | SLOT_TIE body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS diff --git a/code/modules/clothing/under/accessories/holster_vr.dm b/code/modules/clothing/under/accessories/holster_vr.dm index f99e798faa..8cd7681dd9 100644 --- a/code/modules/clothing/under/accessories/holster_vr.dm +++ b/code/modules/clothing/under/accessories/holster_vr.dm @@ -6,11 +6,11 @@ /obj/item/clothing/accessory/holster/machete/rapier name = "rapier sheath" desc = "A beautiful red sheath, probably for a beautiful blade." - icon = 'icons/obj/clothing/ties_vr.dmi' + icon = 'icons/inventory/accessory/item_vr.dmi' icon_state = "sheath" slot_flags = SLOT_BELT|ACCESSORY_SLOT_WEAPON var/has_full_icon = 1 - icon_override = 'icons/mob/ties_vr.dmi' + icon_override = 'icons/inventory/accessory/mob_vr.dmi' overlay_state = "sheath" can_hold = list(/obj/item/weapon/melee/rapier) diff --git a/code/modules/clothing/under/imperial_vr.dm b/code/modules/clothing/under/imperial_vr.dm index 9cffdb56fd..855cd0b50c 100644 --- a/code/modules/clothing/under/imperial_vr.dm +++ b/code/modules/clothing/under/imperial_vr.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/imperial desc = "imperial military jumpsuit" - icon = 'icons/obj/clothing/uniforms_vr.dmi' - icon_override = 'icons/mob/uniform_vr.dmi' + icon = 'icons/inventory/uniform/item_vr.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "crimson" item_state = "crimson" \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index f77ec96a54..744c2a55c2 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -164,7 +164,6 @@ desc = "It's made of a special fiber that provides minor protection against biohazards" icon_state = "scrubs" item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white") - index = 1 /obj/item/clothing/under/rank/psych desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 80eba8000d..0f2b43c380 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -357,7 +357,6 @@ name = "maid costume" desc = "Maid in China." icon_state = "maid" - index = 1 /obj/item/clothing/under/dress/maid/janitor name = "maid uniform" @@ -539,38 +538,32 @@ name = "revealing dress" desc = "A very revealing black and blue dress. Is this work appropriate?" icon_state = "revealingdress" - index = 1 /obj/item/clothing/under/dress/gothic name = "gothic dress" desc = "A black dress with a sheer mesh over it, tastefully old school goth." icon_state = "gothic" - index = 1 /obj/item/clothing/under/dress/formalred name = "formal red dress" desc = "A very formal red dress, for those fancy galas." icon_state = "formalred" flags_inv = HIDESHOES - index = 1 /obj/item/clothing/under/dress/pentagram name = "pentagram dress" desc = "A black dress with straps over the chest in the shape of a pentagram." icon_state = "pentagram" - index = 1 /obj/item/clothing/under/dress/yellowswoop name = "yellow swooped dress" desc = "A yellow dress that swoops to the side." icon_state = "yellowswoop" - index = 1 /obj/item/clothing/under/dress/countess name = "countess dress" desc = "A red and black dress fit for a countess." icon_state = "countess" - index = 1 /* * wedding stuff @@ -614,13 +607,11 @@ desc = "A lovely floofed out dress for formal occasions. Comes in many colors!" icon_state = "floofdress" flags_inv = HIDESHOES - index = 1 /obj/item/clothing/under/wedding/whitegown name = "white gown" desc = "A elegant white gown with accents of sheer mesh." icon_state = "whitegown" - index = 1 /* Uniforms and such @@ -643,48 +634,41 @@ Uniforms and such desc = "A cute pink sundress." icon_state = "pinksun" body_parts_covered = UPPER_TORSO|LOWER_TORSO - index = 1 /obj/item/clothing/under/dress/sundress_white name = "white sundress" desc = "A white sundress, it's short." icon_state = "whitesun" body_parts_covered = UPPER_TORSO|LOWER_TORSO - index = 1 /obj/item/clothing/under/dress/sundress_pinkbow name = "bowed pink sundress" desc = "A cute pink sundress with a bow." icon_state = "bowsun" body_parts_covered = UPPER_TORSO|LOWER_TORSO - index = 1 /obj/item/clothing/under/dress/sundress_blue name = "long blue sundress" desc = "A long blue sun dress with white frills towards the bottom." icon_state = "bluesun" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS - index = 1 /obj/item/clothing/under/dress/sundress_pinkshort name = "short pink sundress" desc = "A very short pink sundress, it's more like a chemise." icon_state = "shortpink" body_parts_covered = UPPER_TORSO|LOWER_TORSO - index = 1 /obj/item/clothing/under/dress/twopiece name = "two-piece dress" desc = "A fancy two-piece dress, the pieces are sewn together." icon_state = "twopiece" body_parts_covered = UPPER_TORSO|LOWER_TORSO - index = 1 /obj/item/clothing/under/dress/gothic2 name = "lacey gothic dress" desc = "An elegant gothic dress with lace decorations." icon_state = "gothic2" - index = 1 /obj/item/clothing/under/captainformal name = "site manager's formal uniform" @@ -869,43 +853,36 @@ Uniforms and such name = "ripped punk jeans" desc = "Black ripped jeans and a fishnet top. How punk." icon_state = "rippedpunk" - index = 1 /obj/item/clothing/under/greenasym name = "green asymmetrical jumpsuit" desc = "A green futuristic uniform with asymmetrical pants. Trendy!" icon_state = "greenasym" - index = 1 /obj/item/clothing/under/cyberpunkharness name = "cyberpunk strapped harness" desc = "A cyberpunk styled harness and pants. Perfect for your dystopian future." icon_state = "cyberhell" - index = 1 /obj/item/clothing/under/blackngold name = "black and gold gown" desc = "A black and gold gown. You get the impression this is typically worn for religious purposes." icon_state = "blackngold" - index = 1 /obj/item/clothing/under/sheerblue name = "sheer blue dress" desc = "An entirely sheer blue dress. Best worn with something underneath!" icon_state = "sheerblue" - index = 1 /obj/item/clothing/under/disheveled name = "disheveled suit" desc = "What might pass as well maintained formal attire. If you're blind." icon_state = "disheveled" - index = 1 /obj/item/clothing/under/flower_skirt name = "flower skirt" desc = "A flowery skirt that comes in a variety of colors." icon_state = "flowerskirt" - index = 1 /* * swimsuit diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 577c1cb003..112f45f3ba 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -18,8 +18,8 @@ /obj/item/clothing/under/hyperfiber name = "HYPER jumpsuit" - icon = 'icons/obj/clothing/uniforms_vr.dmi' - icon_override = 'icons/mob/uniform_vr.dmi' + icon = 'icons/inventory/uniform/item_vr.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "hyper" item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_uniforms.dmi', @@ -122,8 +122,8 @@ /obj/item/clothing/under/dress/qipao name = "qipao" desc = "A type of feminine body-hugging dress with distinctive Chinese features of Manchu origin." - icon = 'icons/obj/clothing/uniforms_vr.dmi' - icon_override = 'icons/mob/uniform_vr.dmi' + icon = 'icons/inventory/uniform/item_vr.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "qipao" item_state = "qipao" @@ -140,9 +140,8 @@ /obj/item/clothing/under/pizzaguy name = "pizza delivery uniform" desc = "A dedicated outfit for pizza delivery people, one of most dangerous occupations around these parts. Can be rolled up for extra show of skin." - icon = 'icons/obj/clothing/uniforms_vr.dmi' - index = "vr" - rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi' + icon = 'icons/inventory/uniform/item_vr.dmi' + rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' icon_state = "pizzadelivery" item_state = "pizzadelivery" rolled_down = 0 @@ -152,10 +151,9 @@ /obj/item/clothing/under/rank/talon/basic name = "ITV jumpsuit" desc = "A basic jumpsuit that bares the ITV logo on the breast." - icon = 'icons/obj/clothing/uniforms_vr.dmi' - index = "vr" - rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi' - icon_override = 'icons/mob/uniform_vr.dmi' + icon = 'icons/inventory/uniform/item_vr.dmi' + rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "talon_basic" item_state = "talon_basic" rolled_sleeves = 0 @@ -163,10 +161,9 @@ /obj/item/clothing/under/rank/talon/proper name = "ITV proper jumpsuit" desc = "A neat and proper uniform for a proper company." - icon = 'icons/obj/clothing/uniforms_vr.dmi' - index = "vr" - rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi' - icon_override = 'icons/mob/uniform_vr.dmi' + icon = 'icons/inventory/uniform/item_vr.dmi' + rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "talon_jumpsuit" item_state = "talon_jumpsuit" rolled_sleeves = 0 @@ -174,10 +171,9 @@ /obj/item/clothing/under/rank/talon/security name = "ITV security jumpsuit" desc = "A sleek, streamlined version of ITV's standard jumpsuit that bares security markings." - icon = 'icons/obj/clothing/uniforms_vr.dmi' - index = "vr" - rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi' - icon_override = 'icons/mob/uniform_vr.dmi' + icon = 'icons/inventory/uniform/item_vr.dmi' + rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "talon_security" item_state = "talon_security" rolled_sleeves = 0 @@ -185,10 +181,9 @@ /obj/item/clothing/under/rank/talon/pilot name = "ITV pilot jumpsuit" desc = "A sleek, streamlined version of ITV's standard jumpsuit. Made from cushioned fabric to handle intense flight." - icon = 'icons/obj/clothing/uniforms_vr.dmi' - index = "vr" - rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi' - icon_override = 'icons/mob/uniform_vr.dmi' + icon = 'icons/inventory/uniform/item_vr.dmi' + rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "talon_pilot" item_state = "talon_pilot" rolled_sleeves = 0 @@ -196,10 +191,9 @@ /obj/item/clothing/under/rank/talon/command name = "ITV command jumpsuit" desc = "A commanding jumpsuit fit for a commanding officer." - icon = 'icons/obj/clothing/uniforms_vr.dmi' - index = "vr" - rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi' - icon_override = 'icons/mob/uniform_vr.dmi' + icon = 'icons/inventory/uniform/item_vr.dmi' + rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "talon_captain" item_state = "talon_captain" rolled_sleeves = 0 \ No newline at end of file diff --git a/code/modules/clothing/under/nanotrasen_vr.dm b/code/modules/clothing/under/nanotrasen_vr.dm index 65dee31347..9375efd71e 100644 --- a/code/modules/clothing/under/nanotrasen_vr.dm +++ b/code/modules/clothing/under/nanotrasen_vr.dm @@ -3,9 +3,9 @@ /obj/item/clothing/under/nanotrasen name = "NanoTrasen uniform" desc = "A comfortable turtleneck and black trousers sporting nanotrasen symbols." - icon = 'icons/obj/clothing/uniforms_solgov.dmi' - icon_override = 'icons/mob/uniform_solgov.dmi' - item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi', slot_r_hand_str = "black", slot_l_hand_str = "black") + icon = 'icons/inventory/uniform/item.dmi' + icon_override = 'icons/inventory/uniform/mob.dmi' + item_icons = list(slot_w_uniform_str = 'icons/inventory/uniform/mob.dmi', slot_r_hand_str = "black", slot_l_hand_str = "black") icon_state = "blackutility" worn_state = "blackutility" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 1af0517ab0..035aac4cf8 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -5,7 +5,6 @@ icon_state = "jeans" gender = PLURAL body_parts_covered = LOWER_TORSO|LEGS - index = 1 /obj/item/clothing/under/pants/ripped name = "ripped jeans" diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 0d6516cc8e..d168ddc1eb 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -5,7 +5,6 @@ icon_state = "redshorts" // Hackyfix for icon states until someone wants to come do a recolor later. gender = PLURAL body_parts_covered = LOWER_TORSO - index = 1 /obj/item/clothing/under/shorts/red name = "red athletic shorts" @@ -101,7 +100,6 @@ icon_state = "skirt_short_black" body_parts_covered = LOWER_TORSO rolled_sleeves = -1 - index = 1 /obj/item/clothing/under/skirt/khaki name = "khaki skirt" @@ -168,14 +166,12 @@ desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." icon_state = "qmf" item_state_slots = list(slot_r_hand_str = "qm", slot_l_hand_str = "qm") - index = 1 /obj/item/clothing/under/rank/cargotech/skirt name = "cargo technician's jumpskirt" desc = "Skirrrrrts! They're comfy and easy to wear!" icon_state = "cargof" item_state_slots = list(slot_r_hand_str = "cargo", slot_l_hand_str = "cargo") - index = 1 /obj/item/clothing/under/rank/engineer/skirt desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding." @@ -183,61 +179,51 @@ icon_state = "enginef" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) item_state_slots = list(slot_r_hand_str = "engine", slot_l_hand_str = "engine") - index = 1 /obj/item/clothing/under/rank/chief_engineer/skirt desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding." name = "chief engineer's jumpskirt" icon_state = "chieff" item_state_slots = list(slot_r_hand_str = "chiefengineer", slot_l_hand_str = "chiefengineer") - index = 1 /obj/item/clothing/under/rank/atmospheric_technician/skirt desc = "It's a jumpskirt worn by atmospheric technicians." name = "atmospheric technician's jumpskirt" icon_state = "atmosf" item_state_slots = list(slot_r_hand_str = "atmos", slot_l_hand_str = "atmos") - index = 1 /obj/item/clothing/under/rank/roboticist/skirt desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work." name = "roboticist's jumpskirt" icon_state = "roboticsf" item_state_slots = list(slot_r_hand_str = "robotics", slot_l_hand_str = "robotics") - index = 1 /obj/item/clothing/under/rank/scientist/skirt name = "scientist's jumpskirt" icon_state = "sciencef" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) - index = 1 /obj/item/clothing/under/rank/medical/skirt name = "medical doctor's jumpskirt" icon_state = "medicalf" - index = 1 /obj/item/clothing/under/rank/chemist/skirt name = "chemist's jumpskirt" icon_state = "chemistryf" - index = 1 /obj/item/clothing/under/rank/chief_medical_officer/skirt desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection." name = "chief medical officer's jumpskirt" icon_state = "cmof" - index = 1 /obj/item/clothing/under/rank/geneticist/skirt name = "geneticist's jumpskirt" icon_state = "geneticsf" - index = 1 /obj/item/clothing/under/rank/virologist/skirt name = "virologist's jumpskirt" icon_state = "virologyf" - index = 1 /obj/item/clothing/under/rank/security/skirt name = "security officer's jumpskirt" @@ -245,16 +231,13 @@ icon_state = "securityf" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 - index = 1 /obj/item/clothing/under/rank/warden/skirt desc = "Standard feminine fashion for a Warden. It is made of sturdier material than standard jumpskirts. It has the word \"Warden\" written on the shoulders." name = "warden's jumpskirt" icon_state = "wardenf" - index = 1 /obj/item/clothing/under/rank/head_of_security/skirt desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer." name = "head of security's jumpskirt" icon_state = "hosf" - index = 1 \ No newline at end of file diff --git a/code/modules/clothing/under/solgov.dm b/code/modules/clothing/under/solgov.dm index cd2c111098..5854c006e2 100644 --- a/code/modules/clothing/under/solgov.dm +++ b/code/modules/clothing/under/solgov.dm @@ -4,8 +4,8 @@ /obj/item/clothing/under/solgov name = "master solgov uniform" desc = "You shouldn't be seeing this." - icon = 'icons/obj/clothing/uniforms_solgov.dmi' - item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi') + icon = 'icons/inventory/uniform/item.dmi' + item_icons = list(slot_w_uniform_str = 'icons/inventory/uniform/mob.dmi') rolled_down = 0 rolled_sleeves = 0 armor = list(melee = 5, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 5, rad = 5) @@ -474,8 +474,8 @@ /obj/item/clothing/under/saare name = "master SAARE uniform" desc = "You shouldn't be seeing this." - icon = 'icons/obj/clothing/uniforms_solgov.dmi' - item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi') + icon = 'icons/inventory/uniform/item.dmi' + item_icons = list(slot_w_uniform_str = 'icons/inventory/uniform/mob.dmi') armor = list(melee = 5, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 5, rad = 5) siemens_coefficient = 0.8 diff --git a/code/modules/clothing/under/solgov_vr.dm b/code/modules/clothing/under/solgov_vr.dm index dc2190f991..5bf4ee4bbc 100644 --- a/code/modules/clothing/under/solgov_vr.dm +++ b/code/modules/clothing/under/solgov_vr.dm @@ -56,17 +56,17 @@ /obj/item/clothing/under/solgov/utility/army/olive name = "olive fatigues" - desc = "An olive version of the USDF marine utility uniform, made from durable material." //YW EDIT: TCG to USDF - icon = 'icons/obj/clothing/uniforms_vr.dmi' - icon_override = 'icons/mob/uniform_vr.dmi' + desc = "An olive version of the USDFmarine utility uniform, made from durable material." //YW EDIT: TCG to USDF + icon = 'icons/inventory/uniform/item_vr.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "bdu_olive" item_state = "bdu_olive" /obj/item/clothing/under/solgov/utility/army/desert name = "desert fatigues" desc = "A desert version of the USDF marine utility uniform, made from durable material." //YW EDIT: TCG to USDF - icon = 'icons/obj/clothing/uniforms_vr.dmi' - icon_override = 'icons/mob/uniform_vr.dmi' + icon = 'icons/inventory/uniform/item_vr.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "bdu_olive" item_state = "bdu_olive" diff --git a/code/modules/clothing/under/xenos/teshari.dm b/code/modules/clothing/under/xenos/teshari.dm index 39c3590bf4..5782c9e05e 100644 --- a/code/modules/clothing/under/xenos/teshari.dm +++ b/code/modules/clothing/under/xenos/teshari.dm @@ -1,5 +1,5 @@ /obj/item/clothing/under/teshari - icon = 'icons/obj/clothing/species/teshari/uniform.dmi' + icon = 'icons/inventory/uniform/item_teshari.dmi' icon_state = "seromi_grey" species_restricted = list(SPECIES_TESHARI) @@ -134,8 +134,6 @@ /obj/item/clothing/under/teshari/undercoat name = "Undercoat" desc = "A Teshari traditional garb, with a modern twist! Made of micro and nanofibres to make it light and billowy, perfect for going fast and stylishly!" - icon = 'icons/mob/species/teshari/teshari_uniform.dmi' - icon_override = 'icons/mob/species/teshari/teshari_uniform.dmi' icon_state = "tesh_uniform_bo" item_state = "tesh_uniform_bo" body_parts_covered = UPPER_TORSO|LOWER_TORSO @@ -256,11 +254,6 @@ item_state = "tesh_uniform_brg" //Job Undercoats - -/obj/item/clothing/under/teshari/undercoat/jobs - icon = 'icons/mob/species/teshari/deptjacket.dmi' - icon_override = 'icons/mob/species/teshari/deptjacket.dmi' - /obj/item/clothing/under/teshari/undercoat/jobs/cap name = "facility director undercoat" desc = "A traditional Teshari garb made for the Facility Director" diff --git a/code/modules/integrated_electronics/core/assemblies/clothing.dm b/code/modules/integrated_electronics/core/assemblies/clothing.dm index 98af46f71d..d881d7bd4a 100644 --- a/code/modules/integrated_electronics/core/assemblies/clothing.dm +++ b/code/modules/integrated_electronics/core/assemblies/clothing.dm @@ -156,7 +156,7 @@ name = "electronic earwear" desc = "It's a wearable case for electronics. This one appears to be a technical-looking headset." description_info = "Control-shift-click on this with an item in hand to use it on the integrated circuit." - icon = 'icons/obj/clothing/ears.dmi' + icon = 'icons/inventory/ears/item.dmi' icon_state = "circuitry" item_state = "circuitry" diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 088a7dda78..3848a6c413 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -11,8 +11,8 @@ var/list/holder_mob_icon_cache = list() show_messages = 1 sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', - SPECIES_VOX = 'icons/mob/species/vox/head.dmi' + SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi' ) origin_tech = null diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index e3ca9150f1..57da920cbb 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -16,7 +16,7 @@ var/speech_bubble_appearance = "normal" // Part of icon_state to use for speech bubbles when talking. See talk.dmi for available icons. var/fire_icon_state = "humanoid" // The icon_state used inside OnFire.dmi for when on fire. - var/suit_storage_icon = 'icons/mob/belt_mirror.dmi' // Icons used for worn items in suit storage slot. + var/suit_storage_icon = 'icons/inventory/suit_store/mob.dmi' // Icons used for worn items in suit storage slot. // Damage overlay and masks. var/damage_overlays = 'icons/mob/human_races/masks/dam_human.dmi' diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 29c91da8bf..c1f3a82101 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -85,6 +85,9 @@ /mob/living/simple_mob/protean_blob/speech_bubble_appearance() return "synthetic" +/mob/living/simple_mob/protean_blob/get_available_emotes() + return global._robot_default_emotes + /mob/living/simple_mob/protean_blob/init_vore() return //Don't make a random belly, don't waste your time diff --git a/code/modules/mob/living/carbon/human/species/station/teshari.dm b/code/modules/mob/living/carbon/human/species/station/teshari.dm index 87cc20b6f2..5574436600 100644 --- a/code/modules/mob/living/carbon/human/species/station/teshari.dm +++ b/code/modules/mob/living/carbon/human/species/station/teshari.dm @@ -43,7 +43,7 @@ damage_overlays = 'icons/mob/human_races/masks/dam_teshari.dmi' damage_mask = 'icons/mob/human_races/masks/dam_mask_teshari.dmi' blood_mask = 'icons/mob/human_races/masks/blood_teshari.dmi' - suit_storage_icon = 'icons/mob/species/teshari/belt_mirror.dmi' + suit_storage_icon = 'icons/inventory/suit_store/mob_teshari.dmi' fire_icon_state = "generic" // Humanoid is too big for them and spriting a new one is really annoying. diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 0b77148d30..8ee2eaef44 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -641,11 +641,10 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() var/obj/item/clothing/under/under = w_uniform var/uniform_sprite - - if(under.index) - uniform_sprite = "[INV_W_UNIFORM_DEF_ICON]_[under.index].dmi" + if(istype(under) && !isnull(under.update_icon_define)) + uniform_sprite = under.update_icon_define else - uniform_sprite = "[INV_W_UNIFORM_DEF_ICON].dmi" + uniform_sprite = INV_W_UNIFORM_DEF_ICON //Build a uniform sprite var/icon/c_mask = tail_style?.clip_mask @@ -824,12 +823,10 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() var/obj/item/clothing/suit/suit = wear_suit var/suit_sprite - if(istype(suit) && suit.index) - suit_sprite = "[INV_SUIT_DEF_ICON]_[suit.index].dmi" - else if(istype(suit, /obj/item/clothing) && !isnull(suit.update_icon_define)) + if(istype(suit) && !isnull(suit.update_icon_define)) suit_sprite = suit.update_icon_define else - suit_sprite = "[INV_SUIT_DEF_ICON].dmi" + suit_sprite = INV_SUIT_DEF_ICON var/icon/c_mask = null var/tail_is_rendered = (overlays_standing[TAIL_LAYER] || overlays_standing[TAIL_LAYER_ALT]) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm index a11c85ade8..a94bdb2659 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm @@ -144,7 +144,7 @@ ..() if(hat) var/hat_state = hat.item_state ? hat.item_state : hat.icon_state - var/image/I = image('icons/mob/head.dmi', src, hat_state) + var/image/I = image('icons/inventory/head/mob.dmi', src, hat_state) I.pixel_y = -15 // Sakimm are tiny! I.appearance_flags = RESET_COLOR add_overlay(I) diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index ade53adebc..f210835b18 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -136,7 +136,7 @@ var/list/_slime_default_emotes = list( // Hat simulator. if(hat) var/hat_state = hat.item_state ? hat.item_state : hat.icon_state - var/image/I = image('icons/mob/head.dmi', src, hat_state) + var/image/I = image('icons/inventory/head/mob.dmi', src, hat_state) I.pixel_y = -7 // Slimes are small. I.appearance_flags = RESET_COLOR add_overlay(I) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm index a7ef2c1c8f..178dee3cee 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm @@ -1,6 +1,35 @@ /mob/living/simple_mob/vore mob_class = MOB_CLASS_ANIMAL mob_bump_flag = 0 + var/nameset + +/mob/living/simple_mob/vore/Login() + . = ..() + verbs |= /mob/living/simple_mob/vore/proc/set_name + verbs |= /mob/living/simple_mob/vore/proc/set_desc + +/mob/living/simple_mob/vore/proc/set_name() + set name = "Set Name" + set desc = "Sets your mobs name. You only get to do this once." + set category = "Abilities" + if(nameset) + to_chat(src, "You've already set your name. Ask an admin to toggle \"nameset\" to 0 if you really must.") + return + var/newname + newname = sanitizeSafe(input(src,"Set your name. You only get to do this once. Max 52 chars.", "Name set","") as text, MAX_NAME_LEN) + if (newname) + name = newname + voice_name = newname + nameset = 1 + +/mob/living/simple_mob/vore/proc/set_desc() + set name = "Set Description" + set desc = "Set your description." + set category = "Abilities" + var/newdesc + newdesc = sanitizeSafe(input(src,"Set your description. Max 4096 chars.", "Description set","") as text, MAX_MESSAGE_LEN) + if(newdesc) + desc = newdesc /mob/living/simple_mob/vore/aggressive mob_bump_flag = HEAVY \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm b/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm index 0df61d7277..7934899315 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm @@ -12,6 +12,7 @@ faction = "panther" maxHealth = 150 health = 150 + movement_cooldown = 2 response_help = "pats" response_disarm = "gently pushes aside" @@ -25,6 +26,10 @@ say_list_type = /datum/say_list/weretiger ai_holder_type = /datum/ai_holder/simple_mob/retaliate + pixel_x = -16 + + has_hands = 1 + // Nomnomn /mob/living/simple_mob/vore/weretiger vore_active = 1 diff --git a/code/modules/mob/new_player/sprite_accessories_extra.dm b/code/modules/mob/new_player/sprite_accessories_extra.dm index a124eff96b..c236037388 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra.dm @@ -498,7 +498,7 @@ /* werewolf_nose name = "Werewolf nose" - icon = 'icons/mob/species/werebeast/werebeast_markings.dmi' + icon = 'icons/inventory/werebeast_markings/mob_werebeast.dmi' icon_state = "werewolf_nose" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) @@ -506,7 +506,7 @@ werewolf_nose werewolf_face name = "Werewolf face" - icon = 'icons/mob/species/werebeast/werebeast_markings.dmi' + icon = 'icons/inventory/werebeast_markings/mob_werebeast.dmi' icon_state = "werewolf" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) @@ -514,7 +514,7 @@ werewolf_face werewolf_belly name = "Werewolf belly" - icon = 'icons/mob/species/werebeast/werebeast_markings.dmi' + icon = 'icons/inventory/werebeast_markings/mob_werebeast.dmi' icon_state = "werewolf" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_GROIN,BP_TORSO) @@ -522,7 +522,7 @@ werewolf_belly werewolf_socks name = "Werewolf socks" - icon = 'icons/mob/species/werebeast/werebeast_markings.dmi' + icon = 'icons/inventory/werebeast_markings/mob_werebeast.dmi' icon_state = "werewolf" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) diff --git a/code/modules/overmap/overmap_object.dm b/code/modules/overmap/overmap_object.dm index f79741bd3a..ad5bf60dd2 100644 --- a/code/modules/overmap/overmap_object.dm +++ b/code/modules/overmap/overmap_object.dm @@ -37,12 +37,12 @@ return ..() //Overlay of how this object should look on other skyboxes -/obj/effect/overmap/proc/get_skybox_representation() +/obj/effect/overmap/proc/get_skybox_representation(zlevel) if(!cached_skybox_image) - build_skybox_representation() + build_skybox_representation(zlevel) return cached_skybox_image -/obj/effect/overmap/proc/build_skybox_representation() +/obj/effect/overmap/proc/build_skybox_representation(zlevel) if(!skybox_icon) return var/image/I = image(icon = skybox_icon, icon_state = skybox_icon_state) diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index f9d41780f8..4b461a6a52 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -165,7 +165,7 @@ for(var/thing in restricted_waypoints[shuttle_name]) .[thing] = name -/obj/effect/overmap/visitable/proc/generate_skybox() +/obj/effect/overmap/visitable/proc/generate_skybox(zlevel) return /obj/effect/overmap/visitable/proc/cleanup() diff --git a/code/modules/projectiles/guns/energy/gunsword_vr.dm b/code/modules/projectiles/guns/energy/gunsword_vr.dm index 2b8b45a9fe..20ffc1ccea 100644 --- a/code/modules/projectiles/guns/energy/gunsword_vr.dm +++ b/code/modules/projectiles/guns/energy/gunsword_vr.dm @@ -7,7 +7,7 @@ icon_override = 'icons/vore/custom_guns_vr.dmi' item_state = "gbuster" - item_icons = list(slot_r_hand_str = 'icons/vore/custom_guns_vr.dmi', slot_l_hand_str = 'icons/vore/custom_guns_vr.dmi', "slot_belt" = 'icons/mob/belt_vr.dmi') + item_icons = list(slot_r_hand_str = 'icons/vore/custom_guns_vr.dmi', slot_l_hand_str = 'icons/vore/custom_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob_vr.dmi') w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 4) diff --git a/code/modules/projectiles/guns/energy/hooklauncher.dm b/code/modules/projectiles/guns/energy/hooklauncher.dm index 79ddf7443d..ee2d44042a 100644 --- a/code/modules/projectiles/guns/energy/hooklauncher.dm +++ b/code/modules/projectiles/guns/energy/hooklauncher.dm @@ -22,7 +22,7 @@ /obj/item/weapon/gun/energy/hooklauncher/ring name = "ominous ring" desc = "A small ring with strange symbols engraved upon it." - icon = 'icons/obj/clothing/rings.dmi' + icon = 'icons/inventory/hands/item.dmi' icon_state = "seal-signet" item_state = "concealed" diff --git a/code/modules/projectiles/guns/energy/laser_vr.dm b/code/modules/projectiles/guns/energy/laser_vr.dm index 0199d154c4..60eb948158 100644 --- a/code/modules/projectiles/guns/energy/laser_vr.dm +++ b/code/modules/projectiles/guns/energy/laser_vr.dm @@ -197,7 +197,7 @@ icon = 'icons/obj/gun_vr.dmi' icon_state = "phaserkill" item_state = "phaser" - item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/mob/belt_vr.dmi') + item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob_vr.dmi') fire_sound = 'sound/weapons/laser2.ogg' origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_POWER = 4) charge_cost = 300 diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm index 0588f802b7..490ff55f0d 100644 --- a/code/modules/telesci/quantum_pad.dm +++ b/code/modules/telesci/quantum_pad.dm @@ -53,13 +53,13 @@ if(istype(I, /obj/item/device/multitool)) if(panel_open) var/obj/item/device/multitool/M = I - M.buffer = src + M.connectable = src to_chat(user, "You save the data in [I]'s buffer.") return 1 else var/obj/item/device/multitool/M = I - if(istype(M.buffer, /obj/machinery/power/quantumpad)) - linked_pad = M.buffer + if(istype(M.connectable, /obj/machinery/power/quantumpad)) + linked_pad = M.connectable to_chat(user, "You link [src] to the one in [I]'s buffer.") return 1 diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 2c6032d782..29727c16ec 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -182,7 +182,7 @@ icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "solara_dress" - icon_override = 'icons/mob/uniform.dmi' + icon_override = 'icons/inventory/uniform/mob.dmi' item_state = "solara_dress" //For general use @@ -698,10 +698,10 @@ desc = " This is Lethe's Hat! A little tag attached inside reads: 'If found please return to Lethe! Or else!' It looks rather worn in. It also lacks armor." armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - icon = 'icons/obj/clothing/hats.dmi' + icon = 'icons/inventory/head/item.dmi' icon_state = "hoscap" - icon_override = 'icons/mob/head.dmi' + icon_override = 'icons/inventory/head/mob.dmi' item_state = "hoscap" /obj/item/weapon/storage/belt/utility/fluff/vulpine diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm index cbcbe3b0e7..1f4f65084d 100644 --- a/code/modules/vore/resizing/holder_micro_vr.dm +++ b/code/modules/vore/resizing/holder_micro_vr.dm @@ -4,7 +4,7 @@ name = "micro" desc = "Another crewmember, small enough to fit in your hand." icon_state = "micro" - icon_override = 'icons/mob/head_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' slot_flags = SLOT_FEET | SLOT_HEAD | SLOT_ID w_class = ITEMSIZE_SMALL item_icons = list() // No in-hand sprites (for now, anyway, we could totally add some) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 3c7e5b7089..3d7086f9c3 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -47,7 +47,7 @@ /atom/movable/proc/size_range_check(size_select) //both objects and mobs needs to have that var/area/A = get_area(src) //Get the atom's area to check for size limit. - if((A.limit_mob_size && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1)) + if((A?.limit_mob_size && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1)) return FALSE return TRUE diff --git a/code/modules/xenoarcheaology/tools/equipment.dm b/code/modules/xenoarcheaology/tools/equipment.dm index b241f714be..276d8e305e 100644 --- a/code/modules/xenoarcheaology/tools/equipment.dm +++ b/code/modules/xenoarcheaology/tools/equipment.dm @@ -1,7 +1,7 @@ /obj/item/clothing/suit/bio_suit/anomaly name = "Anomaly suit" desc = "A sealed bio suit capable of insulating against exotic alien energies." - icon = 'icons/obj/clothing/spacesuits.dmi' + icon = 'icons/inventory/suit/item.dmi' icon_state = "engspace_suit" item_state = "engspace_suit" update_icon_define = "icons/mob/spacesuit.dmi" diff --git a/icons/_nanomaps/tether_nanomap_z4.png b/icons/_nanomaps/tether_nanomap_z4.png index eb95d89199..510d22b3d6 100644 Binary files a/icons/_nanomaps/tether_nanomap_z4.png and b/icons/_nanomaps/tether_nanomap_z4.png differ diff --git a/icons/obj/clothing/ties.dmi b/icons/inventory/accessory/item.dmi similarity index 100% rename from icons/obj/clothing/ties.dmi rename to icons/inventory/accessory/item.dmi diff --git a/icons/obj/clothing/ties_vr.dmi b/icons/inventory/accessory/item_vr.dmi similarity index 100% rename from icons/obj/clothing/ties_vr.dmi rename to icons/inventory/accessory/item_vr.dmi diff --git a/icons/mob/ties.dmi b/icons/inventory/accessory/mob.dmi similarity index 100% rename from icons/mob/ties.dmi rename to icons/inventory/accessory/mob.dmi diff --git a/icons/mob/species/teshari/ties.dmi b/icons/inventory/accessory/mob_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/ties.dmi rename to icons/inventory/accessory/mob_teshari.dmi diff --git a/icons/mob/ties_vr.dmi b/icons/inventory/accessory/mob_vr.dmi similarity index 100% rename from icons/mob/ties_vr.dmi rename to icons/inventory/accessory/mob_vr.dmi diff --git a/icons/mob/species/teshari/ties_vr.dmi b/icons/inventory/accessory/mob_vr_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/ties_vr.dmi rename to icons/inventory/accessory/mob_vr_teshari.dmi diff --git a/icons/mob/species/werebeast/ears.dmi b/icons/inventory/accessory/mob_werebeast.dmi similarity index 100% rename from icons/mob/species/werebeast/ears.dmi rename to icons/inventory/accessory/mob_werebeast.dmi diff --git a/icons/obj/clothing/backpack.dmi b/icons/inventory/back/item.dmi similarity index 100% rename from icons/obj/clothing/backpack.dmi rename to icons/inventory/back/item.dmi diff --git a/icons/obj/clothing/backpack_vr.dmi b/icons/inventory/back/item_vr.dmi similarity index 100% rename from icons/obj/clothing/backpack_vr.dmi rename to icons/inventory/back/item_vr.dmi diff --git a/icons/inventory/back/mob.dmi b/icons/inventory/back/mob.dmi new file mode 100644 index 0000000000..755a2d75d4 Binary files /dev/null and b/icons/inventory/back/mob.dmi differ diff --git a/icons/inventory/back/mob_teshari.dmi b/icons/inventory/back/mob_teshari.dmi new file mode 100644 index 0000000000..bdec7b1467 Binary files /dev/null and b/icons/inventory/back/mob_teshari.dmi differ diff --git a/icons/mob/back_vr.dmi b/icons/inventory/back/mob_vr.dmi similarity index 100% rename from icons/mob/back_vr.dmi rename to icons/inventory/back/mob_vr.dmi diff --git a/icons/mob/species/werebeast/back.dmi b/icons/inventory/back/mob_werebeast.dmi similarity index 100% rename from icons/mob/species/werebeast/back.dmi rename to icons/inventory/back/mob_werebeast.dmi diff --git a/icons/obj/clothing/belts.dmi b/icons/inventory/belt/item.dmi similarity index 100% rename from icons/obj/clothing/belts.dmi rename to icons/inventory/belt/item.dmi diff --git a/icons/obj/clothing/belts_vr.dmi b/icons/inventory/belt/item_vr.dmi similarity index 100% rename from icons/obj/clothing/belts_vr.dmi rename to icons/inventory/belt/item_vr.dmi diff --git a/icons/mob/belt.dmi b/icons/inventory/belt/mob.dmi similarity index 100% rename from icons/mob/belt.dmi rename to icons/inventory/belt/mob.dmi diff --git a/icons/mob/species/teshari/belt.dmi b/icons/inventory/belt/mob_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/belt.dmi rename to icons/inventory/belt/mob_teshari.dmi diff --git a/icons/mob/belt_vr.dmi b/icons/inventory/belt/mob_vr.dmi similarity index 100% rename from icons/mob/belt_vr.dmi rename to icons/inventory/belt/mob_vr.dmi diff --git a/icons/mob/species/werebeast/belt.dmi b/icons/inventory/belt/mob_werebeast.dmi similarity index 100% rename from icons/mob/species/werebeast/belt.dmi rename to icons/inventory/belt/mob_werebeast.dmi diff --git a/icons/obj/clothing/ears.dmi b/icons/inventory/ears/item.dmi similarity index 100% rename from icons/obj/clothing/ears.dmi rename to icons/inventory/ears/item.dmi diff --git a/icons/mob/ears.dmi b/icons/inventory/ears/mob.dmi similarity index 100% rename from icons/mob/ears.dmi rename to icons/inventory/ears/mob.dmi diff --git a/icons/mob/species/teshari/ears.dmi b/icons/inventory/ears/mob_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/ears.dmi rename to icons/inventory/ears/mob_teshari.dmi diff --git a/icons/mob/species/werebeast/ties.dmi b/icons/inventory/ears/mob_werebeast.dmi similarity index 100% rename from icons/mob/species/werebeast/ties.dmi rename to icons/inventory/ears/mob_werebeast.dmi diff --git a/icons/obj/clothing/glasses.dmi b/icons/inventory/eyes/item.dmi similarity index 100% rename from icons/obj/clothing/glasses.dmi rename to icons/inventory/eyes/item.dmi diff --git a/icons/obj/clothing/glasses_vr.dmi b/icons/inventory/eyes/item_vr.dmi similarity index 100% rename from icons/obj/clothing/glasses_vr.dmi rename to icons/inventory/eyes/item_vr.dmi diff --git a/icons/inventory/eyes/mob.dmi b/icons/inventory/eyes/mob.dmi new file mode 100644 index 0000000000..70113e3d8c Binary files /dev/null and b/icons/inventory/eyes/mob.dmi differ diff --git a/icons/mob/species/teshari/eyes.dmi b/icons/inventory/eyes/mob_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/eyes.dmi rename to icons/inventory/eyes/mob_teshari.dmi diff --git a/icons/mob/species/vox/eyes.dmi b/icons/inventory/eyes/mob_vox.dmi similarity index 100% rename from icons/mob/species/vox/eyes.dmi rename to icons/inventory/eyes/mob_vox.dmi diff --git a/icons/mob/eyes_vr.dmi b/icons/inventory/eyes/mob_vr.dmi similarity index 100% rename from icons/mob/eyes_vr.dmi rename to icons/inventory/eyes/mob_vr.dmi diff --git a/icons/mob/species/werebeast/eyes.dmi b/icons/inventory/eyes/mob_werebeast.dmi similarity index 100% rename from icons/mob/species/werebeast/eyes.dmi rename to icons/inventory/eyes/mob_werebeast.dmi diff --git a/icons/obj/clothing/masks.dmi b/icons/inventory/face/item.dmi similarity index 100% rename from icons/obj/clothing/masks.dmi rename to icons/inventory/face/item.dmi diff --git a/icons/obj/clothing/masks_vr.dmi b/icons/inventory/face/item_vr.dmi similarity index 100% rename from icons/obj/clothing/masks_vr.dmi rename to icons/inventory/face/item_vr.dmi diff --git a/icons/mob/mask.dmi b/icons/inventory/face/mob.dmi similarity index 100% rename from icons/mob/mask.dmi rename to icons/inventory/face/mob.dmi diff --git a/icons/mob/species/akula/mask_vr.dmi b/icons/inventory/face/mob_akula.dmi similarity index 100% rename from icons/mob/species/akula/mask_vr.dmi rename to icons/inventory/face/mob_akula.dmi diff --git a/icons/mob/species/fennec/mask_vr.dmi b/icons/inventory/face/mob_fennec.dmi similarity index 100% rename from icons/mob/species/fennec/mask_vr.dmi rename to icons/inventory/face/mob_fennec.dmi diff --git a/icons/mob/species/fox/mask_vr.dmi b/icons/inventory/face/mob_fox.dmi similarity index 100% rename from icons/mob/species/fox/mask_vr.dmi rename to icons/inventory/face/mob_fox.dmi diff --git a/icons/mob/species/grey/mask.dmi b/icons/inventory/face/mob_grey.dmi similarity index 100% rename from icons/mob/species/grey/mask.dmi rename to icons/inventory/face/mob_grey.dmi diff --git a/icons/mob/species/nevrean/mask_vr.dmi b/icons/inventory/face/mob_nevrean.dmi similarity index 100% rename from icons/mob/species/nevrean/mask_vr.dmi rename to icons/inventory/face/mob_nevrean.dmi diff --git a/icons/mob/species/sergal/mask_vr.dmi b/icons/inventory/face/mob_sergal.dmi similarity index 100% rename from icons/mob/species/sergal/mask_vr.dmi rename to icons/inventory/face/mob_sergal.dmi diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/inventory/face/mob_tajaran.dmi similarity index 100% rename from icons/mob/species/tajaran/mask.dmi rename to icons/inventory/face/mob_tajaran.dmi diff --git a/icons/mob/species/teshari/masks.dmi b/icons/inventory/face/mob_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/masks.dmi rename to icons/inventory/face/mob_teshari.dmi diff --git a/icons/mob/species/unathi/mask.dmi b/icons/inventory/face/mob_unathi.dmi similarity index 100% rename from icons/mob/species/unathi/mask.dmi rename to icons/inventory/face/mob_unathi.dmi diff --git a/icons/mob/species/vox/masks.dmi b/icons/inventory/face/mob_vox.dmi similarity index 100% rename from icons/mob/species/vox/masks.dmi rename to icons/inventory/face/mob_vox.dmi diff --git a/icons/mob/mask_vr.dmi b/icons/inventory/face/mob_vr.dmi similarity index 100% rename from icons/mob/mask_vr.dmi rename to icons/inventory/face/mob_vr.dmi diff --git a/icons/mob/species/tajaran/mask_vr.dmi b/icons/inventory/face/mob_vr_tajaran.dmi similarity index 100% rename from icons/mob/species/tajaran/mask_vr.dmi rename to icons/inventory/face/mob_vr_tajaran.dmi diff --git a/icons/mob/species/teshari/masks_vr.dmi b/icons/inventory/face/mob_vr_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/masks_vr.dmi rename to icons/inventory/face/mob_vr_teshari.dmi diff --git a/icons/mob/species/unathi/mask_vr.dmi b/icons/inventory/face/mob_vr_unathi.dmi similarity index 100% rename from icons/mob/species/unathi/mask_vr.dmi rename to icons/inventory/face/mob_vr_unathi.dmi diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/inventory/face/mob_vulpkanin.dmi similarity index 100% rename from icons/mob/species/vulpkanin/mask.dmi rename to icons/inventory/face/mob_vulpkanin.dmi diff --git a/icons/mob/species/werebeast/masks.dmi b/icons/inventory/face/mob_werebeast.dmi similarity index 100% rename from icons/mob/species/werebeast/masks.dmi rename to icons/inventory/face/mob_werebeast.dmi diff --git a/icons/obj/clothing/shoes.dmi b/icons/inventory/feet/item.dmi similarity index 100% rename from icons/obj/clothing/shoes.dmi rename to icons/inventory/feet/item.dmi diff --git a/icons/obj/clothing/shoes_vr.dmi b/icons/inventory/feet/item_vr.dmi similarity index 100% rename from icons/obj/clothing/shoes_vr.dmi rename to icons/inventory/feet/item_vr.dmi diff --git a/icons/mob/feet.dmi b/icons/inventory/feet/mob.dmi similarity index 100% rename from icons/mob/feet.dmi rename to icons/inventory/feet/mob.dmi diff --git a/icons/mob/species/teshari/shoes.dmi b/icons/inventory/feet/mob_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/shoes.dmi rename to icons/inventory/feet/mob_teshari.dmi diff --git a/icons/mob/species/vox/shoes.dmi b/icons/inventory/feet/mob_vox.dmi similarity index 100% rename from icons/mob/species/vox/shoes.dmi rename to icons/inventory/feet/mob_vox.dmi diff --git a/icons/mob/feet_vr.dmi b/icons/inventory/feet/mob_vr.dmi similarity index 100% rename from icons/mob/feet_vr.dmi rename to icons/inventory/feet/mob_vr.dmi diff --git a/icons/mob/species/werebeast/feet.dmi b/icons/inventory/feet/mob_werebeast.dmi similarity index 100% rename from icons/mob/species/werebeast/feet.dmi rename to icons/inventory/feet/mob_werebeast.dmi diff --git a/icons/obj/clothing/gloves.dmi b/icons/inventory/hands/item.dmi similarity index 62% rename from icons/obj/clothing/gloves.dmi rename to icons/inventory/hands/item.dmi index bfb27a0ec8..9949cefb10 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/inventory/hands/item.dmi differ diff --git a/icons/obj/clothing/gloves_vr.dmi b/icons/inventory/hands/item_vr.dmi similarity index 100% rename from icons/obj/clothing/gloves_vr.dmi rename to icons/inventory/hands/item_vr.dmi diff --git a/icons/mob/hands.dmi b/icons/inventory/hands/mob.dmi similarity index 100% rename from icons/mob/hands.dmi rename to icons/inventory/hands/mob.dmi diff --git a/icons/mob/species/teshari/gloves.dmi b/icons/inventory/hands/mob_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/gloves.dmi rename to icons/inventory/hands/mob_teshari.dmi diff --git a/icons/mob/species/vox/gloves.dmi b/icons/inventory/hands/mob_vox.dmi similarity index 100% rename from icons/mob/species/vox/gloves.dmi rename to icons/inventory/hands/mob_vox.dmi diff --git a/icons/mob/hands_vr.dmi b/icons/inventory/hands/mob_vr.dmi similarity index 100% rename from icons/mob/hands_vr.dmi rename to icons/inventory/hands/mob_vr.dmi diff --git a/icons/mob/species/werebeast/hands.dmi b/icons/inventory/hands/mob_werebeast.dmi similarity index 100% rename from icons/mob/species/werebeast/hands.dmi rename to icons/inventory/hands/mob_werebeast.dmi diff --git a/icons/obj/clothing/hats.dmi b/icons/inventory/head/item.dmi similarity index 100% rename from icons/obj/clothing/hats.dmi rename to icons/inventory/head/item.dmi diff --git a/icons/obj/clothing/species/akula/hats.dmi b/icons/inventory/head/item_akula.dmi similarity index 100% rename from icons/obj/clothing/species/akula/hats.dmi rename to icons/inventory/head/item_akula.dmi diff --git a/icons/obj/clothing/species/sergal/hats.dmi b/icons/inventory/head/item_sergal.dmi similarity index 100% rename from icons/obj/clothing/species/sergal/hats.dmi rename to icons/inventory/head/item_sergal.dmi diff --git a/icons/obj/clothing/species/skrell/hats.dmi b/icons/inventory/head/item_skrell.dmi similarity index 100% rename from icons/obj/clothing/species/skrell/hats.dmi rename to icons/inventory/head/item_skrell.dmi diff --git a/icons/obj/clothing/species/tajaran/hats.dmi b/icons/inventory/head/item_tajaran.dmi similarity index 100% rename from icons/obj/clothing/species/tajaran/hats.dmi rename to icons/inventory/head/item_tajaran.dmi diff --git a/icons/obj/clothing/species/teshari/hats.dmi b/icons/inventory/head/item_teshari.dmi similarity index 100% rename from icons/obj/clothing/species/teshari/hats.dmi rename to icons/inventory/head/item_teshari.dmi diff --git a/icons/obj/clothing/species/unathi/hats.dmi b/icons/inventory/head/item_unathi.dmi similarity index 100% rename from icons/obj/clothing/species/unathi/hats.dmi rename to icons/inventory/head/item_unathi.dmi diff --git a/icons/obj/clothing/species/vox/hats.dmi b/icons/inventory/head/item_vox.dmi similarity index 100% rename from icons/obj/clothing/species/vox/hats.dmi rename to icons/inventory/head/item_vox.dmi diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi new file mode 100644 index 0000000000..d35d62e18e Binary files /dev/null and b/icons/inventory/head/item_vr.dmi differ diff --git a/icons/obj/clothing/species/vulpkanin/hats.dmi b/icons/inventory/head/item_vulpkanin.dmi similarity index 100% rename from icons/obj/clothing/species/vulpkanin/hats.dmi rename to icons/inventory/head/item_vulpkanin.dmi diff --git a/icons/mob/head.dmi b/icons/inventory/head/mob.dmi similarity index 100% rename from icons/mob/head.dmi rename to icons/inventory/head/mob.dmi diff --git a/icons/mob/species/akula/helmet_vr.dmi b/icons/inventory/head/mob_akula.dmi similarity index 100% rename from icons/mob/species/akula/helmet_vr.dmi rename to icons/inventory/head/mob_akula.dmi diff --git a/icons/mob/species/grey/helmet.dmi b/icons/inventory/head/mob_grey.dmi similarity index 100% rename from icons/mob/species/grey/helmet.dmi rename to icons/inventory/head/mob_grey.dmi diff --git a/icons/mob/species/sergal/helmet_vr.dmi b/icons/inventory/head/mob_sergal.dmi similarity index 100% rename from icons/mob/species/sergal/helmet_vr.dmi rename to icons/inventory/head/mob_sergal.dmi diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/inventory/head/mob_skrell.dmi similarity index 100% rename from icons/mob/species/skrell/helmet.dmi rename to icons/inventory/head/mob_skrell.dmi diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/inventory/head/mob_tajaran.dmi similarity index 100% rename from icons/mob/species/tajaran/helmet.dmi rename to icons/inventory/head/mob_tajaran.dmi diff --git a/icons/mob/species/teshari/head.dmi b/icons/inventory/head/mob_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/head.dmi rename to icons/inventory/head/mob_teshari.dmi diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/inventory/head/mob_unathi.dmi similarity index 100% rename from icons/mob/species/unathi/helmet.dmi rename to icons/inventory/head/mob_unathi.dmi diff --git a/icons/mob/species/vox/head.dmi b/icons/inventory/head/mob_vox.dmi similarity index 100% rename from icons/mob/species/vox/head.dmi rename to icons/inventory/head/mob_vox.dmi diff --git a/icons/mob/head_vr.dmi b/icons/inventory/head/mob_vr.dmi similarity index 100% rename from icons/mob/head_vr.dmi rename to icons/inventory/head/mob_vr.dmi diff --git a/icons/mob/species/skrell/helmet_vr.dmi b/icons/inventory/head/mob_vr_skrell.dmi similarity index 100% rename from icons/mob/species/skrell/helmet_vr.dmi rename to icons/inventory/head/mob_vr_skrell.dmi diff --git a/icons/mob/species/tajaran/helmet_vr.dmi b/icons/inventory/head/mob_vr_tajaran.dmi similarity index 100% rename from icons/mob/species/tajaran/helmet_vr.dmi rename to icons/inventory/head/mob_vr_tajaran.dmi diff --git a/icons/mob/species/teshari/helmet_vr.dmi b/icons/inventory/head/mob_vr_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/helmet_vr.dmi rename to icons/inventory/head/mob_vr_teshari.dmi diff --git a/icons/mob/species/unathi/helmet_vr.dmi b/icons/inventory/head/mob_vr_unathi.dmi similarity index 100% rename from icons/mob/species/unathi/helmet_vr.dmi rename to icons/inventory/head/mob_vr_unathi.dmi diff --git a/icons/mob/species/vulpkanin/helmet_vr.dmi b/icons/inventory/head/mob_vr_vulpkanin.dmi similarity index 100% rename from icons/mob/species/vulpkanin/helmet_vr.dmi rename to icons/inventory/head/mob_vr_vulpkanin.dmi diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/inventory/head/mob_vulpkanin.dmi similarity index 100% rename from icons/mob/species/vulpkanin/helmet.dmi rename to icons/inventory/head/mob_vulpkanin.dmi diff --git a/icons/mob/species/werebeast/head.dmi b/icons/inventory/head/mob_werebeast.dmi similarity index 100% rename from icons/mob/species/werebeast/head.dmi rename to icons/inventory/head/mob_werebeast.dmi diff --git a/icons/obj/clothing/pouches.dmi b/icons/inventory/pockets/item.dmi similarity index 100% rename from icons/obj/clothing/pouches.dmi rename to icons/inventory/pockets/item.dmi diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi new file mode 100644 index 0000000000..82ae304307 Binary files /dev/null and b/icons/inventory/suit/item.dmi differ diff --git a/icons/obj/clothing/species/akula/suits.dmi b/icons/inventory/suit/item_akula.dmi similarity index 100% rename from icons/obj/clothing/species/akula/suits.dmi rename to icons/inventory/suit/item_akula.dmi diff --git a/icons/obj/clothing/species/sergal/suits.dmi b/icons/inventory/suit/item_sergal.dmi similarity index 100% rename from icons/obj/clothing/species/sergal/suits.dmi rename to icons/inventory/suit/item_sergal.dmi diff --git a/icons/obj/clothing/species/skrell/suits.dmi b/icons/inventory/suit/item_skrell.dmi similarity index 100% rename from icons/obj/clothing/species/skrell/suits.dmi rename to icons/inventory/suit/item_skrell.dmi diff --git a/icons/obj/clothing/species/tajaran/suits.dmi b/icons/inventory/suit/item_tajaran.dmi similarity index 100% rename from icons/obj/clothing/species/tajaran/suits.dmi rename to icons/inventory/suit/item_tajaran.dmi diff --git a/icons/inventory/suit/item_teshari.dmi b/icons/inventory/suit/item_teshari.dmi new file mode 100644 index 0000000000..840c4abb81 Binary files /dev/null and b/icons/inventory/suit/item_teshari.dmi differ diff --git a/icons/obj/clothing/species/unathi/suits.dmi b/icons/inventory/suit/item_unathi.dmi similarity index 100% rename from icons/obj/clothing/species/unathi/suits.dmi rename to icons/inventory/suit/item_unathi.dmi diff --git a/icons/obj/clothing/species/vox/suits.dmi b/icons/inventory/suit/item_vox.dmi similarity index 100% rename from icons/obj/clothing/species/vox/suits.dmi rename to icons/inventory/suit/item_vox.dmi diff --git a/icons/obj/clothing/suits_vr.dmi b/icons/inventory/suit/item_vr.dmi similarity index 100% rename from icons/obj/clothing/suits_vr.dmi rename to icons/inventory/suit/item_vr.dmi diff --git a/icons/obj/clothing/species/vulpkanin/suits.dmi b/icons/inventory/suit/item_vulpkanin.dmi similarity index 100% rename from icons/obj/clothing/species/vulpkanin/suits.dmi rename to icons/inventory/suit/item_vulpkanin.dmi diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi new file mode 100644 index 0000000000..f5c48376be Binary files /dev/null and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/mob/species/akula/suit_vr.dmi b/icons/inventory/suit/mob_akula.dmi similarity index 100% rename from icons/mob/species/akula/suit_vr.dmi rename to icons/inventory/suit/mob_akula.dmi diff --git a/icons/mob/species/sergal/suit_vr.dmi b/icons/inventory/suit/mob_sergal.dmi similarity index 100% rename from icons/mob/species/sergal/suit_vr.dmi rename to icons/inventory/suit/mob_sergal.dmi diff --git a/icons/mob/species/skrell/suit.dmi b/icons/inventory/suit/mob_skrell.dmi similarity index 100% rename from icons/mob/species/skrell/suit.dmi rename to icons/inventory/suit/mob_skrell.dmi diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/inventory/suit/mob_tajaran.dmi similarity index 100% rename from icons/mob/species/tajaran/suit.dmi rename to icons/inventory/suit/mob_tajaran.dmi diff --git a/icons/inventory/suit/mob_teshari.dmi b/icons/inventory/suit/mob_teshari.dmi new file mode 100644 index 0000000000..1fb217782e Binary files /dev/null and b/icons/inventory/suit/mob_teshari.dmi differ diff --git a/icons/mob/species/unathi/suit.dmi b/icons/inventory/suit/mob_unathi.dmi similarity index 100% rename from icons/mob/species/unathi/suit.dmi rename to icons/inventory/suit/mob_unathi.dmi diff --git a/icons/mob/species/vox/suit.dmi b/icons/inventory/suit/mob_vox.dmi similarity index 100% rename from icons/mob/species/vox/suit.dmi rename to icons/inventory/suit/mob_vox.dmi diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi new file mode 100644 index 0000000000..35f233c1c3 Binary files /dev/null and b/icons/inventory/suit/mob_vr.dmi differ diff --git a/icons/mob/species/skrell/suit_vr.dmi b/icons/inventory/suit/mob_vr_skrell.dmi similarity index 100% rename from icons/mob/species/skrell/suit_vr.dmi rename to icons/inventory/suit/mob_vr_skrell.dmi diff --git a/icons/mob/species/tajaran/suit_vr.dmi b/icons/inventory/suit/mob_vr_tajaran.dmi similarity index 100% rename from icons/mob/species/tajaran/suit_vr.dmi rename to icons/inventory/suit/mob_vr_tajaran.dmi diff --git a/icons/mob/species/teshari/suit_vr.dmi b/icons/inventory/suit/mob_vr_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/suit_vr.dmi rename to icons/inventory/suit/mob_vr_teshari.dmi diff --git a/icons/mob/species/unathi/suit_vr.dmi b/icons/inventory/suit/mob_vr_unathi.dmi similarity index 100% rename from icons/mob/species/unathi/suit_vr.dmi rename to icons/inventory/suit/mob_vr_unathi.dmi diff --git a/icons/mob/species/vulpkanin/suit_vr.dmi b/icons/inventory/suit/mob_vr_vulpkanin.dmi similarity index 100% rename from icons/mob/species/vulpkanin/suit_vr.dmi rename to icons/inventory/suit/mob_vr_vulpkanin.dmi diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/inventory/suit/mob_vulpkanin.dmi similarity index 100% rename from icons/mob/species/vulpkanin/suit.dmi rename to icons/inventory/suit/mob_vulpkanin.dmi diff --git a/icons/mob/species/werebeast/suit.dmi b/icons/inventory/suit/mob_werebeast.dmi similarity index 100% rename from icons/mob/species/werebeast/suit.dmi rename to icons/inventory/suit/mob_werebeast.dmi diff --git a/icons/mob/belt_mirror.dmi b/icons/inventory/suit_store/mob.dmi similarity index 100% rename from icons/mob/belt_mirror.dmi rename to icons/inventory/suit_store/mob.dmi diff --git a/icons/mob/species/teshari/belt_mirror.dmi b/icons/inventory/suit_store/mob_teshari.dmi similarity index 100% rename from icons/mob/species/teshari/belt_mirror.dmi rename to icons/inventory/suit_store/mob_teshari.dmi diff --git a/icons/mob/species/werebeast/belt_mirror.dmi b/icons/inventory/suit_store/mob_werebeast.dmi similarity index 100% rename from icons/mob/species/werebeast/belt_mirror.dmi rename to icons/inventory/suit_store/mob_werebeast.dmi diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi new file mode 100644 index 0000000000..5b7c197b03 Binary files /dev/null and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/item_teshari.dmi b/icons/inventory/uniform/item_teshari.dmi new file mode 100644 index 0000000000..08a7df384a Binary files /dev/null and b/icons/inventory/uniform/item_teshari.dmi differ diff --git a/icons/inventory/uniform/item_vr.dmi b/icons/inventory/uniform/item_vr.dmi new file mode 100644 index 0000000000..2e97626d06 Binary files /dev/null and b/icons/inventory/uniform/item_vr.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi new file mode 100644 index 0000000000..71d8348cf6 Binary files /dev/null and b/icons/inventory/uniform/mob.dmi differ diff --git a/icons/mob/species/grey/uniform.dmi b/icons/inventory/uniform/mob_grey.dmi similarity index 100% rename from icons/mob/species/grey/uniform.dmi rename to icons/inventory/uniform/mob_grey.dmi diff --git a/icons/inventory/uniform/mob_rolled_down.dmi b/icons/inventory/uniform/mob_rolled_down.dmi new file mode 100644 index 0000000000..7c7afd8594 Binary files /dev/null and b/icons/inventory/uniform/mob_rolled_down.dmi differ diff --git a/icons/inventory/uniform/mob_sleeves_rolled.dmi b/icons/inventory/uniform/mob_sleeves_rolled.dmi new file mode 100644 index 0000000000..5803d1a3a1 Binary files /dev/null and b/icons/inventory/uniform/mob_sleeves_rolled.dmi differ diff --git a/icons/inventory/uniform/mob_teshari.dmi b/icons/inventory/uniform/mob_teshari.dmi new file mode 100644 index 0000000000..b507f4e4fb Binary files /dev/null and b/icons/inventory/uniform/mob_teshari.dmi differ diff --git a/icons/inventory/uniform/mob_vox.dmi b/icons/inventory/uniform/mob_vox.dmi new file mode 100644 index 0000000000..870fa34d38 Binary files /dev/null and b/icons/inventory/uniform/mob_vox.dmi differ diff --git a/icons/inventory/uniform/mob_vr.dmi b/icons/inventory/uniform/mob_vr.dmi new file mode 100644 index 0000000000..ad363e9706 Binary files /dev/null and b/icons/inventory/uniform/mob_vr.dmi differ diff --git a/icons/inventory/uniform/mob_vr_rolled_down.dmi b/icons/inventory/uniform/mob_vr_rolled_down.dmi new file mode 100644 index 0000000000..8c82d1f7c2 Binary files /dev/null and b/icons/inventory/uniform/mob_vr_rolled_down.dmi differ diff --git a/icons/inventory/uniform/mob_werebeast.dmi b/icons/inventory/uniform/mob_werebeast.dmi new file mode 100644 index 0000000000..b1e9966b06 Binary files /dev/null and b/icons/inventory/uniform/mob_werebeast.dmi differ diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi deleted file mode 100644 index bae46a47da..0000000000 Binary files a/icons/mob/back.dmi and /dev/null differ diff --git a/icons/mob/items/lefthand_suits.dmi b/icons/mob/items/lefthand_suits.dmi index d69739d40f..aab06d09ee 100644 Binary files a/icons/mob/items/lefthand_suits.dmi and b/icons/mob/items/lefthand_suits.dmi differ diff --git a/icons/mob/items/lefthand_suits_1.dmi b/icons/mob/items/lefthand_suits_1.dmi deleted file mode 100644 index 33e2d22930..0000000000 Binary files a/icons/mob/items/lefthand_suits_1.dmi and /dev/null differ diff --git a/icons/mob/items/lefthand_uniforms.dmi b/icons/mob/items/lefthand_uniforms.dmi index 832613e04a..29f70f0ec4 100644 Binary files a/icons/mob/items/lefthand_uniforms.dmi and b/icons/mob/items/lefthand_uniforms.dmi differ diff --git a/icons/mob/items/lefthand_uniforms_1.dmi b/icons/mob/items/lefthand_uniforms_1.dmi deleted file mode 100644 index 280af8518b..0000000000 Binary files a/icons/mob/items/lefthand_uniforms_1.dmi and /dev/null differ diff --git a/icons/mob/items/righthand_suits.dmi b/icons/mob/items/righthand_suits.dmi index 3e0d73d39d..6afe96f806 100644 Binary files a/icons/mob/items/righthand_suits.dmi and b/icons/mob/items/righthand_suits.dmi differ diff --git a/icons/mob/items/righthand_suits_1.dmi b/icons/mob/items/righthand_suits_1.dmi deleted file mode 100644 index e5be8ffab6..0000000000 Binary files a/icons/mob/items/righthand_suits_1.dmi and /dev/null differ diff --git a/icons/mob/items/righthand_uniforms.dmi b/icons/mob/items/righthand_uniforms.dmi index e889b35aee..877532b4cd 100644 Binary files a/icons/mob/items/righthand_uniforms.dmi and b/icons/mob/items/righthand_uniforms.dmi differ diff --git a/icons/mob/items/righthand_uniforms_1.dmi b/icons/mob/items/righthand_uniforms_1.dmi deleted file mode 100644 index 1508f67bed..0000000000 Binary files a/icons/mob/items/righthand_uniforms_1.dmi and /dev/null differ diff --git a/icons/mob/spacesuit.dmi b/icons/mob/spacesuit.dmi deleted file mode 100644 index 7d7c0c61cf..0000000000 Binary files a/icons/mob/spacesuit.dmi and /dev/null differ diff --git a/icons/mob/spacesuit_vr.dmi b/icons/mob/spacesuit_vr.dmi deleted file mode 100644 index 836b3a623d..0000000000 Binary files a/icons/mob/spacesuit_vr.dmi and /dev/null differ diff --git a/icons/mob/species/teshari/back.dmi b/icons/mob/species/teshari/back.dmi deleted file mode 100644 index 9de0f3544c..0000000000 Binary files a/icons/mob/species/teshari/back.dmi and /dev/null differ diff --git a/icons/mob/species/teshari/deptcloak.dmi b/icons/mob/species/teshari/deptcloak.dmi deleted file mode 100644 index 7a9a412853..0000000000 Binary files a/icons/mob/species/teshari/deptcloak.dmi and /dev/null differ diff --git a/icons/mob/species/teshari/deptjacket.dmi b/icons/mob/species/teshari/deptjacket.dmi deleted file mode 100644 index 020415a61e..0000000000 Binary files a/icons/mob/species/teshari/deptjacket.dmi and /dev/null differ diff --git a/icons/mob/species/teshari/suit.dmi b/icons/mob/species/teshari/suit.dmi deleted file mode 100644 index 714b0408a5..0000000000 Binary files a/icons/mob/species/teshari/suit.dmi and /dev/null differ diff --git a/icons/mob/species/teshari/teshari_cloak.dmi b/icons/mob/species/teshari/teshari_cloak.dmi deleted file mode 100644 index a222ede26b..0000000000 Binary files a/icons/mob/species/teshari/teshari_cloak.dmi and /dev/null differ diff --git a/icons/mob/species/teshari/teshari_hood.dmi b/icons/mob/species/teshari/teshari_hood.dmi deleted file mode 100644 index 64ae2eced3..0000000000 Binary files a/icons/mob/species/teshari/teshari_hood.dmi and /dev/null differ diff --git a/icons/mob/species/teshari/teshari_uniform.dmi b/icons/mob/species/teshari/teshari_uniform.dmi deleted file mode 100644 index 092f78a0e1..0000000000 Binary files a/icons/mob/species/teshari/teshari_uniform.dmi and /dev/null differ diff --git a/icons/mob/species/teshari/uniform.dmi b/icons/mob/species/teshari/uniform.dmi deleted file mode 100644 index aab4dcfe06..0000000000 Binary files a/icons/mob/species/teshari/uniform.dmi and /dev/null differ diff --git a/icons/mob/species/vox/uniform.dmi b/icons/mob/species/vox/uniform.dmi deleted file mode 100644 index fe53df15ed..0000000000 Binary files a/icons/mob/species/vox/uniform.dmi and /dev/null differ diff --git a/icons/mob/species/werebeast/uniform.dmi b/icons/mob/species/werebeast/uniform.dmi deleted file mode 100644 index 267847085f..0000000000 Binary files a/icons/mob/species/werebeast/uniform.dmi and /dev/null differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi deleted file mode 100644 index 58b92c82dd..0000000000 Binary files a/icons/mob/suit.dmi and /dev/null differ diff --git a/icons/mob/suit_1.dmi b/icons/mob/suit_1.dmi deleted file mode 100644 index 7515beba12..0000000000 Binary files a/icons/mob/suit_1.dmi and /dev/null differ diff --git a/icons/mob/suit_solgov.dmi b/icons/mob/suit_solgov.dmi deleted file mode 100644 index de20b89c17..0000000000 Binary files a/icons/mob/suit_solgov.dmi and /dev/null differ diff --git a/icons/mob/suit_vr.dmi b/icons/mob/suit_vr.dmi deleted file mode 100644 index 77862540b3..0000000000 Binary files a/icons/mob/suit_vr.dmi and /dev/null differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi deleted file mode 100644 index 9c210eb641..0000000000 Binary files a/icons/mob/uniform.dmi and /dev/null differ diff --git a/icons/mob/uniform_1.dmi b/icons/mob/uniform_1.dmi deleted file mode 100644 index 1f22a767b6..0000000000 Binary files a/icons/mob/uniform_1.dmi and /dev/null differ diff --git a/icons/mob/uniform_fat.dmi b/icons/mob/uniform_fat.dmi deleted file mode 100644 index c887239f1f..0000000000 Binary files a/icons/mob/uniform_fat.dmi and /dev/null differ diff --git a/icons/mob/uniform_huge_old.dmi b/icons/mob/uniform_huge_old.dmi deleted file mode 100644 index 3bac93b933..0000000000 Binary files a/icons/mob/uniform_huge_old.dmi and /dev/null differ diff --git a/icons/mob/uniform_rolled_down.dmi b/icons/mob/uniform_rolled_down.dmi deleted file mode 100644 index b5002751cf..0000000000 Binary files a/icons/mob/uniform_rolled_down.dmi and /dev/null differ diff --git a/icons/mob/uniform_rolled_down_1.dmi b/icons/mob/uniform_rolled_down_1.dmi deleted file mode 100644 index 2412be7420..0000000000 Binary files a/icons/mob/uniform_rolled_down_1.dmi and /dev/null differ diff --git a/icons/mob/uniform_rolled_down_vr.dmi b/icons/mob/uniform_rolled_down_vr.dmi deleted file mode 100644 index 726708d822..0000000000 Binary files a/icons/mob/uniform_rolled_down_vr.dmi and /dev/null differ diff --git a/icons/mob/uniform_sleeves_rolled.dmi b/icons/mob/uniform_sleeves_rolled.dmi deleted file mode 100644 index 1c7c6ef7c3..0000000000 Binary files a/icons/mob/uniform_sleeves_rolled.dmi and /dev/null differ diff --git a/icons/mob/uniform_sleeves_rolled_1.dmi b/icons/mob/uniform_sleeves_rolled_1.dmi deleted file mode 100644 index 2412be7420..0000000000 Binary files a/icons/mob/uniform_sleeves_rolled_1.dmi and /dev/null differ diff --git a/icons/mob/uniform_sleeves_rolled_vr.dmi b/icons/mob/uniform_sleeves_rolled_vr.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/icons/mob/uniform_sleeves_rolled_vr.dmi and /dev/null differ diff --git a/icons/mob/uniform_solgov.dmi b/icons/mob/uniform_solgov.dmi deleted file mode 100644 index ecc6310dc4..0000000000 Binary files a/icons/mob/uniform_solgov.dmi and /dev/null differ diff --git a/icons/mob/uniform_vr.dmi b/icons/mob/uniform_vr.dmi deleted file mode 100644 index cd9683972e..0000000000 Binary files a/icons/mob/uniform_vr.dmi and /dev/null differ diff --git a/icons/obj/clothing/hats_vr.dmi b/icons/obj/clothing/hats_vr.dmi deleted file mode 100644 index bc6cd12245..0000000000 Binary files a/icons/obj/clothing/hats_vr.dmi and /dev/null differ diff --git a/icons/obj/clothing/helmets_vr.dmi b/icons/obj/clothing/helmets_vr.dmi deleted file mode 100644 index 3b210b9980..0000000000 Binary files a/icons/obj/clothing/helmets_vr.dmi and /dev/null differ diff --git a/icons/obj/clothing/rings.dmi b/icons/obj/clothing/rings.dmi deleted file mode 100644 index 5274bf8735..0000000000 Binary files a/icons/obj/clothing/rings.dmi and /dev/null differ diff --git a/icons/obj/clothing/spacesuits.dmi b/icons/obj/clothing/spacesuits.dmi deleted file mode 100644 index ae9cc5764f..0000000000 Binary files a/icons/obj/clothing/spacesuits.dmi and /dev/null differ diff --git a/icons/obj/clothing/spacesuits_vr.dmi b/icons/obj/clothing/spacesuits_vr.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/icons/obj/clothing/spacesuits_vr.dmi and /dev/null differ diff --git a/icons/obj/clothing/species/teshari/suits.dmi b/icons/obj/clothing/species/teshari/suits.dmi deleted file mode 100644 index 820649befa..0000000000 Binary files a/icons/obj/clothing/species/teshari/suits.dmi and /dev/null differ diff --git a/icons/obj/clothing/species/teshari/uniform.dmi b/icons/obj/clothing/species/teshari/uniform.dmi deleted file mode 100644 index 82d4d126da..0000000000 Binary files a/icons/obj/clothing/species/teshari/uniform.dmi and /dev/null differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi deleted file mode 100644 index 788bfa06ba..0000000000 Binary files a/icons/obj/clothing/suits.dmi and /dev/null differ diff --git a/icons/obj/clothing/suits_1.dmi b/icons/obj/clothing/suits_1.dmi deleted file mode 100644 index 3e905eda58..0000000000 Binary files a/icons/obj/clothing/suits_1.dmi and /dev/null differ diff --git a/icons/obj/clothing/suits_solgov.dmi b/icons/obj/clothing/suits_solgov.dmi deleted file mode 100644 index e5259d22e8..0000000000 Binary files a/icons/obj/clothing/suits_solgov.dmi and /dev/null differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi deleted file mode 100644 index 7b397d3ead..0000000000 Binary files a/icons/obj/clothing/uniforms.dmi and /dev/null differ diff --git a/icons/obj/clothing/uniforms_1.dmi b/icons/obj/clothing/uniforms_1.dmi deleted file mode 100644 index 348cf8dd94..0000000000 Binary files a/icons/obj/clothing/uniforms_1.dmi and /dev/null differ diff --git a/icons/obj/clothing/uniforms_solgov.dmi b/icons/obj/clothing/uniforms_solgov.dmi deleted file mode 100644 index 2b55ea04a2..0000000000 Binary files a/icons/obj/clothing/uniforms_solgov.dmi and /dev/null differ diff --git a/icons/obj/clothing/uniforms_vr.dmi b/icons/obj/clothing/uniforms_vr.dmi deleted file mode 100644 index 4dc173cff2..0000000000 Binary files a/icons/obj/clothing/uniforms_vr.dmi and /dev/null differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 9f212a6a27..9227707ea3 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/doors/1x4blast_hor_sec.dmi b/icons/obj/doors/1x4blast_hor_sec.dmi new file mode 100644 index 0000000000..53df08b41f Binary files /dev/null and b/icons/obj/doors/1x4blast_hor_sec.dmi differ diff --git a/icons/obj/doors/1x4blast_vert_sec.dmi b/icons/obj/doors/1x4blast_vert_sec.dmi new file mode 100644 index 0000000000..73cbc1b95f Binary files /dev/null and b/icons/obj/doors/1x4blast_vert_sec.dmi differ diff --git a/icons/obj/overmap_vr.dmi b/icons/obj/overmap_vr.dmi index 347f06ead1..b31599d5a6 100644 Binary files a/icons/obj/overmap_vr.dmi and b/icons/obj/overmap_vr.dmi differ diff --git a/icons/skybox/virgo3b.dmi b/icons/skybox/virgo3b.dmi new file mode 100644 index 0000000000..2192fab846 Binary files /dev/null and b/icons/skybox/virgo3b.dmi differ diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm index 74c69785d9..6b1b61cab2 100644 --- a/maps/offmap_vr/om_ships/aro3.dmm +++ b/maps/offmap_vr/om_ships/aro3.dmm @@ -200,6 +200,10 @@ }, /turf/simulated/floor/reinforced/airless, /area/space) +"bF" = ( +/obj/machinery/light/floortube, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/aro3/repair_bay) "bH" = ( /obj/structure/closet/walllocker/emerglocker/north{ dir = 8; @@ -746,6 +750,12 @@ }, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/power) +"gc" = ( +/obj/machinery/light/floortube{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark, +/area/aro3/surfluid) "gd" = ( /turf/simulated/floor/wood, /area/aro3/suite_port) @@ -1117,8 +1127,18 @@ }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/hallway_bunkrooms) +"iI" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/light_switch{ + pixel_x = -25; + pixel_y = 25 + }, +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/aro3/bar) "iJ" = ( -/obj/structure/bed/chair/sofa/black{ +/obj/structure/bed/chair/sofa/corp{ dir = 1 }, /turf/simulated/floor/tiled/eris/dark, @@ -1209,8 +1229,8 @@ /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/function) "jh" = ( -/obj/structure/bed/chair/sofa/black/corner{ - dir = 4 +/obj/structure/bed/chair/sofa/corp/corner{ + dir = 1 }, /turf/simulated/floor/tiled/eris/dark, /area/aro3/function) @@ -1301,7 +1321,7 @@ /area/aro3/medical) "ke" = ( /obj/structure/fans/hardlight, -/obj/machinery/door/blast/multi_tile/two_tile_hor{ +/obj/machinery/door/blast/multi_tile/four_tile_hor_sec{ id = "aroshipshutter_ramp" }, /turf/simulated/floor/reinforced, @@ -1338,6 +1358,9 @@ /obj/structure/cable/cyan{ icon_state = "1-8" }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "kl" = ( @@ -1517,6 +1540,15 @@ }, /turf/simulated/floor/wood, /area/aro3/suite_starboard) +"lC" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/water/indoors/surfluid, +/area/aro3/workshop) "lI" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -1603,10 +1635,8 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) "mG" = ( -/obj/structure/closet/walllocker/emerglocker/north, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -25 +/obj/machinery/vending/boozeomat{ + density = 0 }, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/aro3/bar) @@ -1693,7 +1723,7 @@ /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/power) "nq" = ( -/obj/structure/bed/chair/sofa/black/right{ +/obj/structure/bed/chair/sofa/corp/right{ dir = 8 }, /turf/simulated/floor/tiled/eris/dark, @@ -2049,10 +2079,10 @@ /area/aro3/workshop) "qV" = ( /obj/machinery/light{ - dir = 1 + dir = 4 }, -/turf/simulated/floor/plating/eris/under, -/area/aro3/power) +/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/area/aro3/hallway_port) "qW" = ( /obj/structure/railing/grey{ dir = 4 @@ -2151,10 +2181,10 @@ /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/flight_deck) "rx" = ( -/obj/structure/bed/chair/sofa/black/right{ +/obj/machinery/light, +/obj/structure/bed/chair/sofa/corp/left{ dir = 1 }, -/obj/machinery/light, /turf/simulated/floor/tiled/eris/dark, /area/aro3/function) "rA" = ( @@ -2469,6 +2499,12 @@ }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) +"uL" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plating/eris/under, +/area/aro3/power) "uS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -2868,11 +2904,10 @@ /turf/simulated/floor/tiled/eris/dark, /area/aro3/power) "xG" = ( -/obj/structure/fans/hardlight, /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/reinforced, +/turf/simulated/wall/rpshull, /area/aro3/flight_deck) "xI" = ( /obj/structure/flora/pottedplant/unusual, @@ -2946,6 +2981,15 @@ }, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/aro3/repair_bay) +"yx" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + landmark_tag = "aronai3_aftstbd"; + name = "Aft and Starboard" + }, +/turf/space, +/area/space) "yy" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -3123,6 +3167,9 @@ /obj/structure/cable/cyan{ icon_state = "2-4" }, +/obj/machinery/light/floortube{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/dark, /area/aro3/surfluid) "zu" = ( @@ -3233,10 +3280,7 @@ /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/aro3/bar) "zY" = ( -/obj/machinery/vending/boozeomat{ - density = 0; - pixel_y = 32 - }, +/obj/structure/closet/walllocker/emerglocker/north, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/aro3/bar) "Aa" = ( @@ -3411,15 +3455,15 @@ /area/aro3/hallway_starboard) "Bw" = ( /obj/structure/fans/hardlight, -/obj/machinery/door/blast/multi_tile/four_tile_hor{ - id = "aroshipshutter_ramp" - }, /obj/machinery/button/remote/blast_door{ dir = 4; id = "aroshipshutter_ramp"; name = "hangar shutters"; pixel_x = -28 }, +/obj/machinery/door/blast/multi_tile/four_tile_hor_sec{ + id = "aroshipshutter_ramp" + }, /turf/simulated/floor/reinforced, /area/aro3/flight_deck) "Bx" = ( @@ -3581,13 +3625,10 @@ /turf/simulated/floor/tiled/techmaint, /area/aro3/hallway_bunkrooms) "Di" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/space; - landmark_tag = "aronai3_aftstbd"; - name = "Aft and Starboard" +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 }, -/turf/space, +/turf/simulated/floor/reinforced/airless, /area/space) "Dn" = ( /turf/space/internal_edge/left, @@ -3614,12 +3655,14 @@ /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/aro3/hallway_bunkrooms) "DA" = ( -/obj/structure/fans/hardlight, -/obj/machinery/door/blast/multi_tile/four_tile_hor{ - id = "aroshipshutter_ramp" +/obj/structure/cable/cyan{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced, -/area/aro3/flight_deck) +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) "DB" = ( /obj/structure/cable/cyan{ icon_state = "2-8" @@ -3640,7 +3683,7 @@ /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/eva_hall) "DQ" = ( -/obj/structure/bed/chair/sofa/black/left{ +/obj/structure/bed/chair/sofa/corp/left{ dir = 4 }, /turf/simulated/floor/tiled/eris/dark, @@ -3717,6 +3760,12 @@ }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) +"Ew" = ( +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/turf/simulated/floor/plating/eris/under, +/area/aro3/power) "Ex" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 23 @@ -4048,6 +4097,12 @@ "Hv" = ( /turf/simulated/floor/bluegrid, /area/space) +"Hw" = ( +/obj/machinery/light/floortube{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/dark, +/area/aro3/function) "Hz" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -4070,7 +4125,7 @@ /turf/space, /area/space) "HH" = ( -/obj/structure/bed/chair/sofa/black{ +/obj/structure/bed/chair/sofa/corp{ dir = 4 }, /turf/simulated/floor/tiled/eris/dark, @@ -4145,6 +4200,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/light/floortube, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/workshop) "IK" = ( @@ -4419,6 +4475,9 @@ /obj/machinery/clonepod/transhuman/full{ req_access = list() }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/eris/white/cargo, /area/aro3/medical) "Lp" = ( @@ -4437,7 +4496,7 @@ /turf/simulated/floor/tiled/eris/white/cargo, /area/aro3/medical) "Ls" = ( -/obj/structure/bed/chair/sofa/black/corner{ +/obj/structure/bed/chair/sofa/corp/corner{ dir = 8 }, /turf/simulated/floor/tiled/eris/dark, @@ -4653,6 +4712,9 @@ /obj/structure/cable/cyan{ icon_state = "1-4" }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "Na" = ( @@ -4740,6 +4802,15 @@ }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/aro3/cockpit) +"NR" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/area/aro3/hallway_starboard) "NU" = ( /obj/structure/table/steel, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -4753,6 +4824,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/machinery/light, /turf/simulated/floor/tiled/eris/white/cargo, /area/aro3/medical) "Ob" = ( @@ -4902,11 +4974,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/machinery/light, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_bunkrooms) "Px" = ( -/obj/machinery/alarm/alarms_hidden{ - pixel_y = 26 +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/plating/eris/under, /area/aro3/power) @@ -4937,7 +5010,7 @@ /turf/simulated/floor/tiled/eris/white/golden, /area/aro3/medical) "PJ" = ( -/obj/structure/bed/chair/sofa/black{ +/obj/structure/bed/chair/sofa/corp{ dir = 8 }, /turf/simulated/floor/tiled/eris/dark, @@ -5416,10 +5489,10 @@ /turf/simulated/wall/rpshull, /area/aro3/flight_deck) "Us" = ( -/obj/structure/bed/chair/sofa/black/left{ +/obj/machinery/light, +/obj/structure/bed/chair/sofa/corp/right{ dir = 1 }, -/obj/machinery/light, /turf/simulated/floor/tiled/eris/dark, /area/aro3/function) "Ut" = ( @@ -10378,7 +10451,7 @@ Ua Ua Ua Ua -Ua +Lf Ua Ua Ua @@ -11224,7 +11297,7 @@ Ua Ua Ua Ua -Lf +Ua Ua Ua Ua @@ -13910,10 +13983,10 @@ xj uE kH aq -TW +uL rP Gs -TW +uL aq Fn yn @@ -14194,7 +14267,7 @@ aS uE XQ aq -TW +Ew wx wx TW @@ -14336,7 +14409,7 @@ jV ED NV aq -qV +TW wW RK TW @@ -14483,7 +14556,7 @@ ps xa TW TW -TW +uL aq aq aq @@ -15009,7 +15082,7 @@ IT hb Xm hU -Cv +qV Cv Ej ZB @@ -15578,7 +15651,7 @@ zu uJ dp uJ -zu +Hw qX Fb zu @@ -15749,7 +15822,7 @@ Fr NC NC ue -Is +bF hi Hn NC @@ -15909,8 +15982,8 @@ Ov Ov Ov Ov -ke -hD +Ur +Di hD hD Au @@ -16052,7 +16125,7 @@ MA MA MA xG -te +DA te te sV @@ -16175,7 +16248,7 @@ CH NC NC cc -Is +bF Is Gt NC @@ -16193,7 +16266,7 @@ Ov Ov Ov Ov -DA +ke hD hD hD @@ -16288,7 +16361,7 @@ zu uJ nW uJ -zu +Hw qX Fb zu @@ -16308,7 +16381,7 @@ AD RJ vb yk -yk +gc yk Kw RJ @@ -16855,7 +16928,7 @@ Hd wF uX Yh -re +NR re bR BX @@ -17309,7 +17382,7 @@ WJ ly aY ki -aY +lC aY ly lq @@ -18011,7 +18084,7 @@ Yj LS EV mG -aO +iI DH Fx YY @@ -18026,7 +18099,7 @@ dO Ym tl nm -NF +TM fB gG ax @@ -20880,7 +20953,7 @@ Ua Ua Ua Ua -Di +Ua Ua Ua Ua @@ -21738,7 +21811,7 @@ Ua Ua Ua Ua -Ua +yx Ua Ua Ua diff --git a/maps/southern_cross/items/clothing/sc_accessory.dm b/maps/southern_cross/items/clothing/sc_accessory.dm index 66d977ffc2..f47c344fcd 100644 --- a/maps/southern_cross/items/clothing/sc_accessory.dm +++ b/maps/southern_cross/items/clothing/sc_accessory.dm @@ -10,5 +10,5 @@ desc = "Sturdy mess of black synthcotton belts and buckles." icon_state = "pilot_webbing2" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/ties.dmi' + SPECIES_TESHARI = 'icons/inventory/accessory/mob_teshari.dmi' ) \ No newline at end of file diff --git a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm index 7cf63e8768..862b563cf0 100644 --- a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm +++ b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm @@ -47,7 +47,6 @@ /area/space) "aj" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ - icon_state = "map"; dir = 1 }, /obj/structure/lattice, @@ -55,7 +54,6 @@ /area/space) "ak" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - icon_state = "intact"; dir = 4 }, /turf/space, @@ -107,9 +105,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engineering/engine_room) @@ -136,7 +132,6 @@ /area/engineering/engine_room) "ay" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ - icon_state = "map"; dir = 1 }, /turf/simulated/floor, @@ -176,10 +171,8 @@ "aF" = ( /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineVent"; - name = "Reactor Vent"; - p_open = 0 + name = "Reactor Vent" }, /turf/simulated/floor/reinforced/nitrogen{ nitrogen = 82.1472 @@ -237,7 +230,6 @@ /area/engineering/engine_room) "aN" = ( /obj/effect/floor_decal/industrial/warning/cee{ - icon_state = "warningcee"; dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/engine{ @@ -248,8 +240,6 @@ icon_state = "map_vent_in"; id_tag = "cooling_out"; initialize_directions = 4; - pressure_checks = 1; - pressure_checks_default = 1; pump_direction = 0; use_power = 1 }, @@ -259,20 +249,16 @@ /area/engineering/engine_room) "aO" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 4 }, /obj/structure/grille, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 1 }, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 8 }, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 4 }, /obj/machinery/door/blast/regular{ @@ -285,7 +271,6 @@ /area/engineering/engine_room) "aP" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 4 }, /obj/effect/floor_decal/industrial/warning{ @@ -295,7 +280,6 @@ /area/engineering/engine_room) "aQ" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 4 }, /obj/effect/floor_decal/industrial/warning, @@ -307,21 +291,18 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 4 }, /turf/simulated/floor, /area/engineering/engine_room) "aS" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 4 }, /turf/simulated/floor, /area/engineering/engine_room) "aT" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 10 }, /obj/machinery/meter, @@ -345,11 +326,9 @@ /area/template_noop) "aW" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 8 }, /obj/machinery/camera/network/engine{ @@ -371,11 +350,9 @@ /area/engineering/engine_room) "aY" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 8 }, /turf/simulated/floor/reinforced/nitrogen{ @@ -385,11 +362,9 @@ "aZ" = ( /obj/structure/grille, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 8 }, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 4 }, /obj/machinery/door/blast/regular{ @@ -415,7 +390,6 @@ state = 2 }, /obj/structure/cable/cyan{ - d1 = 0; d2 = 4; icon_state = "0-4" }, @@ -470,7 +444,6 @@ icon_state = "0-8" }, /obj/structure/cable/cyan{ - d1 = 0; d2 = 4; icon_state = "0-4" }, @@ -495,16 +468,13 @@ /area/engineering/engine_room) "bh" = ( /obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 10 }, /obj/machinery/atmospherics/unary/outlet_injector{ - dir = 2; frequency = 1438; - icon_state = "map_injector"; id = "cooling_in"; name = "Coolant Injector"; pixel_y = 1; @@ -518,7 +488,6 @@ /area/engineering/engine_room) "bi" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 1 }, /obj/effect/floor_decal/industrial/warning, @@ -546,11 +515,9 @@ /obj/structure/grille, /obj/structure/window/phoronreinforced, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 8 }, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 4 }, /obj/machinery/door/blast/regular{ @@ -563,7 +530,6 @@ /area/engineering/engine_room) "bl" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 9 }, /turf/simulated/floor, @@ -585,7 +551,6 @@ /area/engineering/engine_room) "bo" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ - icon_state = "intact"; dir = 10 }, /turf/simulated/floor, @@ -601,8 +566,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor, /area/engineering/engine_room) @@ -611,15 +575,12 @@ /obj/structure/grille, /obj/structure/window/phoronreinforced, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 1 }, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 8 }, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 4 }, /obj/machinery/door/blast/regular{ @@ -643,15 +604,12 @@ /obj/structure/grille, /obj/structure/window/phoronreinforced, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 1 }, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 8 }, /obj/structure/window/phoronreinforced{ - icon_state = "phoronrwindow"; dir = 4 }, /obj/machinery/door/blast/regular{ @@ -686,9 +644,10 @@ req_access = list(10) }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 + }, +/obj/item/device/geiger/wall/west{ + pixel_x = -36 }, /turf/simulated/floor, /area/engineering/engine_room) @@ -728,12 +687,9 @@ /area/template_noop) "bB" = ( /obj/machinery/computer/general_air_control/supermatter_core{ - dir = 2; - frequency = 1438; input_tag = "cooling_in"; name = "Engine Cooling Control"; output_tag = "cooling_out"; - pressure_setting = 100; sensors = list("engine_sensor" = "Engine Core"); throwpass = 1 }, @@ -751,7 +707,6 @@ id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutters"; pixel_x = -25; - pixel_y = 0; req_access = list(10) }, /turf/simulated/floor, @@ -801,7 +756,6 @@ dir = 4 }, /obj/machinery/atmospherics/valve/digital{ - dir = 2; name = "Emergency Cooling Valve 1" }, /obj/effect/floor_decal/industrial/warning/corner{ @@ -856,7 +810,6 @@ desc = "A remote control-switch for the engine control room blast doors."; id = "EngineBlast"; name = "Engine Monitoring Room Blast Doors"; - pixel_x = 0; pixel_y = -3; req_access = list(10) }, @@ -944,8 +897,7 @@ /area/engineering/engine_room) "bX" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor, @@ -956,7 +908,6 @@ /area/engineering/engine_room) "bZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 6 }, /obj/effect/floor_decal/industrial/warning, @@ -964,7 +915,6 @@ /area/engineering/engine_room) "ca" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ - icon_state = "map"; dir = 4 }, /obj/effect/floor_decal/industrial/warning/corner{ @@ -1043,7 +993,6 @@ "ci" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 4 }, /turf/simulated/floor, @@ -1254,7 +1203,6 @@ /area/engineering/engine_room) "cF" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - icon_state = "intact"; dir = 5 }, /obj/effect/floor_decal/industrial/warning/corner, @@ -1262,7 +1210,6 @@ /area/engineering/engine_room) "cG" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ - icon_state = "map"; dir = 4 }, /obj/machinery/meter, @@ -1301,7 +1248,6 @@ desc = "A remote control-switch for the engine control room blast doors."; id = "EngineEmitterPortWest"; name = "Engine Room Blast Doors"; - pixel_x = 0; pixel_y = -25; req_access = null; req_one_access = list(11,24) @@ -1331,7 +1277,6 @@ /area/engineering/engine_room) "cP" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 4 }, /turf/simulated/floor, @@ -1346,7 +1291,6 @@ id_tag = "eng_al_int_snsr"; master_tag = "engine_room_airlock"; pixel_x = 22; - pixel_y = 0; req_access = list(10) }, /turf/simulated/floor, @@ -1354,7 +1298,6 @@ "cR" = ( /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineEmitterPortWest"; layer = 3.3; name = "Engine Gas Storage" @@ -1420,7 +1363,6 @@ desc = "A remote control-switch for the engine control room blast doors."; id = "EngineEmitterPortWest"; name = "Engine Room Blast Doors"; - pixel_x = 0; pixel_y = 25; req_access = null; req_one_access = list(11,24) @@ -1432,7 +1374,6 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor, @@ -1445,7 +1386,6 @@ /obj/machinery/button/remote/blast_door{ id = "EngineVent"; name = "Reactor Ventillatory Control"; - pixel_x = 0; pixel_y = -25; req_access = list(10) }, @@ -1471,7 +1411,6 @@ /area/engineering/engine_room) "df" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 4 }, /obj/machinery/alarm{ @@ -1483,14 +1422,12 @@ /area/engineering/engine_room) "dg" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - icon_state = "intact"; dir = 9 }, /turf/simulated/floor, /area/engineering/engine_room) "dh" = ( /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor, @@ -1518,13 +1455,11 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor, /area/engineering/engine_gas) @@ -1532,8 +1467,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/engineering/engine_room) @@ -1541,8 +1475,7 @@ /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor, /area/engineering/engine_gas) @@ -1617,7 +1550,6 @@ id = "EngineEmitterPortWest2"; name = "Engine Room Blast Doors"; pixel_x = 25; - pixel_y = 0; req_access = null; req_one_access = list(11,24) }, @@ -1627,9 +1559,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/template_noop) @@ -1637,7 +1567,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineEmitterPortWest2"; layer = 3.3; name = "Engine Gas Storage" @@ -1655,13 +1584,16 @@ }, /obj/machinery/door/blast/regular{ dir = 4; - icon_state = "pdoor1"; id = "EngineEmitterPortWest2"; layer = 3.3; name = "Engine Gas Storage" }, /turf/simulated/floor/tiled/steel_grid, /area/template_noop) +"vA" = ( +/obj/item/device/geiger/wall/south, +/turf/template_noop, +/area/template_noop) (1,1,1) = {" aa @@ -2515,7 +2447,7 @@ bA aa aa aa -aa +vA av aa aa diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm index fa271cb5de..c0222796c1 100644 --- a/maps/tether/tether-04-transit.dmm +++ b/maps/tether/tether-04-transit.dmm @@ -1,9 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ag" = ( -/obj/structure/bed/chair/wood{ - dir = 4 - }, -/turf/simulated/floor/wood, +/obj/structure/bed/chair/wood, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) "cB" = ( /obj/structure/disposalpipe/segment{ @@ -50,14 +48,15 @@ /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "dc" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) "dU" = ( -/obj/structure/bed/chair/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, +/obj/structure/table/woodentable, +/obj/random/plushie, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) "fI" = ( /obj/machinery/light{ @@ -89,15 +88,10 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"hk" = ( -/obj/structure/table/woodentable, -/obj/random/plushie, -/turf/simulated/floor/wood, -/area/tether/midpoint) "hp" = ( /obj/structure/table/woodentable, /obj/machinery/camera/network/civilian, -/turf/simulated/floor/wood, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) "it" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -151,13 +145,11 @@ /turf/simulated/floor/plating, /area/tether/midpoint) "kz" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/simulated/sky/virgo3b, +/turf/space/v3b_midpoint, /area/tether/transit) "lL" = ( /obj/effect/blocker, -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/simulated/sky/virgo3b, +/turf/space/v3b_midpoint, /area/tether/transit) "mz" = ( /obj/machinery/power/apc{ @@ -173,6 +165,9 @@ }, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"mT" = ( +/turf/simulated/floor/midpoint_glass/reinf, +/area/tether/midpoint) "no" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/cable{ @@ -297,10 +292,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) -"tA" = ( -/obj/structure/table/bench/padded, -/turf/simulated/floor/wood, -/area/tether/midpoint) "tB" = ( /obj/structure/cable{ d1 = 1; @@ -312,6 +303,10 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) +"tM" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/midpoint_glass/reinf, +/area/tether/midpoint) "uA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -326,21 +321,21 @@ /obj/machinery/holoposter{ pixel_y = 30 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) "vh" = ( /obj/structure/table/woodentable, /obj/structure/flora/pottedplant/small{ pixel_y = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) "vt" = ( /obj/structure/table/woodentable, /obj/machinery/camera/network/civilian{ dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) "wM" = ( /obj/structure/disposalpipe/segment{ @@ -411,7 +406,7 @@ /obj/machinery/holoposter{ pixel_y = -30 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) "Dz" = ( /turf/simulated/wall/r_wall, @@ -549,7 +544,10 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) "Ls" = ( /obj/structure/disposalpipe/down{ @@ -645,6 +643,13 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"Rl" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/woodentable, +/turf/simulated/floor/midpoint_glass/reinf, +/area/tether/midpoint) "RZ" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -657,7 +662,7 @@ dir = 9 }, /obj/structure/table/bench/padded, -/turf/simulated/floor/wood, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) "Tz" = ( /obj/structure/cable{ @@ -701,12 +706,16 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"Wf" = ( +/obj/structure/table/bench/padded, +/turf/simulated/floor/midpoint_glass/reinf, +/area/tether/midpoint) "WU" = ( /obj/machinery/light{ dir = 4 }, /obj/structure/table/bench/padded, -/turf/simulated/floor/wood, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) "WY" = ( /obj/structure/disposalpipe/segment{ @@ -746,7 +755,7 @@ /obj/structure/flora/pottedplant/smallcactus{ pixel_y = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/midpoint_glass/reinf, /area/tether/midpoint) (1,1,1) = {" @@ -6333,8 +6342,6 @@ kz kz kz kz -kz -kz lL lL lL @@ -6371,8 +6378,10 @@ lL lL lL lL -kz -kz +lL +lL +lL +lL kz kz kz @@ -6475,8 +6484,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -6512,6 +6519,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -6568,8 +6579,6 @@ kz kz kz kz -kz -kz "} (42,1,1) = {" kz @@ -6617,8 +6626,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -6654,6 +6661,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -6710,8 +6721,6 @@ kz kz kz kz -kz -kz "} (43,1,1) = {" kz @@ -6759,8 +6768,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -6796,6 +6803,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -6852,8 +6863,6 @@ kz kz kz kz -kz -kz "} (44,1,1) = {" kz @@ -6901,8 +6910,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -6938,6 +6945,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -6994,8 +7005,6 @@ kz kz kz kz -kz -kz "} (45,1,1) = {" kz @@ -7043,8 +7052,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -7080,6 +7087,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -7136,8 +7147,6 @@ kz kz kz kz -kz -kz "} (46,1,1) = {" kz @@ -7185,8 +7194,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -7222,6 +7229,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -7278,8 +7289,6 @@ kz kz kz kz -kz -kz "} (47,1,1) = {" kz @@ -7327,8 +7336,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -7364,6 +7371,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -7420,8 +7431,6 @@ kz kz kz kz -kz -kz "} (48,1,1) = {" kz @@ -7469,8 +7478,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -7506,6 +7513,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -7562,8 +7573,6 @@ kz kz kz kz -kz -kz "} (49,1,1) = {" kz @@ -7611,8 +7620,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -7648,6 +7655,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -7704,8 +7715,6 @@ kz kz kz kz -kz -kz "} (50,1,1) = {" kz @@ -7753,8 +7762,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -7790,6 +7797,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -7846,8 +7857,6 @@ kz kz kz kz -kz -kz "} (51,1,1) = {" kz @@ -7895,8 +7904,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -7932,6 +7939,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -7988,8 +7999,6 @@ kz kz kz kz -kz -kz "} (52,1,1) = {" kz @@ -8037,8 +8046,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -8074,6 +8081,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -8130,8 +8141,6 @@ kz kz kz kz -kz -kz "} (53,1,1) = {" kz @@ -8179,8 +8188,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -8216,6 +8223,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -8272,8 +8283,6 @@ kz kz kz kz -kz -kz "} (54,1,1) = {" kz @@ -8321,8 +8330,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -8335,6 +8342,8 @@ kz kz kz kz +kz +kz NJ Qc Qc @@ -8358,6 +8367,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -8414,8 +8425,6 @@ kz kz kz kz -kz -kz "} (55,1,1) = {" kz @@ -8463,8 +8472,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -8475,19 +8482,21 @@ kz kz kz kz +kz +kz NJ Qc cH -pK -pK -zi -pK -pK -pK -pK +mT +ag +Rl +dc +mT +ag +dU KN -pK -pK +mT +mT kn Qc zP @@ -8500,6 +8509,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -8556,8 +8567,6 @@ kz kz kz kz -kz -kz "} (56,1,1) = {" kz @@ -8605,8 +8614,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -8616,20 +8623,22 @@ kz kz kz kz +kz +kz PF PF fI pK -pK +mT ag +tM +dc +mT ag -pK -ag -ag -pK -ag -ag -pK +tM +dc +mT +mT pK Iq PF @@ -8642,6 +8651,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -8698,8 +8709,6 @@ kz kz kz kz -kz -kz "} (57,1,1) = {" kz @@ -8747,8 +8756,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -8757,20 +8764,22 @@ kz kz kz kz +kz +kz NJ PF Jl pK pK pK -dc -dc pK -dc -hk pK -dc -dc +pK +pK +pK +pK +pK +pK pK Hy Nt @@ -8784,6 +8793,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -8840,8 +8851,6 @@ kz kz kz kz -kz -kz "} (58,1,1) = {" kz @@ -8889,8 +8898,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -8899,20 +8906,22 @@ kz kz kz kz +kz +kz Et zi pK pK pK pK -dU -dU pK -dU -dU pK -dU -dU +pK +pK +pK +pK +pK +pK pK Or pK @@ -8926,6 +8935,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -8982,8 +8993,6 @@ kz kz kz kz -kz -kz "} (59,1,1) = {" kz @@ -9031,8 +9040,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -9040,6 +9047,8 @@ kz kz kz kz +kz +kz NJ gq pK @@ -9068,6 +9077,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -9124,8 +9135,6 @@ kz kz kz kz -kz -kz "} (60,1,1) = {" kz @@ -9173,8 +9182,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -9182,9 +9189,11 @@ kz kz kz kz +kz +kz Et -pK -pK +mT +mT pK pK pK @@ -9201,8 +9210,8 @@ PF Or pK pK -pK -pK +mT +mT Et kz kz @@ -9210,6 +9219,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -9266,8 +9277,6 @@ kz kz kz kz -kz -kz "} (61,1,1) = {" kz @@ -9315,8 +9324,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -9324,10 +9331,12 @@ kz kz kz kz +kz +kz Et -tA -tA -tA +Wf +Wf +pK pK pK Dz @@ -9342,9 +9351,9 @@ ML PF uA pK -tA -tA -tA +pK +Wf +Wf Et kz kz @@ -9352,6 +9361,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -9408,8 +9419,6 @@ kz kz kz kz -kz -kz "} (62,1,1) = {" kz @@ -9457,8 +9466,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -9466,10 +9473,12 @@ kz kz kz kz +kz +kz PF uC vh -dc +pK pK Iq Dz @@ -9484,7 +9493,7 @@ pM PF wM pK -dc +pK YB vt PF @@ -9494,6 +9503,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -9550,8 +9561,6 @@ kz kz kz kz -kz -kz "} (63,1,1) = {" kz @@ -9599,8 +9608,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -9608,10 +9615,12 @@ kz kz kz kz +kz +kz Et -tA -tA -tA +Wf +Wf +pK pK QE Dz @@ -9626,9 +9635,9 @@ PF PF WY pK -tA -tA -tA +pK +Wf +Wf Et kz kz @@ -9636,6 +9645,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -9692,8 +9703,6 @@ kz kz kz kz -kz -kz "} (64,1,1) = {" kz @@ -9741,8 +9750,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -9750,9 +9757,11 @@ kz kz kz kz +kz +kz Et -pK -pK +mT +mT pK pK pK @@ -9769,8 +9778,8 @@ pO Or pK pK -pK -pK +mT +mT Et kz kz @@ -9778,6 +9787,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -9834,8 +9845,6 @@ kz kz kz kz -kz -kz "} (65,1,1) = {" kz @@ -9883,8 +9892,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -9892,9 +9899,11 @@ kz kz kz kz +kz +kz Et -pK -pK +mT +mT pK pK pK @@ -9911,8 +9920,8 @@ sw Or pK pK -pK -pK +mT +mT Et kz kz @@ -9920,6 +9929,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -9976,8 +9987,6 @@ kz kz kz kz -kz -kz "} (66,1,1) = {" kz @@ -10025,8 +10034,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -10034,10 +10041,12 @@ kz kz kz kz +kz +kz Et -tA -tA -tA +Wf +Wf +pK pK QE Dz @@ -10052,9 +10061,9 @@ PF Kh hi pK -tA -tA -tA +pK +Wf +Wf Et kz kz @@ -10062,6 +10071,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -10118,8 +10129,6 @@ kz kz kz kz -kz -kz "} (67,1,1) = {" kz @@ -10167,8 +10176,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -10176,10 +10183,12 @@ kz kz kz kz +kz +kz PF hp YB -dc +pK pK Iq Dz @@ -10194,7 +10203,7 @@ PF PF wM pK -dc +pK vh zZ PF @@ -10204,6 +10213,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -10260,8 +10271,6 @@ kz kz kz kz -kz -kz "} (68,1,1) = {" kz @@ -10309,8 +10318,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -10318,10 +10325,12 @@ kz kz kz kz +kz +kz Et -tA -tA -tA +Wf +Wf +pK pK VB Dz @@ -10336,9 +10345,9 @@ pM PF Xo pK -tA -tA -tA +pK +Wf +Wf Et kz kz @@ -10346,6 +10355,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -10402,8 +10413,6 @@ kz kz kz kz -kz -kz "} (69,1,1) = {" kz @@ -10451,8 +10460,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -10460,9 +10467,11 @@ kz kz kz kz +kz +kz Et -pK -pK +mT +mT pK pK pK @@ -10479,8 +10488,8 @@ PF Or pK pK -pK -pK +mT +mT Et kz kz @@ -10488,6 +10497,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -10544,8 +10555,6 @@ kz kz kz kz -kz -kz "} (70,1,1) = {" kz @@ -10593,8 +10602,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -10602,6 +10609,8 @@ kz kz kz kz +kz +kz nD zP pK @@ -10630,6 +10639,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -10686,8 +10697,6 @@ kz kz kz kz -kz -kz "} (71,1,1) = {" kz @@ -10735,8 +10744,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -10745,6 +10752,8 @@ kz kz kz kz +kz +kz Et Pz Or @@ -10772,6 +10781,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -10828,8 +10839,6 @@ kz kz kz kz -kz -kz "} (72,1,1) = {" kz @@ -10877,8 +10886,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -10887,6 +10894,8 @@ kz kz kz kz +kz +kz nD PF RZ @@ -10914,6 +10923,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -10970,8 +10981,6 @@ kz kz kz kz -kz -kz "} (73,1,1) = {" kz @@ -11019,8 +11028,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -11030,20 +11037,22 @@ kz kz kz kz +kz +kz PF PF fI pK -pK -pK -tA -tA -tA -tA -tA -tA -pK -pK +mT +mT +Wf +Wf +Wf +Wf +Wf +Wf +mT +mT pK Iq PF @@ -11056,6 +11065,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -11112,8 +11123,6 @@ kz kz kz kz -kz -kz "} (74,1,1) = {" kz @@ -11161,8 +11170,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -11173,19 +11180,21 @@ kz kz kz kz +kz +kz nD Qc zP -pK -pK +mT +mT Sm -dc -dc -dc -dc +tM +tM +tM +tM WU -pK -pK +mT +mT NJ Qc gq @@ -11198,6 +11207,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -11254,8 +11265,6 @@ kz kz kz kz -kz -kz "} (75,1,1) = {" kz @@ -11303,8 +11312,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -11317,6 +11324,8 @@ kz kz kz kz +kz +kz nD Qc Qc @@ -11340,6 +11349,8 @@ kz kz kz kz +kz +kz lL kz kz @@ -11396,8 +11407,6 @@ kz kz kz kz -kz -kz "} (76,1,1) = {" kz @@ -11445,8 +11454,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -11482,6 +11489,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -11538,8 +11549,6 @@ kz kz kz kz -kz -kz "} (77,1,1) = {" kz @@ -11587,8 +11596,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -11624,6 +11631,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -11680,8 +11691,6 @@ kz kz kz kz -kz -kz "} (78,1,1) = {" kz @@ -11729,8 +11738,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -11766,6 +11773,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -11822,8 +11833,6 @@ kz kz kz kz -kz -kz "} (79,1,1) = {" kz @@ -11871,8 +11880,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -11908,6 +11915,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -11964,8 +11975,6 @@ kz kz kz kz -kz -kz "} (80,1,1) = {" kz @@ -12013,8 +12022,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -12050,6 +12057,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -12106,8 +12117,6 @@ kz kz kz kz -kz -kz "} (81,1,1) = {" kz @@ -12155,8 +12164,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -12192,6 +12199,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -12248,8 +12259,6 @@ kz kz kz kz -kz -kz "} (82,1,1) = {" kz @@ -12297,8 +12306,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -12334,6 +12341,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -12390,8 +12401,6 @@ kz kz kz kz -kz -kz "} (83,1,1) = {" kz @@ -12439,8 +12448,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -12476,6 +12483,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -12532,8 +12543,6 @@ kz kz kz kz -kz -kz "} (84,1,1) = {" kz @@ -12581,8 +12590,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -12618,6 +12625,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -12674,8 +12685,6 @@ kz kz kz kz -kz -kz "} (85,1,1) = {" kz @@ -12723,8 +12732,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -12760,6 +12767,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -12816,8 +12827,6 @@ kz kz kz kz -kz -kz "} (86,1,1) = {" kz @@ -12865,8 +12874,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -12902,6 +12909,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -12958,8 +12969,6 @@ kz kz kz kz -kz -kz "} (87,1,1) = {" kz @@ -13007,8 +13016,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -13044,6 +13051,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -13100,8 +13111,6 @@ kz kz kz kz -kz -kz "} (88,1,1) = {" kz @@ -13149,8 +13158,6 @@ kz kz kz kz -kz -kz lL kz kz @@ -13186,6 +13193,10 @@ kz kz kz kz +kz +kz +kz +kz lL kz kz @@ -13242,8 +13253,6 @@ kz kz kz kz -kz -kz "} (89,1,1) = {" kz @@ -13291,46 +13300,46 @@ kz kz kz kz -kz -kz lL -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz -kz lL -kz -kz +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL +lL kz kz kz @@ -13435,7 +13444,6 @@ kz kz kz kz -lL kz kz kz @@ -13470,7 +13478,8 @@ kz kz kz kz -lL +kz +kz kz kz kz @@ -13577,7 +13586,6 @@ kz kz kz kz -lL kz kz kz @@ -13612,7 +13620,8 @@ kz kz kz kz -lL +kz +kz kz kz kz @@ -13719,7 +13728,6 @@ kz kz kz kz -lL kz kz kz @@ -13754,7 +13762,8 @@ kz kz kz kz -lL +kz +kz kz kz kz @@ -13861,7 +13870,6 @@ kz kz kz kz -lL kz kz kz @@ -13896,7 +13904,8 @@ kz kz kz kz -lL +kz +kz kz kz kz @@ -14003,7 +14012,6 @@ kz kz kz kz -lL kz kz kz @@ -14038,7 +14046,8 @@ kz kz kz kz -lL +kz +kz kz kz kz @@ -14145,7 +14154,6 @@ kz kz kz kz -lL kz kz kz @@ -14180,7 +14188,8 @@ kz kz kz kz -lL +kz +kz kz kz kz @@ -14287,7 +14296,6 @@ kz kz kz kz -lL kz kz kz @@ -14322,7 +14330,8 @@ kz kz kz kz -lL +kz +kz kz kz kz @@ -14429,42 +14438,42 @@ kz kz kz kz -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL -lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz kz kz kz diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 8aeebf10bb..0ac3f3b9de 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -1411,9 +1411,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/firealarm{ pixel_y = 25 }, @@ -1621,7 +1618,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/small, /turf/simulated/floor/tiled, /area/tcomsat{ name = "\improper Telecomms Lobby" @@ -1890,6 +1886,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" @@ -1904,9 +1903,6 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/light/small{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" @@ -2094,9 +2090,6 @@ name = "\improper Telecomms Entrance" }) "ady" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -2243,9 +2236,6 @@ /area/maintenance/substation/engineering) "adJ" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light/small{ - dir = 8 - }, /obj/machinery/atmospherics/portables_connector{ dir = 4 }, @@ -9121,7 +9111,7 @@ pressure_checks_default = 0; use_power = 1 }, -/obj/machinery/light{ +/obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/tiled/dark{ @@ -9271,7 +9261,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/light/small, +/obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled, /area/tcommsat/computer) "awD" = ( @@ -9532,7 +9522,7 @@ pump_direction = 0; use_power = 1 }, -/obj/machinery/light{ +/obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled/dark{ @@ -10655,12 +10645,18 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/ai_server_room) "aBu" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) "aBw" = ( @@ -16996,6 +16992,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer{ name = "\improper Telecomms Storage" @@ -17526,9 +17523,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/light/small{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/ai_server_room) "dDR" = ( @@ -19164,7 +19158,7 @@ /turf/simulated/floor/carpet, /area/engineering/foyer) "fvZ" = ( -/obj/machinery/light{ +/obj/machinery/light/no_nightshift{ dir = 1 }, /turf/simulated/floor/bluegrid{ @@ -19428,9 +19422,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/light/small{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) "fLT" = ( @@ -20126,9 +20117,6 @@ /obj/item/weapon/stock_parts/subspace/amplifier, /obj/item/weapon/stock_parts/subspace/amplifier, /obj/item/weapon/stock_parts/subspace/amplifier, -/obj/machinery/light/small{ - dir = 8 - }, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer{ name = "\improper Telecomms Storage" @@ -20721,7 +20709,6 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/light/small, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "hjG" = ( @@ -21026,7 +21013,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/obj/machinery/light/small, +/obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/chamber) "hwC" = ( @@ -21588,9 +21575,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/small{ - dir = 1 - }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) "hQk" = ( @@ -22255,7 +22239,6 @@ /obj/item/weapon/stock_parts/micro_laser/high, /obj/item/weapon/stock_parts/micro_laser/high, /obj/item/weapon/stock_parts/micro_laser/high, -/obj/machinery/light/small, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer{ name = "\improper Telecomms Storage" @@ -22439,7 +22422,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/light/small, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -22449,6 +22431,7 @@ dir = 4; pixel_x = -22 }, +/obj/machinery/light/no_nightshift, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) "iIr" = ( @@ -27059,7 +27042,6 @@ /area/space) "mVE" = ( /obj/machinery/computer/teleporter, -/obj/machinery/light/small, /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) "mVM" = ( @@ -28609,9 +28591,6 @@ dir = 8; network = "tcommsat" }, -/obj/machinery/light/small{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "oEs" = ( @@ -29392,6 +29371,9 @@ /obj/item/weapon/stock_parts/subspace/analyzer, /obj/item/weapon/stock_parts/subspace/analyzer, /obj/item/weapon/stock_parts/subspace/analyzer, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer{ name = "\improper Telecomms Storage" @@ -33687,6 +33669,7 @@ /turf/simulated/floor, /area/maintenance/cargo) "uKQ" = ( +/obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "uKX" = ( @@ -34914,7 +34897,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/small{ +/obj/machinery/light/no_nightshift{ dir = 1 }, /turf/simulated/floor/tiled/dark, diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index f190c593b0..01f1594cf3 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -246,7 +246,8 @@ [i]Transponder[/i]: Transmitting (CIV), NanoTrasen IFF [b]Notice[/b]: NanoTrasen Base, authorized personnel only"} base = 1 - icon_state = "reddwarf" + icon = 'icons/obj/overmap_vr.dmi' + icon_state = "virgo3b" initial_generic_waypoints = list( "tether_dockarm_d1a1", //Bottom left, "tether_dockarm_d1a2", //Top left, @@ -296,6 +297,15 @@ else if(istype(AM, /obj/effect/overmap/visitable/ship)) atc.msg(message) +/obj/effect/overmap/visitable/sector/virgo3b/generate_skybox(zlevel) + var/static/image/bigone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "large") + var/static/image/smallone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "small") + + if(zlevel == Z_LEVEL_TRANSIT) + return bigone + else + return smallone + // For making the 6-in-1 holomap, we calculate some offsets #define TETHER_MAP_SIZE 140 // Width and height of compiled in tether z levels. #define TETHER_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns @@ -336,6 +346,7 @@ z = Z_LEVEL_TRANSIT name = "Transit" flags = MAP_LEVEL_STATION|MAP_LEVEL_SEALED|MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT + base_turf = /turf/space/v3b_midpoint // Special type that spawns fall triggers /datum/map_z_level/tether/station/space_low z = Z_LEVEL_SPACE_LOW diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index 9bd9d58e3a..e10c6a5fe0 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -215,3 +215,72 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) dir = EAST /turf/simulated/sky/virgo3b/moving/west dir = WEST + +/turf/simulated/floor/midpoint_glass + name = "glass floor" + desc = "Dont jump on it, or do, I'm not your mom." + icon = 'icons/turf/flooring/glass.dmi' + icon_state = "glass-0" + base_icon_state = "glass" + +/turf/simulated/floor/midpoint_glass/reinf + name = "reinforced glass floor" + desc = "Do jump on it, it can take it." + icon = 'icons/turf/flooring/reinf_glass.dmi' + icon_state = "reinf_glass-0" + base_icon_state = "reinf_glass" + +/turf/simulated/floor/midpoint_glass/Initialize() + . = ..() + return INITIALIZE_HINT_LATELOAD + +/turf/simulated/floor/midpoint_glass/LateInitialize() + do_icons() + +/turf/simulated/floor/midpoint_glass/proc/do_icons() + var/new_junction = NONE + + for(var/direction in cardinal) //Cardinal case first. + var/turf/T = get_step(src, direction) + if(istype(T, type)) + new_junction |= direction + + if(!(new_junction & (NORTH|SOUTH)) || !(new_junction & (EAST|WEST))) + icon_state = "[base_icon_state]-[new_junction]" + return + + if(new_junction & NORTH) + if(new_junction & WEST) + var/turf/T = get_step(src, NORTHWEST) + if(istype(T, type)) + new_junction |= (1<<7) + + if(new_junction & EAST) + var/turf/T = get_step(src, NORTHEAST) + if(istype(T, type)) + new_junction |= (1<<4) + + if(new_junction & SOUTH) + if(new_junction & WEST) + var/turf/T = get_step(src, SOUTHWEST) + if(istype(T, type)) + new_junction |= (1<<6) + + if(new_junction & EAST) + var/turf/T = get_step(src, SOUTHEAST) + if(istype(T, type)) + new_junction |= (1<<5) + + icon_state = "[base_icon_state]-[new_junction]" + + add_vis_overlay('icons/effects/effects.dmi', "white", plane = SPACE_PLANE, add_vis_flags = VIS_INHERIT_ID|VIS_UNDERLAY) + +/turf/space/v3b_midpoint/Initialize() + . = ..() + new /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b(src) + +/turf/space/v3b_midpoint/ChangeTurf(turf/N, tell_universe, force_lighting_update, preserve_outdoors) + . = ..() + for(var/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/F in src) + qdel(F) + \ No newline at end of file