cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2493 from CHOMPStationBot/upstream-merge-11002

Browse Source 
[MIRROR] Move like every clothing icon file
This commit is contained in:
Nadyr
2021-07-13 22:21:08 -04:00
committed by GitHub
parent da17eb4769 4b7c509e6d
commit a803e5175f
292 changed files with 686 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/asset_cache/asset_list_items.dm
View File

@@ -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"

3
code/modules/clothing/chameleon.dm
View File

@@ -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

109
code/modules/clothing/clothing.dm
View File

@@ -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'
)
var/voicechange = 0
@@ -599,7 +597,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',
@@ -628,8 +626,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'
@@ -729,7 +727,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',
@@ -751,34 +749,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
@@ -819,7 +801,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',
@@ -845,8 +827,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'
)
//convenience var for defining the icon state for the overlay used when the clothing is worn.
@@ -872,8 +854,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))
@@ -893,7 +875,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)
@@ -901,23 +883,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))
@@ -930,11 +895,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
@@ -953,13 +918,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
@@ -1042,9 +1007,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"
@@ -1053,7 +1018,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, "<span class='notice'>You roll up your [src].</span>")
update_clothing_icon()
@@ -1075,9 +1040,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, "<span class='notice'>You roll up your [src]'s sleeves.</span>")
@@ -1085,7 +1050,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, "<span class='notice'>You roll down your [src]'s sleeves.</span>")
update_clothing_icon()

6
code/modules/clothing/clothing_icons.dm
View File

@@ -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 = ..()

67
code/modules/clothing/clothing_vr.dm
View File

@@ -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,41 +128,38 @@
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'
)
//"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')
/obj/item/clothing/under/New(var/mob/living/carbon/human/H)
..()
@@ -179,6 +176,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')

2
code/modules/clothing/ears/earrings.dm
View File

@@ -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"

2
code/modules/clothing/ears/ears.dm
View File

@@ -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)

8
code/modules/clothing/glasses/glasses.dm
View File

@@ -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,10 +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',
"Sergal" = 'icons/mob/species/sergal/eyes_yw.dmi', //YWedit
SPECIES_GREY_YW = 'icons/mob/species/grey/eyes.dmi'/*ywedit*/
SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi',
SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi'
)
/obj/item/clothing/glasses/update_clothing_icon()

31
code/modules/clothing/glasses/glasses_vr.dm
View File

@@ -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,7 @@
/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_GREY_YW = 'icons/mob/species/grey/eyes.dmi'/*ywedit*/
SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi',
SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi',
SPECIES_WEREBEAST = 'icons/inventory/eyes/mob_werebeast.dmi'
)

4
code/modules/clothing/glasses/hud_vr.dm
View File

@@ -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"

4
code/modules/clothing/gloves/arm_guards_vr.dm
View File

@@ -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'
icon = 'icons/inventory/hands/item_vr.dmi'
icon = 'icons/inventory/hands/mob_vr.dmi'

4
code/modules/clothing/gloves/miscellaneous_vr.dm
View File

@@ -1,7 +1,7 @@
/obj/item/clothing/gloves/weddingring
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 = ""
@@ -59,4 +59,4 @@
desc = "ye olde armored gauntlets"
name = "knight gauntlets"
icon_state = "brown"
item_state = "brown"
item_state = "brown"

4
code/modules/clothing/head/collectable.dm
View File

@@ -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

4
code/modules/clothing/head/helmet.dm
View File

@@ -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)

28
code/modules/clothing/head/helmet_vr.dm
View File

@@ -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

2
code/modules/clothing/head/hood_vr.dm
View File

@@ -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"

4
code/modules/clothing/head/jobs_vr.dm
View File

@@ -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

4
code/modules/clothing/head/misc_special.dm
View File

@@ -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

36
code/modules/clothing/head/misc_vr.dm
View File

@@ -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"

2
code/modules/clothing/head/pilot_helmet.dm
View File

@@ -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)

14
code/modules/clothing/head/pilot_helmet_vr.dm
View File

@@ -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"

8
code/modules/clothing/masks/gasmask_vr.dm
View File

@@ -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

2
code/modules/clothing/rings/material.dm
View File

@@ -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)

2
code/modules/clothing/rings/rings_vr.dm
View File

@@ -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 = ""

4
code/modules/clothing/shoes/boots_vr.dm
View File

@@ -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'
icon = 'icons/inventory/feet/item_vr.dmi'
icon_override = 'icons/inventory/feet/mob_vr.dmi'

4
code/modules/clothing/shoes/leg_guards_vr.dm
View File

@@ -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'
icon = 'icons/inventory/feet/item_vr.dmi'
icon_override = 'icons/inventory/feet/mob_vr.dmi'

20
code/modules/clothing/shoes/miscellaneous_vr.dm
View File

@@ -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"

18
code/modules/clothing/spacesuits/rig/rig_pieces.dm
View File

@@ -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

55
code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
View File

@@ -1,38 +1,35 @@
/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'
)
/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

4
code/modules/clothing/spacesuits/rig/suits/alien.dm
View File

@@ -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

4
code/modules/clothing/spacesuits/rig/suits/alien_ch.dm
View File

@@ -78,7 +78,7 @@
SPECIES_ZORREN_HIGH = 'icons/mob/species/fox/helmet_ch.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet_ch.dmi',
SPECIES_PROMETHEAN = 'icons/mob/species/skrell/helmet_ch.dmi',
SPECIES_TESHARI = 'icons/mob/species/teshari/head_ch.dmi',
SPECIES_TESHARI = 'icons/inventory/head/mob_ch_teshari.dmi',
SPECIES_VASILISSAN = 'icons/mob/species/skrell/helmet_ch.dmi',
SPECIES_VOX = 'icons/mob/species/vox/head_ch.dmi'
)
@@ -115,7 +115,7 @@
SPECIES_ZORREN_HIGH = 'icons/mob/species/fox/suit_ch.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit_ch.dmi',
SPECIES_PROMETHEAN = 'icons/mob/species/skrell/suit_ch.dmi',
SPECIES_TESHARI = 'icons/mob/species/teshari/suit_ch.dmi',
SPECIES_TESHARI = 'icons/inventory/suit/mob_ch_teshari.dmi',
SPECIES_VASILISSAN = 'icons/mob/species/skrell/suit_ch.dmi',
SPECIES_VOX = 'icons/mob/species/vox/suit_ch.dmi'
)

4
code/modules/clothing/spacesuits/rig/suits/station_ch.dm
View File

@@ -88,7 +88,7 @@
SPECIES_ZORREN_HIGH = 'icons/mob/species/fox/helmet_ch.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet_ch.dmi',
SPECIES_PROMETHEAN = 'icons/mob/species/skrell/helmet_ch.dmi',
SPECIES_TESHARI = 'icons/mob/species/teshari/head_ch.dmi',
SPECIES_TESHARI = 'icons/inventory/head/mob_ch_teshari.dmi',
SPECIES_VASILISSAN = 'icons/mob/species/skrell/helmet_ch.dmi',
SPECIES_VOX = 'icons/mob/species/vox/head_ch.dmi'
)
@@ -125,7 +125,7 @@
SPECIES_ZORREN_HIGH = 'icons/mob/species/fox/suit_ch.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit_ch.dmi',
SPECIES_PROMETHEAN = 'icons/mob/species/skrell/suit_ch.dmi',
SPECIES_TESHARI = 'icons/mob/species/teshari/suit_ch.dmi',
SPECIES_TESHARI = 'icons/inventory/suit/mob_ch_teshari.dmi',
SPECIES_VASILISSAN = 'icons/mob/species/skrell/suit_ch.dmi',
SPECIES_VOX = 'icons/mob/species/vox/suit_ch.dmi'
)

7
code/modules/clothing/spacesuits/spacesuits.dm
View File

@@ -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)

128
code/modules/clothing/spacesuits/void/ert_vr.dm
View File

@@ -7,7 +7,7 @@
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'
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 +109,7 @@
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'
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED)
var/away_planes = null
plane_slots = list(slot_head)
@@ -166,75 +166,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

14
code/modules/clothing/spacesuits/void/military_vr.dm
View File

@@ -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 <i>\"Don<6F>t let your past define you; let it mold you into the person you want to be.\"</i>"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'*/
desc = "Etched under the inner visor is the phrase <i>\"Don<6F>t let your past define you; let it mold you into the person you want to be.\"</i>"
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

40
code/modules/clothing/spacesuits/void/station.dm
View File

@@ -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

76
code/modules/clothing/spacesuits/void/station_vr.dm
View File

@@ -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'
)

28
code/modules/clothing/spacesuits/void/void.dm
View File

@@ -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.

204
code/modules/clothing/spacesuits/void/void_vr.dm
View File

@@ -8,60 +8,59 @@
/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'
)
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 +74,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 +96,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 +106,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 +117,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 +127,22 @@
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_override = 'icons/inventory/suit/mob_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")
@@ -155,29 +155,29 @@
/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()
@@ -229,33 +229,33 @@
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'
icon = 'icons/inventory/head/item_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.
/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
sprite_sheets_refit = list() //have to nullify this as well just to be thorough

24
code/modules/clothing/suits/aliens/teshari.dm
View File

@@ -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"
@@ -288,16 +284,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)
@@ -305,8 +297,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)
@@ -315,8 +305,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
@@ -329,8 +317,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
@@ -616,8 +602,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)
@@ -749,10 +733,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"

16
code/modules/clothing/suits/armor_vr.dm
View File

@@ -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 <i>share</i> 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

8
code/modules/clothing/suits/hooded_vr.dm
View File

@@ -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

2
code/modules/clothing/suits/jobs.dm
View File

@@ -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

2
code/modules/clothing/suits/labcoat.dm
View File

@@ -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

10
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -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,10 +105,7 @@
/obj/item/clothing/suit/syndicatefake
name = "red space suit replica"
icon = 'icons/obj/clothing/spacesuits.dmi'
icon_override = "icons/mob/spacesuit.dmi" //Chomp edit to fix its missing icon
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)
@@ -437,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"
@@ -445,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"
@@ -453,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"
@@ -461,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"
@@ -469,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"

20
code/modules/clothing/suits/miscellaneous_vr.dm
View File

@@ -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")

20
code/modules/clothing/suits/solgov.dm
View File

@@ -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

8
code/modules/clothing/suits/utility.dm
View File

@@ -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)

17
code/modules/clothing/suits/utility_vr.dm
View File

@@ -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/head_ch.dmi', //CHOMPstation edit, using our overwrite icons
SPECIES_VOX = 'icons/mob/species/vox/head.dmi',
SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi'
SPECIES_TESHARI = 'icons/inventory/head/mob_ch_teshari.dmi', //CHOMPstation edit, using our overwrite icons
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_ch.dmi', //CHOMPstation edit, using our overwrite icons
SPECIES_VOX = 'icons/mob/species/vox/suit.dmi',
SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi'
SPECIES_TESHARI = 'icons/inventory/suit/mob_ch_teshari.dmi', //CHOMPstation edit, using our overwrite icons
SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi',
SPECIES_WEREBEAST = 'icons/inventory/suit/mob_werebeast.dmi'
)

6
code/modules/clothing/under/accessories/accessory.dm
View File

@@ -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'
@@ -365,7 +365,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

22
code/modules/clothing/under/accessories/accessory_vr.dm
View File

@@ -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()
@@ -380,8 +380,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"
@@ -390,8 +390,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"

2
code/modules/clothing/under/accessories/armor.dm
View File

@@ -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

14
code/modules/clothing/under/accessories/clothing.dm
View File

@@ -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,14 +58,14 @@
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'
)
//YWEdit Start, Makes ponchos use teshari sprite
/obj/item/clothing/accessory/poncho/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands)
if(body_type == SPECIES_TESHARI)
if(!inhands)
return 'icons/mob/species/teshari/suit.dmi'
return 'icons/inventory/suit/mob_teshari.dmi'
else
return ..()
//YWEdit end
@@ -75,9 +75,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.
@@ -271,7 +271,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)
@@ -322,7 +322,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

4
code/modules/clothing/under/accessories/holster_vr.dm
View File

@@ -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)

2
code/modules/clothing/under/extrauniforms_yw.dm
View File

@@ -24,7 +24,7 @@
desc = "Sturdy mess of black synthcotton belts and buckles."
icon_state = "pilot_webbing2"
sprite_sheets = list(
"Teshari" = 'icons/mob/species/teshari/ties.dmi'
"Teshari" = 'icons/inventory/accessory/mob_teshari.dmi'
)
/obj/item/clothing/under/rank/khi/sec/pilot //yes, we're inheriting from the khi version; that one has full rolldown sprites

4
code/modules/clothing/under/imperial_vr.dm
View File

@@ -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"

1
code/modules/clothing/under/jobs/medsci.dm
View File

@@ -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."

23
code/modules/clothing/under/miscellaneous.dm
View File

@@ -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

48
code/modules/clothing/under/miscellaneous_vr.dm
View File

@@ -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

6
code/modules/clothing/under/nanotrasen_vr.dm
View File

@@ -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)

1
code/modules/clothing/under/pants.dm
View File

@@ -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"

17
code/modules/clothing/under/shorts.dm
View File

@@ -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

8
code/modules/clothing/under/solgov.dm
View File

@@ -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

8
code/modules/clothing/under/solgov_vr.dm
View File

@@ -57,16 +57,16 @@
/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'
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"

9
code/modules/clothing/under/xenos/teshari.dm
View File

@@ -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"

2
code/modules/integrated_electronics/core/assemblies/clothing.dm
View File

@@ -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"

4
code/modules/mob/holder.dm
View File

@@ -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

2
code/modules/mob/living/carbon/human/species/species.dm
View File

@@ -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.
var/pixel_offset_x = 0 // CHOMPedit. Used for offsetting 64x64 and up icons.
var/pixel_offset_y = 0 // CHOMPedit. Used for offsetting 64x64 and up icons.

2
code/modules/mob/living/carbon/human/species/station/teshari.dm
View File

@@ -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.

13
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -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])

4
code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm
View File

@@ -161,7 +161,7 @@ They're also cool, and Rykka/Nyria wrote this uwu
..()
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 // Hyenas are smol! - TODO: Test this.
I.appearance_flags = RESET_COLOR
add_overlay(I)
add_overlay(I)

4
code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm
View File

@@ -61,7 +61,7 @@
// 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 // Smol
I.appearance_flags = RESET_COLOR
add_overlay(I)
@@ -155,4 +155,4 @@
message = lowertext(message)
if(findtext(message, "grande"))
bol.resize(bol.size_multiplier + 0.01)
return
return

2
code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
View File

@@ -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)

4
code/modules/mob/living/simple_mob/subtypes/animal/vox.dm
View File

@@ -154,7 +154,7 @@
name = "strange armour"
desc = "Hulking reinforced armour for something huge."
icon = 'icons/obj/clothing/suits.dmi'
icon = 'icons/inventory/suit/item.dmi'
icon_state = "armalis_armour"
item_state = "armalis_armour"
@@ -162,6 +162,6 @@
name = "strange lenses"
desc = "A series of metallic lenses and chains."
icon = 'icons/obj/clothing/hats.dmi'
icon = 'icons/inventory/head/item.dmi'
icon_state = "amp"
item_state = "amp"

2
code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
View File

@@ -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)

8
code/modules/mob/new_player/sprite_accessories_extra.dm
View File

@@ -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)

2
code/modules/projectiles/guns/energy/gunsword_vr.dm
View File

@@ -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)

2
code/modules/projectiles/guns/energy/hooklauncher.dm
View File

@@ -23,7 +23,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"

2
code/modules/projectiles/guns/energy/laser_vr.dm
View File

@@ -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

6
code/modules/vore/fluffstuff/custom_clothes_vr.dm
View File

@@ -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

2
code/modules/vore/fluffstuff/custom_clothes_yw.dm
View File

@@ -1596,7 +1596,7 @@
/obj/item/weapon/storage/backpack/fluff/kaith
name = "Light duffle bag"
desc = "A compact duffle bag, meant for long hikes."
icon = 'icons/obj/clothing/backpack.dmi'
icon = 'icons/inventory/back/item.dmi'
icon_state = "duffle"

2
code/modules/vore/resizing/holder_micro_vr.dm
View File

@@ -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)

2
code/modules/xenoarcheaology/tools/equipment.dm
View File

@@ -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"