cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup and fixes

Browse Source
This commit is contained in:
SinTwo
2016-07-19 17:25:45 -04:00
parent cf45a827a9
commit b4f85ff533
25 changed files with 40 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/items/weapons/storage/backpack.dm
View File

@@ -196,6 +196,7 @@
name = "satchel"
desc = "A trendy looking satchel."
icon_state = "satchel-norm"
item_state = "briefcase"
/obj/item/weapon/storage/backpack/satchel/eng
name = "industrial satchel"

1
code/game/objects/items/weapons/storage/bags.dm
View File

@@ -56,7 +56,6 @@
desc = "It's a very flimsy, very noisy alternative to a bag."
icon = 'icons/obj/trash.dmi'
icon_state = "plasticbag"
item_state = "plasticbag"
w_class = 4
max_w_class = 2

11
code/game/objects/items/weapons/storage/belt.dm
View File

@@ -3,7 +3,6 @@
desc = "Can hold various things."
icon = 'icons/obj/clothing/belts.dmi'
icon_state = "utilitybelt"
item_state = "utility"
storage_slots = 7
max_storage_space = 28 //This should ensure belts always have enough room to store whatever.
max_w_class = 3
@@ -33,7 +32,6 @@
name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
desc = "Can hold various tools."
icon_state = "utilitybelt"
item_state = "utility"
can_hold = list(
///obj/item/weapon/combitool,
/obj/item/weapon/crowbar,
@@ -86,7 +84,6 @@
name = "medical belt"
desc = "Can hold various medical equipment."
icon_state = "medicalbelt"
item_state = "medical"
can_hold = list(
/obj/item/device/healthanalyzer,
/obj/item/weapon/dnainjector,
@@ -117,13 +114,11 @@
name = "EMT utility belt"
desc = "A sturdy black webbing belt with attached pouches."
icon_state = "emsbelt"
item_state = "emsbelt"
/obj/item/weapon/storage/belt/security
name = "security belt"
desc = "Can hold security gear like handcuffs and flashes."
icon_state = "securitybelt"
item_state = "security"
max_w_class = 3
can_hold = list(
/obj/item/weapon/grenade,
@@ -154,7 +149,6 @@
name = "forensic utility belt"
desc = "A belt for holding forensics equipment."
icon_state = "securitybelt"
item_state = "security"
storage_slots = 7
max_w_class = 3
can_hold = list(
@@ -195,7 +189,6 @@
name = "soul stone belt"
desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"
icon_state = "soulstonebelt"
item_state = "soulstonebelt"
storage_slots = 6
can_hold = list(
/obj/item/device/soulstone
@@ -215,7 +208,6 @@
name = "championship belt"
desc = "Proves to the world that you are the strongest!"
icon_state = "championbelt"
item_state = "champion"
storage_slots = 1
can_hold = list(
"/obj/item/clothing/mask/luchador"
@@ -225,7 +217,6 @@
name = "combat belt"
desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage."
icon_state = "swatbelt"
item_state = "swatbelt"
storage_slots = 9
max_w_class = 3
max_storage_space = 28
@@ -234,13 +225,11 @@
name = "combat belt"
desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage."
icon_state = "bandolier"
item_state = "bandolier"
/obj/item/weapon/storage/belt/janitor
name = "janitorial belt"
desc = "A belt used to hold most janitorial supplies."
icon_state = "janibelt"
item_state = "janibelt"
storage_slots = 7
max_w_class = 3
can_hold = list(

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

@@ -46,7 +46,7 @@
/obj/item/clothing/under/chameleon/New()
..()
if(!clothing_choices)
var/blocked = list(src.type, /obj/item/clothing/under/cloud, /obj/item/clothing/under/gimmick)//Prevent infinite loops and bad jumpsuits.
var/blocked = list(src.type, /obj/item/clothing/under/gimmick)//Prevent infinite loops and bad jumpsuits.
clothing_choices = generate_chameleon_choices(/obj/item/clothing/under, blocked)
/obj/item/clothing/under/chameleon/emp_act(severity)

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

@@ -108,7 +108,7 @@
icon = initial(icon)
///////////////////////////////////////////////////////////////////////
// Ears: headsets, earmuffs and tiny objects --BECAUSE THERE ISNT A FOLDER FOR THESE OR ANYTHING. -S2-
// Ears: headsets, earmuffs and tiny objects
/obj/item/clothing/ears
name = "ears"
w_class = 1.0
@@ -169,40 +169,6 @@
icon_state = O.icon_state
set_dir(O.dir)
/obj/item/clothing/ears/earmuffs
name = "earmuffs"
desc = "Protects your hearing from loud noises, and quiet ones as well."
icon_state = "earmuffs"
item_state = "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 = "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(!istype(usr, /mob/living)) return
if(usr.stat) return
if(headphones_on)
icon_state = "headphones_off"
headphones_on = 0
usr << "<span class='notice'>You turn the music off.</span>"
else
icon_state = "headphones_on"
headphones_on = 1
usr << "<span class='notice'>You turn the music on.</span>"
update_clothing_icon()
//Gloves
/obj/item/clothing/gloves
name = "gloves"

145
code/modules/clothing/ears/skrell.dm
View File

@@ -1,145 +0,0 @@
/*
Skrell tentacle wear
*/
/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'
w_class = 1
slot_flags = SLOT_EARS
species_restricted = list("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 = "egg5" //just a small colored item, remove item_state's if undesirable.
/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 = "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 = "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 = "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 = "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 = "egg5"
/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 = "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 = "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 = "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 = "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 = "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 = "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 = "egg4"
/obj/item/clothing/ears/skrell/cloth_female/black
name = "black headtail cloth"
icon_state = "skrell_cloth_black_female"
item_state = "egg6"
/obj/item/clothing/ears/skrell/cloth_female/blue
name = "blue headtail cloth"
icon_state = "skrell_cloth_blue_female"
item_state = "egg2"
/obj/item/clothing/ears/skrell/cloth_female/green
name = "green headtail cloth"
icon_state = "skrell_cloth_green_female"
item_state = "egg3"
/obj/item/clothing/ears/skrell/cloth_female/pink
name = "pink headtail cloth"
icon_state = "skrell_cloth_pink_female"
item_state = "egg1"
/obj/item/clothing/ears/skrell/cloth_female/lightblue
name = "light blue headtail cloth"
icon_state = "skrell_cloth_lblue_female"
item_state = "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 = "egg4"
/obj/item/clothing/ears/skrell/cloth_male/black
name = "black headtail cloth"
icon_state = "skrell_cloth_black_male"
item_state = "egg6"
/obj/item/clothing/ears/skrell/cloth_male/blue
name = "blue headtail cloth"
icon_state = "skrell_cloth_blue_male"
item_state = "egg2"
/obj/item/clothing/ears/skrell/cloth_male/green
name = "green headtail cloth"
icon_state = "skrell_cloth_green_male"
item_state = "egg3"
/obj/item/clothing/ears/skrell/cloth_male/pink
name = "pink headtail cloth"
icon_state = "skrell_cloth_pink_male"
item_state = "egg1"
/obj/item/clothing/ears/skrell/cloth_male/lightblue
name = "light blue headtail cloth"
icon_state = "skrell_cloth_lblue_male"
item_state = "egg2"

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

@@ -53,7 +53,7 @@ BLIND // can't see anything
name = "Optical Meson Scanner"
desc = "Used for seeing walls, floors, and stuff through anything."
icon_state = "meson"
item_state = "glasses"
item_state = "meson"
action_button_name = "Toggle Goggles"
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
toggleable = 1
@@ -122,7 +122,7 @@ BLIND // can't see anything
name = "monocle"
desc = "Such a dapper eyepiece!"
icon_state = "monocle"
item_state = "headset" // lol -- well I guess that works
item_state = "headset" // lol
body_parts_covered = 0
/obj/item/clothing/glasses/material
@@ -290,6 +290,7 @@ BLIND // can't see anything
name = "Optical Meson Scanner"
desc = "Used for seeing walls, floors, and stuff through anything."
icon_state = "meson"
item_state = "meson"
origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
/obj/item/clothing/glasses/thermal/plain

2
code/modules/clothing/spacesuits/miscellaneous.dm
View File

@@ -90,7 +90,7 @@
//Orange emergency space suit
/obj/item/clothing/head/helmet/space/emergency
name = "Emergency Space Helmet"
icon_state = "emergencyhelm"
icon_state = "syndicate-helm-orange"
desc = "A simple helmet with a built in light, smells like mothballs."

3
code/modules/clothing/spacesuits/syndi.dm
View File

@@ -98,7 +98,6 @@
name = "black medical space helmet"
desc = "A black helmet sporting a medical cross and durable plating. Hopefully the wearer abides by space geneva."
icon_state = "syndicate-helm-black-med"
// item_state_slots = list(slot_head_str = "syndicate-helm-black-med")
/obj/item/clothing/suit/space/syndicate/black/med
name = "black medical space suit"
@@ -109,7 +108,6 @@
/obj/item/clothing/head/helmet/space/syndicate/black/orange
name = "black and orange space helmet"
icon_state = "syndicate-helm-black-orange"
// item_state_slots = list(slot_head_str = "syndicate-helm-black-orange")
/obj/item/clothing/suit/space/syndicate/black/orange
name = "black and orange space suit"
@@ -132,7 +130,6 @@
name = "black engineering space helmet"
desc = "A black helmet sporting red and yellow stripes and durable plating. Engineered to look well... engineering-ish."
icon_state = "syndicate-helm-black-engie"
// item_state_slots = list(slot_head_str = "syndicate-helm-black-engie")
/obj/item/clothing/suit/space/syndicate/black/engie
name = "black engineering space suit"

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

@@ -80,7 +80,7 @@
/obj/item/clothing/head/bio_hood/cmo
icon_state = "bio_cmo"
//Plague Dr mask can be found in clothing/masks/gasmask.dm --LIKE IT SHOULD
//Plague Dr mask can be found in clothing/masks/gasmask.dm
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit
name = "Plague doctor suit"
desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses."

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

@@ -5,7 +5,7 @@
* Misc
*/
// -S2-note- Sort these and categorize these please
// -S2-note- Needs categorizing and sorting.
/*
* Lasertag
@@ -33,7 +33,6 @@
/*
* Costume
*/
/obj/item/clothing/suit/pirate
name = "pirate coat"
desc = "Yarr."
@@ -112,7 +111,7 @@
name = "Hastur's Robes"
desc = "Robes not meant to be worn by man"
icon_state = "hastur"
item_state = "rad" //get over it or make your own
item_state = "rad"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -158,7 +157,6 @@
/*
* Misc
*/
/obj/item/clothing/suit/straight_jacket
name = "straight jacket"
desc = "A suit that completely restrains the wearer."
@@ -170,13 +168,12 @@
name = "worn shirt"
desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in."
icon_state = "ianshirt"
item_state = "labcoat" //someone should make an item state for this, but that shall not be me -S2-
item_state = "labcoat" //placeholder -S2-
body_parts_covered = UPPER_TORSO|ARMS
/*
* coats
*/
/obj/item/clothing/suit/leathercoat
name = "leather coat"
desc = "A long, thick black leather coat."
@@ -204,7 +201,6 @@
/*
* stripper
*/
/obj/item/clothing/suit/stripper/stripper_pink
name = "pink skimpy dress"
desc = "A rather skimpy pink dress."
@@ -219,7 +215,7 @@
item_state = "green_labcoat"
siemens_coefficient = 1
/obj/item/clothing/suit/xenos //because these are for strippers *wink*
/obj/item/clothing/suit/xenos
name = "xenos suit"
desc = "A suit made out of chitinous alien hide."
icon_state = "xenos"
@@ -231,7 +227,6 @@
/*
* Poncho
*/
/obj/item/clothing/suit/poncho
name = "poncho"
desc = "A simple, comfortable poncho."
@@ -468,7 +463,7 @@
name = "carp costume"
desc = "A costume made from 'synthetic' carp scales, it smells."
icon_state = "carp_casual"
item_state = "carp_casual" //someone not me can make these -S2-
item_state = "carp_casual" //Does not exist -S2-
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE //Space carp like space, so you should too
@@ -479,7 +474,7 @@
/obj/item/clothing/head/carp_hood
name = "carp hood"
desc = "A hood attached to a carp costume."
icon_state = "carp_casual" //someone not me can make these -S2-
icon_state = "carp_casual" //Does not exist -S2-
body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
@@ -488,7 +483,7 @@
name = "corgi costume"
desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs."
icon_state = "ian"
item_state = "ian" //someone not me can make these -S2-
item_state = "ian" //Does not exist -S2-
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
//cold_protection = CHEST|GROIN|ARMS
//min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
@@ -500,7 +495,7 @@
name = "corgi hood"
desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits."
icon_state = "ian"
item_state = "ian" //someone not me can make these -S2-
item_state = "ian" //Does not exist -S2-
body_parts_covered = HEAD
//cold_protection = HEAD
//min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
@@ -509,7 +504,7 @@
name = "winter coat"
desc = "A heavy jacket made from 'synthetic' animal furs."
icon_state = "coatwinter"
item_state = "brown_jacket" //someone not me can make these -S2-
item_state = "coatwinter"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
@@ -530,52 +525,52 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/captain
name = "captain's winter coat"
icon_state = "coatcaptain"
item_state = "suit_blue"
item_state = "coatcaptain"
armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/hooded/wintercoat/security
name = "security winter coat"
icon_state = "coatsecurity"
item_state = "suit_red"
item_state = "coatsecurity"
armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/hooded/wintercoat/medical
name = "medical winter coat"
icon_state = "coatmedical"
item_state = "labcoat"
item_state = "coatmedical"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
/obj/item/clothing/suit/storage/hooded/wintercoat/science
name = "science winter coat"
icon_state = "coatscience"
item_state = "suit_purple"
item_state = "coatscience"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering
name = "engineering winter coat"
icon_state = "coatengineer"
item_state = "suit_yellow"
item_state = "coatengineer"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos
name = "atmospherics winter coat"
icon_state = "coatatmos"
item_state = "suit_navy"
item_state = "coatatmos"
/obj/item/clothing/suit/storage/hooded/wintercoat/hydro
name = "hydroponics winter coat"
icon_state = "coathydro"
item_state = "suit_olive"
item_state = "coathydro"
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo
name = "cargo winter coat"
icon_state = "coatcargo"
item_state = "brown_jacket"
item_state = "coatcargo"
/obj/item/clothing/suit/storage/hooded/wintercoat/miner
name = "mining winter coat"
icon_state = "coatminer"
item_state = "brown_jacket"
item_state = "coatminer"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/varsity
@@ -594,7 +589,7 @@
/obj/item/clothing/suit/varsity/green
name = "green varsity jacket"
icon_state = "suit_olive" //idc
icon_state = "suit_olive"
/obj/item/clothing/suit/varsity/blue
name = "blue varsity jacket"
@@ -607,33 +602,32 @@
/*
* Track Jackets
*/
/obj/item/clothing/suit/storage/toggle/track
name = "track jacket"
desc = "a track jacket, for the athletic."
icon_state = "trackjacket"
item_state = "suit_black"
item_state = "black_labcoat"
icon_open = "trackjacket_open"
icon_closed = "trackjacket"
/obj/item/clothing/suit/storage/toggle/track/blue
name = "blue track jacket"
icon_state = "trackjacketblue"
item_state = "suit_blue"
item_state = "blue_labcoat"
icon_open = "trackjacketblue_open"
icon_closed = "trackjacketblue"
/obj/item/clothing/suit/storage/toggle/track/green
name = "green track jacket"
icon_state = "trackjacketgreen"
item_state = "suit_green"
item_state = "green_labcoat"
icon_open = "trackjacketgreen_open"
icon_closed = "trackjacketgreen"
/obj/item/clothing/suit/storage/toggle/track/red
name = "red track jacket"
icon_state = "trackjacketred"
item_state = "suit_red"
item_state = "red_labcoat"
icon_open = "trackjacketred_open"
icon_closed = "trackjacketred"
@@ -650,7 +644,7 @@
name = "Flannel shirt"
desc = "A comfy, grey flannel shirt. Unleash your inner hipster."
icon_state = "flannel"
item_state = "gy_suit"
item_state = "black_labcoat"
var/rolled = 0
var/tucked = 0
var/buttoned = 0
@@ -714,12 +708,12 @@
/obj/item/clothing/suit/storage/flannel/red
desc = "A comfy, red flannel shirt. Unleash your inner hipster."
icon_state = "flannel_red"
item_state = "r_suit"
item_state = "red_labcoat"
/obj/item/clothing/suit/storage/flannel/aqua
desc = "A comfy, aqua flannel shirt. Unleash your inner hipster."
icon_state = "flannel_aqua"
item_state = "b_suit"
item_state = "blue_labcoat"
//Green Uniform
@@ -727,7 +721,7 @@
name = "green formal jacket"
desc = "A sleek proper formal jacket with gold buttons."
icon_state = "suitjacket_green_open"
item_state = "suitjacket_green_open"
item_state = "suit_olive"
icon_open = "suitjacket_green_open"
icon_closed = "suitjacket_green"
blood_overlay_type = "coat"

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

@@ -20,7 +20,6 @@
name = "research director dress uniform"
desc = "Feminine fashion for the style concious RD. Its fabric provides minor protection from biological contaminants."
icon_state = "dress_rd"
item_state = "director"
worn_state = "dress_rd"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS

2
code/modules/clothing/under/jobs/security.dm
View File

@@ -12,7 +12,7 @@
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
name = "warden's jumpsuit"
icon_state = "warden"
item_state = "red" //Someone else can make these later. to save file size and my mind I'm not doing all of these. -S2-
item_state = "red" //Red should be just fine -S2-
worn_state = "warden"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9

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

@@ -149,12 +149,6 @@
icon_state = "rainbow"
worn_state = "rainbow"
/obj/item/clothing/under/cloud
name = "cloud" //what..? -S2-
desc = "cloud"
icon_state = "cloud"
worn_state = "cloud"
/obj/item/clothing/under/psysuit
name = "dark undersuit"
desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm."
@@ -284,35 +278,31 @@
name = "black tango dress"
desc = "Filled with Latin fire."
icon_state = "black_tango"
item_state = "blackskirt" //Someone please make these -S2-
worn_state = "black_tango"
/obj/item/clothing/under/dress/blacktango/alt
name = "black tango dress"
desc = "Filled with Latin fire."
icon_state = "black_tango_alt"
item_state = "blackskirt" //Someone please make these -S2-
item_state = "black_tango"
worn_state = "black_tango_alt"
/obj/item/clothing/under/dress/stripeddress
name = "striped dress"
desc = "Fashion in space."
icon_state = "striped_dress"
item_state = "blue" //Someone please make these -S2-
worn_state = "striped_dress"
/obj/item/clothing/under/dress/sailordress
name = "sailor dress"
desc = "Formal wear for a leading lady."
icon_state = "sailor_dress"
item_state = "blue" //Someone please make these -S2-
worn_state = "sailor_dress"
/obj/item/clothing/under/dress/redeveninggown
name = "red evening gown"
desc = "Fancy dress for space bar singers."
icon_state = "red_evening_gown"
item_state = "red" //Someone please make these -S2-
worn_state = "red_evening_gown"
/obj/item/clothing/under/dress/maid
@@ -331,50 +321,43 @@
name = "flame dress"
desc = "A small black dress with blue flames print on it."
icon_state = "dress_fire"
item_state = "black" //Someone please make these -S2-
worn_state = "dress_fire"
/obj/item/clothing/under/dress/dress_green
name = "green dress"
desc = "A simple, tight fitting green dress."
icon_state = "dress_green"
item_state = "green" //Someone please make these -S2-
worn_state = "dress_green"
/obj/item/clothing/under/dress/dress_orange
name = "orange dress"
desc = "A fancy orange gown for those who like to show leg."
icon_state = "dress_orange"
item_state = "yellow" //Someone please make these -S2-
worn_state = "dress_orange"
/obj/item/clothing/under/dress/dress_pink
name = "pink dress"
desc = "A simple, tight fitting pink dress."
icon_state = "dress_pink"
item_state = "pink" //Someone please make these -S2-
worn_state = "dress_pink"
/obj/item/clothing/under/dress/dress_yellow
name = "yellow dress"
desc = "A flirty, little yellow dress."
icon_state = "dress_yellow"
item_state = "yellow" //You get the idea -S2-
worn_state = "dress_yellow"
/obj/item/clothing/under/dress/dress_saloon
name = "saloon girl dress"
desc = "A old western inspired gown for the girl who likes to drink."
icon_state = "dress_saloon"
item_state = "red"
item_state = "dress_white"
worn_state = "dress_saloon"
/obj/item/clothing/under/dress/dress_cap
name = "captain's dress uniform"
desc = "Feminine fashion for the style concious captain."
icon_state = "dress_cap"
item_state = "blue"
worn_state = "dress_cap"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -382,7 +365,6 @@
name = "head of personnel dress uniform"
desc = "Feminine fashion for the style concious HoP."
icon_state = "dress_hop"
item_state = "blue"
worn_state = "dress_hop"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -390,7 +372,6 @@
name = "human resources director uniform"
desc = "Superior class for the nosy H.R. Director."
icon_state = "huresource"
item_state = "yellow"
worn_state = "huresource"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -404,7 +385,6 @@
name = "orange wedding dress"
desc = "A big and puffy orange dress."
icon_state = "bride_orange"
item_state = "orange"
worn_state = "bride_orange"
flags_inv = HIDESHOES
@@ -412,7 +392,6 @@
name = "purple wedding dress"
desc = "A big and puffy purple dress."
icon_state = "bride_purple"
item_state = "purple"
worn_state = "bride_purple"
flags_inv = HIDESHOES
@@ -420,7 +399,6 @@
name = "blue wedding dress"
desc = "A big and puffy blue dress."
icon_state = "bride_blue"
item_state = "blue"
worn_state = "bride_blue"
flags_inv = HIDESHOES
@@ -428,7 +406,6 @@
name = "red wedding dress"
desc = "A big and puffy red dress."
icon_state = "bride_red"
item_state = "red"
worn_state = "bride_red"
flags_inv = HIDESHOES
@@ -436,7 +413,6 @@
name = "silky wedding dress"
desc = "A white wedding gown made from the finest silk."
icon_state = "bride_white"
item_state = "nursesuit"
worn_state = "bride_white"
flags_inv = HIDESHOES
body_parts_covered = UPPER_TORSO|LOWER_TORSO
@@ -445,7 +421,6 @@
name = "sundress"
desc = "Makes you want to frolic in a field of daisies."
icon_state = "sundress"
item_state = "blue"
worn_state = "sundress"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
@@ -453,7 +428,6 @@
name = "white sundress"
desc = "A white sundress decorated with purple lilies."
icon_state = "sundress_white"
item_state = "white"
worn_state = "sundress_white"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
@@ -521,6 +495,7 @@
name = "tan suit"
desc = "A tan suit. Smart, but casual."
icon_state = "tan_suit"
item_state = "tan_suit"
worn_state = "tan_suit"
starting_accessories = list(/obj/item/clothing/accessory/yellow, /obj/item/clothing/accessory/tan_jacket)
@@ -543,21 +518,18 @@
name = "red cheongsam"
desc = "It is a red cheongsam dress."
icon_state = "cheongsam-red"
item_state = "mai_yang"
worn_state = "cheongsam-red"
/obj/item/clothing/under/cheongsam/blue
name = "blue cheongsam"
desc = "It is a blue cheongsam dress."
icon_state = "cheongsam-blue"
item_state = "mai_yang"
worn_state = "cheongsam-blue"
/obj/item/clothing/under/cheongsam/black
name = "black cheongsam"
desc = "It is a black cheongsam dress."
icon_state = "cheongsam-black"
item_state = "mai_yang"
worn_state = "cheongsam-black"
/obj/item/clothing/under/blazer
@@ -613,7 +585,6 @@
name = "white wedding dress"
desc = "A fancy white dress with a blue underdress."
icon_state = "whitedress1"
item_state = "nursesuit"
worn_state = "whitedress1"
flags_inv = HIDESHOES
@@ -621,7 +592,6 @@
name = "long dress"
desc = "A long dress."
icon_state = "whitedress2"
item_state = "nursesuit"
worn_state = "whitedress2"
flags_inv = HIDESHOES
@@ -629,14 +599,12 @@
name = "short dress"
desc = "A short, plain dress."
icon_state = "whitedress3"
item_state = "nursesuit"
worn_state = "whitedress3"
/obj/item/clothing/under/dress/white4
name = "long flared dress"
desc = "A long white dress that flares out at the bottom."
icon_state = "whitedress4"
item_state = "nursesuit"
worn_state = "whitedress4"
flags_inv = HIDESHOES
@@ -644,7 +612,6 @@
name = "fancy dark red dress"
desc = "A short, red dress with a black belt. Fancy."
icon_state = "darkreddress"
item_state = "red"
worn_state = "darkreddress"
/*