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>
248 lines
8.4 KiB
Plaintext
248 lines
8.4 KiB
Plaintext
//these need item states -S2-
|
|
/obj/item/clothing/under/shorts
|
|
name = "athletic shorts"
|
|
desc = "95% Polyester, 5% Spandex!"
|
|
icon_state = "redshorts" // Hackyfix for icon states until someone wants to come do a recolor later.
|
|
gender = PLURAL
|
|
body_parts_covered = LOWER_TORSO
|
|
|
|
/obj/item/clothing/under/shorts/red
|
|
name = "red athletic shorts"
|
|
icon_state = "redshorts"
|
|
|
|
/obj/item/clothing/under/shorts/green
|
|
name = "green athletic shorts"
|
|
icon_state = "greenshorts"
|
|
|
|
/obj/item/clothing/under/shorts/blue
|
|
name = "blue athletic shorts"
|
|
icon_state = "blueshorts"
|
|
|
|
/obj/item/clothing/under/shorts/black
|
|
name = "black athletic shorts"
|
|
icon_state = "blackshorts"
|
|
|
|
/obj/item/clothing/under/shorts/grey
|
|
name = "grey athletic shorts"
|
|
icon_state = "greyshorts"
|
|
|
|
/obj/item/clothing/under/shorts/white
|
|
name = "white shorts"
|
|
icon_state = "whiteshorts"
|
|
|
|
/obj/item/clothing/under/shorts/white/female
|
|
name = "white short shorts"
|
|
icon_state = "whiteshorts_f"
|
|
|
|
/obj/item/clothing/under/shorts/jeans
|
|
name = "jeans shorts"
|
|
desc = "Some jeans! Just in short form!"
|
|
icon_state = "jeans_shorts"
|
|
|
|
/obj/item/clothing/under/shorts/jeans/female
|
|
name = "jeans short shorts"
|
|
icon_state = "jeans_shorts_f"
|
|
|
|
/obj/item/clothing/under/shorts/jeans/classic
|
|
name = "classic jeans shorts"
|
|
icon_state = "jeansclassic_shorts"
|
|
|
|
/obj/item/clothing/under/shorts/jeans/classic/female
|
|
name = "classic jeans short shorts"
|
|
icon_state = "jeansclassic_shorts_f"
|
|
|
|
/obj/item/clothing/under/shorts/jeans/mustang
|
|
name = "mustang jeans shorts"
|
|
icon_state = "jeansmustang_shorts"
|
|
|
|
/obj/item/clothing/under/shorts/jeans/mustang/female
|
|
name = "mustang jeans short shorts"
|
|
icon_state = "jeansmustang_shorts_f"
|
|
|
|
/obj/item/clothing/under/shorts/jeans/youngfolks
|
|
name = "young folks jeans shorts"
|
|
icon_state = "jeansyoungfolks_shorts"
|
|
|
|
/obj/item/clothing/under/shorts/jeans/youngfolks/female
|
|
name = "young folks jeans short shorts"
|
|
icon_state = "jeansyoungfolks_shorts_f"
|
|
|
|
/obj/item/clothing/under/shorts/jeans/black
|
|
name = "black jeans shorts"
|
|
icon_state = "blackpants_shorts"
|
|
|
|
/obj/item/clothing/under/shorts/jeans/black/female
|
|
name = "black jeans short shorts"
|
|
icon_state = "black_shorts_f"
|
|
|
|
/obj/item/clothing/under/shorts/black/ripped
|
|
name = "black ripped shorts"
|
|
icon_state = "black_shorts_ripped"
|
|
|
|
/obj/item/clothing/under/shorts/jeans/grey
|
|
name = "grey jeans shorts"
|
|
icon_state = "greyshorts"
|
|
|
|
/obj/item/clothing/under/shorts/jeans/grey/female
|
|
name = "grey jeans short shorts"
|
|
icon_state = "greyshorts" //the _f variant was lost to time. Not deleted to keep from messing with maps.
|
|
|
|
/obj/item/clothing/under/shorts/khaki
|
|
name = "khaki shorts"
|
|
desc = "For that island getaway. It's five o'clock somewhere, right?"
|
|
icon_state = "tanpants_shorts"
|
|
|
|
/obj/item/clothing/under/shorts/khaki/female
|
|
name = "khaki short shorts"
|
|
icon_state = "khaki_shorts_f"
|
|
|
|
//Argh, skirts be below this line -> ------------------------------
|
|
|
|
/obj/item/clothing/under/skirt
|
|
name = "short black skirt"
|
|
desc = "A skirt that is a shiny black."
|
|
icon_state = "skirt_short_black"
|
|
body_parts_covered = LOWER_TORSO
|
|
rolled_sleeves = -1
|
|
|
|
/obj/item/clothing/under/skirt/khaki
|
|
name = "khaki skirt"
|
|
desc = "A skirt that is a khaki color."
|
|
icon_state = "skirt_khaki"
|
|
|
|
/obj/item/clothing/under/skirt/blue
|
|
name = "short blue skirt"
|
|
desc = "A skirt that is a shiny blue."
|
|
icon_state = "skirt_short_blue"
|
|
|
|
/obj/item/clothing/under/skirt/red
|
|
name = "short red skirt"
|
|
desc = "A skirt that is a shiny red."
|
|
icon_state = "skirt_short_red"
|
|
|
|
/obj/item/clothing/under/skirt/denim
|
|
name = "short denim skirt"
|
|
desc = "A skirt that is made of denim."
|
|
icon_state = "skirt_short_denim"
|
|
|
|
/obj/item/clothing/under/skirt/swept
|
|
name = "swept skirt"
|
|
desc = "A skirt that is swept to one side."
|
|
icon_state = "skirt_swept"
|
|
|
|
/obj/item/clothing/under/skirt/loincloth
|
|
name = "loincloth"
|
|
desc = "A piece of cloth wrapped around the waist."
|
|
icon_state = "loincloth"
|
|
|
|
/obj/item/clothing/under/skirt/pleated
|
|
name = "pleated skirt"
|
|
desc = "A simple pleated skirt. It's like high school all over again."
|
|
icon_state = "pleated"
|
|
addblends = "pleated_a"
|
|
|
|
/obj/item/clothing/under/skirt/outfit
|
|
name = "black skirt"
|
|
desc = "A black skirt, very fancy!"
|
|
icon_state = "blackskirt"
|
|
body_parts_covered = CHEST|ARMS
|
|
|
|
/obj/item/clothing/under/skirt/outfit/plaid_blue
|
|
name = "blue plaid skirt"
|
|
desc = "A preppy blue skirt with a white blouse."
|
|
icon_state = "plaid_blue"
|
|
item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
|
|
|
|
/obj/item/clothing/under/skirt/outfit/plaid_red
|
|
name = "red plaid skirt"
|
|
desc = "A preppy red skirt with a white blouse."
|
|
icon_state = "plaid_red"
|
|
item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
|
|
|
|
/obj/item/clothing/under/skirt/outfit/plaid_purple
|
|
name = "blue purple skirt"
|
|
desc = "A preppy purple skirt with a white blouse."
|
|
icon_state = "plaid_purple"
|
|
item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple")
|
|
|
|
/obj/item/clothing/under/rank/cargo/skirt
|
|
name = "quartermaster's jumpskirt"
|
|
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")
|
|
|
|
/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")
|
|
|
|
/obj/item/clothing/under/rank/engineer/skirt
|
|
desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding."
|
|
name = "engineer's jumpskirt"
|
|
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")
|
|
|
|
/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")
|
|
|
|
/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")
|
|
|
|
/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")
|
|
|
|
/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)
|
|
|
|
/obj/item/clothing/under/rank/medical/skirt
|
|
name = "medical doctor's jumpskirt"
|
|
icon_state = "medicalf"
|
|
|
|
/obj/item/clothing/under/rank/chemist/skirt
|
|
name = "chemist's jumpskirt"
|
|
icon_state = "chemistryf"
|
|
|
|
/obj/item/clothing/under/rank/chief_medical_officer/skirt
|
|
desc = "It's a jumpskirt worn by those with the experience to be \"" + JOB_CHIEF_MEDICAL_OFFICER + "\". It provides minor biological protection."
|
|
name = "chief medical officer's jumpskirt"
|
|
icon_state = "cmof"
|
|
|
|
/obj/item/clothing/under/rank/geneticist/skirt
|
|
name = "geneticist's jumpskirt"
|
|
icon_state = "geneticsf"
|
|
|
|
/obj/item/clothing/under/rank/virologist/skirt
|
|
name = "virologist's jumpskirt"
|
|
icon_state = "virologyf"
|
|
|
|
/obj/item/clothing/under/rank/security/skirt
|
|
name = "security officer's jumpskirt"
|
|
desc = "Standard feminine fashion for Security Officers. It's made of sturdier material than the standard jumpskirts."
|
|
icon_state = "securityf"
|
|
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
|
siemens_coefficient = 0.9
|
|
|
|
/obj/item/clothing/under/rank/warden/skirt
|
|
desc = "Standard feminine fashion for a " + JOB_WARDEN + ". It is made of sturdier material than standard jumpskirts. It has the word \"" + JOB_WARDEN + "\" written on the shoulders."
|
|
name = "warden's jumpskirt"
|
|
icon_state = "wardenf"
|
|
|
|
/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 \"" + JOB_HEAD_OF_SECURITY + "\". It has additional armor to protect the wearer."
|
|
name = "head of security's jumpskirt"
|
|
icon_state = "hosf"
|