cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix up ancient garbage

Browse Source
This commit is contained in:
Aronai Sieyes
2021-07-09 19:19:39 -04:00
parent d7a32991eb
commit 5bf23742ab
31 changed files with 7 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/asset_cache/asset_list_items.dm
-8
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"
code/modules/clothing/clothing.dm
+2 -37
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
@@ -758,27 +756,11 @@
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
@@ -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))
@@ -955,8 +920,8 @@
under_icon = item_icons[slot_w_uniform_str]
else if ("[worn_state]_s" 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)))
code/modules/clothing/clothing_icons.dm
-6
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 = ..()
code/modules/clothing/suits/labcoat.dm
-2
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
code/modules/clothing/suits/miscellaneous.dm
-5
View File
@@ -428,7 +428,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"
@@ -436,7 +435,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"
@@ -444,7 +442,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"
@@ -452,7 +449,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"
@@ -460,7 +456,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"
code/modules/clothing/suits/utility_vr.dm
-1
View File
@@ -15,7 +15,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/head/radiation
sprite_sheets = list(
code/modules/clothing/under/jobs/medsci.dm
-1
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."
code/modules/clothing/under/miscellaneous.dm
-23
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
code/modules/clothing/under/miscellaneous_vr.dm
-6
View File
@@ -141,7 +141,6 @@
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/inventory/uniform/item_vr.dmi'
index = "vr"
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
icon_state = "pizzadelivery"
item_state = "pizzadelivery"
@@ -153,7 +152,6 @@
name = "ITV jumpsuit"
desc = "A basic jumpsuit that bares the ITV logo on the breast."
icon = 'icons/inventory/uniform/item_vr.dmi'
index = "vr"
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "talon_basic"
@@ -164,7 +162,6 @@
name = "ITV proper jumpsuit"
desc = "A neat and proper uniform for a proper company."
icon = 'icons/inventory/uniform/item_vr.dmi'
index = "vr"
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "talon_jumpsuit"
@@ -175,7 +172,6 @@
name = "ITV security jumpsuit"
desc = "A sleek, streamlined version of ITV's standard jumpsuit that bares security markings."
icon = 'icons/inventory/uniform/item_vr.dmi'
index = "vr"
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "talon_security"
@@ -186,7 +182,6 @@
name = "ITV pilot jumpsuit"
desc = "A sleek, streamlined version of ITV's standard jumpsuit. Made from cushioned fabric to handle intense flight."
icon = 'icons/inventory/uniform/item_vr.dmi'
index = "vr"
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "talon_pilot"
@@ -197,7 +192,6 @@
name = "ITV command jumpsuit"
desc = "A commanding jumpsuit fit for a commanding officer."
icon = 'icons/inventory/uniform/item_vr.dmi'
index = "vr"
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "talon_captain"
code/modules/clothing/under/pants.dm
-1
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"
code/modules/clothing/under/shorts.dm
-17
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
code/modules/mob/living/carbon/human/update_icons.dm
+5 -8
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])