diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index fdf9206058..ad9b9e8f8c 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -7,14 +7,13 @@ matter = list(DEFAULT_WALL_MATERIAL = 75) subspace_transmission = 1 canhear_range = 0 // can't hear headsets from very far away - slot_flags = SLOT_EARS + sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/ears.dmi') + var/translate_binary = 0 var/translate_hive = 0 var/obj/item/device/encryptionkey/keyslot1 = null var/obj/item/device/encryptionkey/keyslot2 = null -// maxf = 1489 - var/ks1type = /obj/item/device/encryptionkey var/ks2type = null diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 0254ad8a77..78da7f8b52 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -189,37 +189,6 @@ update_clothing_icon() -/////////////////////////////////////////////////////////////////////// -//Glasses -/* -SEE_SELF // can see self, no matter what -SEE_MOBS // can see all mobs, no matter what -SEE_OBJS // can see all objs, no matter what -SEE_TURFS // can see all turfs (and areas), no matter what -SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are - // in a lit area (via pixel_x,y or smooth movement), can see those pixels -BLIND // can't see anything - -/obj/item/clothing/glasses - name = "glasses" - icon = 'icons/obj/clothing/glasses.dmi' - w_class = 2.0 - body_parts_covered = EYES - slot_flags = SLOT_EYES - var/vision_flags = 0 - var/darkness_view = 0//Base human is 2 - var/see_invisible = -1 - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Teshari" = 'icons/mob/species/seromi/eyes.dmi', - ) - -/obj/item/clothing/glasses/update_clothing_icon() - if (ismob(src.loc)) - var/mob/M = src.loc - M.update_inv_glasses() -*/ -/////////////////////////////////////////////////////////////////////// //Gloves /obj/item/clothing/gloves name = "gloves" @@ -584,7 +553,7 @@ BLIND // can't see anything else rolled_down = -1 if(H) update_clothing_icon() - + /obj/item/clothing/under/proc/update_rollsleeves_status() var/mob/living/carbon/human/H if(istype(src.loc, /mob/living/carbon/human)) @@ -767,7 +736,7 @@ BLIND // can't see anything item_state_slots[slot_w_uniform_str] = "[worn_state]" usr << "You roll up your [src]." update_clothing_icon() - + /obj/item/clothing/under/verb/rollsleeves() set name = "Roll Up Sleeves" set category = "Object" diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 60cbad098b..2f2dad608b 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -1,3 +1,15 @@ +/////////////////////////////////////////////////////////////////////// +//Glasses +/* +SEE_SELF // can see self, no matter what +SEE_MOBS // can see all mobs, no matter what +SEE_OBJS // can see all objs, no matter what +SEE_TURFS // can see all turfs (and areas), no matter what +SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are + // in a lit area (via pixel_x,y or smooth movement), can see those pixels +BLIND // can't see anything +*/ +/////////////////////////////////////////////////////////////////////// /obj/item/clothing/glasses name = "glasses" @@ -13,7 +25,12 @@ var/active = 1 var/activation_sound = 'sound/items/goggles_charge.ogg' var/obj/screen/overlay = null - + + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/eyes.dmi', + "Teshari" = 'icons/mob/species/seromi/eyes.dmi' + ) + /obj/item/clothing/glasses/update_clothing_icon() if (ismob(src.loc)) var/mob/M = src.loc @@ -89,7 +106,7 @@ item_state = "eyepatch" body_parts_covered = 0 var/eye = null - + /obj/item/clothing/glasses/eyepatch/verb/switcheye() set name = "Switch Eyepatch" set category = "Object" diff --git a/code/modules/mob/living/carbon/human/species/station/seromi.dm b/code/modules/mob/living/carbon/human/species/station/seromi.dm index 3928ed9f01..40fd5c63b8 100644 --- a/code/modules/mob/living/carbon/human/species/station/seromi.dm +++ b/code/modules/mob/living/carbon/human/species/station/seromi.dm @@ -111,3 +111,7 @@ return SEE_SELF|SEE_MOBS else return SEE_SELF + +/datum/species/teshari/equip_survival_gear(var/mob/living/carbon/human/H) + ..() + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes) \ No newline at end of file diff --git a/icons/mob/holder_complex.dmi b/icons/mob/holder_complex.dmi index 0c0235da02..b067bec14f 100644 Binary files a/icons/mob/holder_complex.dmi and b/icons/mob/holder_complex.dmi differ