cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-15 17:15:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11002 from VOREStation/Arokha/rearrange

Browse Source 
Move like every clothing icon file
This commit is contained in:
Aronai Sieyes
2021-07-10 12:22:43 -04:00
committed by GitHub
parent d8b141cb32 0e079d92e0
commit edc62e88fa
278 changed files with 669 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/chameleonproj.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/radio/headset.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/radio/headset_vr.dm
+2 -2
View File
@@ -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"
code/game/objects/items/devices/radio/radiopack.dm
+1 -1
View File
@@ -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
code/game/objects/items/robot/robot_items.dm
+5 -5
View File
@@ -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()
..()
code/game/objects/items/toys/toys.dm
+1 -1
View File
@@ -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'
code/game/objects/items/trash.dm
+3 -3
View File
@@ -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'
code/game/objects/items/weapons/chewables.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/cigs_lighters.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/storage/backpack.dm
+2 -2
View File
@@ -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
code/game/objects/items/weapons/storage/backpack_vr.dm
+36 -36
View File
@@ -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"
code/game/objects/items/weapons/storage/belt.dm
+2 -2
View File
@@ -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
code/game/objects/items/weapons/storage/belt_vr.dm
+5 -5
View File
@@ -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
code/game/objects/items/weapons/storage/pouches.dm
+1 -1
View File
@@ -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'
code/game/objects/items/weapons/tanks/tank_types_vr.dm
+3 -3
View File
@@ -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
code/game/objects/items/weapons/tanks/tanks.dm
+1 -1
View File
@@ -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'
code/game/objects/items/weapons/towels.dm
+3 -3
View File
@@ -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("<span class='notice'>[] uses [] to towel themselves off.</span>", user, src))
code/game/objects/items/weapons/traps_vr.dm
+1 -1
View File
@@ -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()