mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-05-18 20:59:56 +01:00
Cameron Lennox
6a157d8614
* Fixes RIG gear to not drop your equipped items
Fixes the rig gear to not drop your equipped gear after undeployment
* better fix
* Fixes suits and RIGS
- Makes rigsuits no longer eat your gloves
- Allows you to properly wear a ring under a rigsuit
- Gets rid of a LOT of duplicate var = XYZ in places
- Makes it so clothing actually properly provide protection to the areas they're covering. (This doesn't change anything unless their actual min_cold_protection or max_heat_protection is adjusted!)
- Adds a define for CHEST which is just UPPER_TORSO|LOWER_TORSO to make it clear it's protecting your WHOLE chest at a glance.
- Gives some things like knee-high and thigh-high boots proper leg protection
* Clothing unit test
* fixes
* oops
* hoods are snowflakes
* hood fix
* path fix
* no nullspace turf
* nullcheck
* don't test devwarning cloths
* ignore this too
* more exclusions
* more exclusions, disabled species test
* Changes So Far
* holding/wearing icons for clothing
* fixed
* more fixes
* lets try this again
* go
* tesh cloak
* some more
* devwarning
* the cursed one
* oops
* fixed species scan
* Update clothing.dm
* restrict this down a bit more, we don't want unit-test to choke
* no more CI killer
* suit defined name twice
* suit
* some more exclusions
* etc
* gwah
* gwah
* clarifying exclusions
* yet more exclusions
* another set of exclusions
* ranger
* compile
* more bitflag
* yet more exclusions
* more
* more missing
* Update sifguard.dm
comment (also to wake up travis)
* more exclusions
* sifguard
* more exclusions
* more
* send help, yes more exclusions
* lost to time
* skrell stuff
* offear is special
* fixes more and unbreaks protean rigs
* The big one
* wrong ifdef
* more
* boots
* Update accessory.dm
* small object fix
* lets be more careful
* Does this fix the signal
* is it the signal?
* FIXES THE REST OF THEM
* wah
* disable test
* the last one
* fix signal check
* fixes
* ignore storage
* teshari blacklist
* tesh
* God speed
* fixed progression removed lizard
* fixes some i guess but what's the point
* disable indepth check
* START ROBOT SPRITE VALIDITY
* Revert "START ROBOT SPRITE VALIDITY"
This reverts commit c9bfb7e9ce.
* consistency with another test
* yuh uh
---------
Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
189 lines
7.3 KiB
Plaintext
189 lines
7.3 KiB
Plaintext
/*
|
|
Earmuffs
|
|
*/
|
|
/obj/item/clothing/ears/earmuffs
|
|
name = "earmuffs"
|
|
desc = "Protects your hearing from loud noises, and quiet ones as well."
|
|
icon = 'icons/obj/items.dmi'
|
|
icon_state = "earmuffs"
|
|
item_state_slots = list(slot_r_hand_str = "earmuffs", slot_l_hand_str = "earmuffs")
|
|
slot_flags = SLOT_EARS | SLOT_TWOEARS
|
|
ear_protection = 2
|
|
|
|
/obj/item/clothing/ears/earmuffs/headphones
|
|
name = "headphones"
|
|
desc = "Unce unce unce unce."
|
|
var/headphones_on = 0
|
|
icon_state = "headphones_off"
|
|
item_state_slots = list(slot_r_hand_str = "headphones", slot_l_hand_str = "headphones")
|
|
slot_flags = SLOT_EARS | SLOT_TWOEARS
|
|
|
|
/obj/item/clothing/ears/earmuffs/headphones/verb/togglemusic()
|
|
set name = "Toggle Headphone Music"
|
|
set category = "Object"
|
|
set src in usr
|
|
if(!isliving(usr)) return
|
|
if(usr.stat) return
|
|
|
|
var/base_icon = copytext(icon_state,1,(length(icon_state) - 3 + headphones_on))
|
|
|
|
if(headphones_on)
|
|
icon_state = "[base_icon]_off"
|
|
headphones_on = 0
|
|
to_chat(usr, span_notice("You turn the music off."))
|
|
else
|
|
icon_state = "[base_icon]_on"
|
|
headphones_on = 1
|
|
to_chat(usr, span_notice("You turn the music on."))
|
|
|
|
update_clothing_icon()
|
|
|
|
/*
|
|
Skrell tentacle wear
|
|
*/
|
|
/obj/item/clothing/ears/skrell
|
|
name = DEVELOPER_WARNING_NAME // "skrell tentacle wear"
|
|
desc = "Some stuff worn by skrell to adorn their head tentacles."
|
|
icon = 'icons/inventory/ears/item.dmi'
|
|
w_class = ITEMSIZE_TINY
|
|
slot_flags = SLOT_EARS
|
|
species_restricted = list(SPECIES_SKRELL)
|
|
|
|
/obj/item/clothing/ears/skrell/chain
|
|
name = "Gold headtail chains"
|
|
desc = "A delicate golden chain worn by female skrell to decorate their head tails."
|
|
icon_state = "skrell_chain"
|
|
item_state_slots = list(slot_r_hand_str = "egg5", slot_l_hand_str = "egg5")
|
|
drop_sound = 'sound/items/drop/ring.ogg'
|
|
pickup_sound = 'sound/items/pickup/ring.ogg'
|
|
|
|
/obj/item/clothing/ears/skrell/chain/silver
|
|
name = "Silver headtail chains"
|
|
desc = "A delicate silver chain worn by female skrell to decorate their head tails."
|
|
icon_state = "skrell_chain_sil"
|
|
item_state_slots = list(slot_r_hand_str = "egg", slot_l_hand_str = "egg")
|
|
|
|
/obj/item/clothing/ears/skrell/chain/bluejewels
|
|
name = "Blue jeweled golden headtail chains"
|
|
desc = "A delicate golden chain adorned with blue jewels worn by female skrell to decorate their head tails."
|
|
icon_state = "skrell_chain_bjewel"
|
|
item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2")
|
|
|
|
/obj/item/clothing/ears/skrell/chain/redjewels
|
|
name = "Red jeweled golden headtail chains"
|
|
desc = "A delicate golden chain adorned with red jewels worn by female skrell to decorate their head tails."
|
|
icon_state = "skrell_chain_rjewel"
|
|
item_state_slots = list(slot_r_hand_str = "egg4", slot_l_hand_str = "egg4")
|
|
|
|
/obj/item/clothing/ears/skrell/chain/ebony
|
|
name = "Ebony headtail chains"
|
|
desc = "A delicate ebony chain worn by female skrell to decorate their head tails."
|
|
icon_state = "skrell_chain_ebony"
|
|
item_state_slots = list(slot_r_hand_str = "egg6", slot_l_hand_str = "egg6")
|
|
|
|
/obj/item/clothing/ears/skrell/band
|
|
name = "Gold headtail bands"
|
|
desc = "Golden metallic bands worn by male skrell to adorn their head tails."
|
|
icon_state = "skrell_band"
|
|
item_state_slots = list(slot_r_hand_str = "egg5", slot_l_hand_str = "egg5")
|
|
drop_sound = 'sound/items/drop/ring.ogg'
|
|
pickup_sound = 'sound/items/pickup/ring.ogg'
|
|
|
|
/obj/item/clothing/ears/skrell/band/silver
|
|
name = "Silver headtail bands"
|
|
desc = "Silver metallic bands worn by male skrell to adorn their head tails."
|
|
icon_state = "skrell_band_sil"
|
|
item_state_slots = list(slot_r_hand_str = "egg", slot_l_hand_str = "egg")
|
|
|
|
/obj/item/clothing/ears/skrell/band/bluejewels
|
|
name = "Blue jeweled golden headtail bands"
|
|
desc = "Golden metallic bands adorned with blue jewels worn by male skrell to adorn their head tails."
|
|
icon_state = "skrell_band_bjewel"
|
|
item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2")
|
|
|
|
/obj/item/clothing/ears/skrell/band/redjewels
|
|
name = "Red jeweled golden headtail bands"
|
|
desc = "Golden metallic bands adorned with red jewels worn by male skrell to adorn their head tails."
|
|
icon_state = "skrell_band_rjewel"
|
|
item_state_slots = list(slot_r_hand_str = "egg4", slot_l_hand_str = "egg4")
|
|
|
|
/obj/item/clothing/ears/skrell/band/ebony
|
|
name = "Ebony headtail bands"
|
|
desc = "Ebony bands worn by male skrell to adorn their head tails."
|
|
icon_state = "skrell_band_ebony"
|
|
item_state_slots = list(slot_r_hand_str = "egg6", slot_l_hand_str = "egg6")
|
|
|
|
/obj/item/clothing/ears/skrell/colored/band
|
|
name = "Colored headtail bands"
|
|
desc = "Metallic bands worn by male skrell to adorn their head tails."
|
|
icon_state = "skrell_band_sil"
|
|
item_state_slots = list(slot_r_hand_str = "egg", slot_l_hand_str = "egg")
|
|
|
|
/obj/item/clothing/ears/skrell/colored/chain
|
|
name = "Colored headtail chains"
|
|
desc = "A delicate chain worn by female skrell to decorate their head tails."
|
|
icon_state = "skrell_chain_sil"
|
|
item_state_slots = list(slot_r_hand_str = "egg", slot_l_hand_str = "egg")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_female
|
|
name = "red headtail cloth"
|
|
desc = "A cloth shawl worn by female skrell draped around their head tails."
|
|
icon_state = "skrell_cloth_female"
|
|
item_state_slots = list(slot_r_hand_str = "egg4", slot_l_hand_str = "egg4")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_female/black
|
|
name = "black headtail cloth"
|
|
icon_state = "skrell_cloth_black_female"
|
|
item_state_slots = list(slot_r_hand_str = "egg6", slot_l_hand_str = "egg6")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_female/blue
|
|
name = "blue headtail cloth"
|
|
icon_state = "skrell_cloth_blue_female"
|
|
item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_female/green
|
|
name = "green headtail cloth"
|
|
icon_state = "skrell_cloth_green_female"
|
|
item_state_slots = list(slot_r_hand_str = "egg3", slot_l_hand_str = "egg3")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_female/pink
|
|
name = "pink headtail cloth"
|
|
icon_state = "skrell_cloth_pink_female"
|
|
item_state_slots = list(slot_r_hand_str = "egg1", slot_l_hand_str = "egg1")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_female/lightblue
|
|
name = "light blue headtail cloth"
|
|
icon_state = "skrell_cloth_lblue_female"
|
|
item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_male
|
|
name = "red headtail cloth"
|
|
desc = "A cloth band worn by male skrell around their head tails."
|
|
icon_state = "skrell_cloth_male"
|
|
item_state_slots = list(slot_r_hand_str = "egg4", slot_l_hand_str = "egg4")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_male/black
|
|
name = "black headtail cloth"
|
|
icon_state = "skrell_cloth_black_male"
|
|
item_state_slots = list(slot_r_hand_str = "egg6", slot_l_hand_str = "egg6")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_male/blue
|
|
name = "blue headtail cloth"
|
|
icon_state = "skrell_cloth_blue_male"
|
|
item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_male/green
|
|
name = "green headtail cloth"
|
|
icon_state = "skrell_cloth_green_male"
|
|
item_state_slots = list(slot_r_hand_str = "egg3", slot_l_hand_str = "egg3")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_male/pink
|
|
name = "pink headtail cloth"
|
|
icon_state = "skrell_cloth_pink_male"
|
|
item_state_slots = list(slot_r_hand_str = "egg1", slot_l_hand_str = "egg1")
|
|
|
|
/obj/item/clothing/ears/skrell/cloth_male/lightblue
|
|
name = "light blue headtail cloth"
|
|
icon_state = "skrell_cloth_lblue_male"
|
|
item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2")
|