From 90f71f164a7bbff423873d4fd7aaa205047f9db6 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Sun, 5 May 2019 20:37:53 +0200 Subject: [PATCH] Remove unused species_fit and move chameleon file --- .../gamemodes/changeling/powers/mutations.dm | 1 - .../miniantags/abduction/abduction_gear.dm | 1 - code/game/objects/items.dm | 1 - code/game/objects/items/weapons/cigs.dm | 1 - code/game/objects/items/weapons/defib.dm | 1 - .../objects/items/weapons/storage/backpack.dm | 1 - .../modules/clothing/{under => }/chameleon.dm | 1036 ++++++++--------- code/modules/clothing/clothing.dm | 7 +- code/modules/clothing/glasses/glasses.dm | 32 +- code/modules/clothing/glasses/hud.dm | 14 +- code/modules/clothing/head/collectable.dm | 4 +- code/modules/clothing/head/hardhat.dm | 4 +- code/modules/clothing/head/helmet.dm | 4 +- code/modules/clothing/head/misc.dm | 14 +- code/modules/clothing/head/misc_special.dm | 10 +- code/modules/clothing/head/soft_caps.dm | 2 +- code/modules/clothing/masks/boxing.dm | 4 +- code/modules/clothing/masks/breath.dm | 3 +- code/modules/clothing/masks/gasmask.dm | 2 +- code/modules/clothing/masks/miscellaneous.dm | 14 +- code/modules/clothing/patreon/glasses.dm | 2 +- code/modules/clothing/patreon/hats.dm | 8 +- code/modules/clothing/spacesuits/ert.dm | 15 +- code/modules/clothing/spacesuits/hardsuit.dm | 2 +- .../clothing/spacesuits/miscellaneous.dm | 21 +- code/modules/clothing/suits/alien.dm | 1 - code/modules/clothing/suits/armor.dm | 5 +- code/modules/clothing/suits/bio.dm | 6 +- code/modules/clothing/suits/jobs.dm | 31 +- code/modules/clothing/suits/labcoat.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 34 +- code/modules/clothing/suits/utility.dm | 12 +- .../clothing/under/accessories/accessory.dm | 22 +- .../clothing/under/accessories/storage.dm | 2 +- code/modules/clothing/under/color.dm | 2 +- code/modules/clothing/under/jobs/security.dm | 2 +- code/modules/customitems/item_defines.dm | 16 +- .../mob/living/carbon/human/update_icons.dm | 2 +- code/modules/ninja/suit/mask.dm | 2 +- code/modules/vr/vr_goggles.dm | 2 +- paradise.dme | 2 +- 41 files changed, 651 insertions(+), 696 deletions(-) rename code/modules/clothing/{under => }/chameleon.dm (95%) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 4b5560fe333..7624508ee63 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -477,7 +477,6 @@ flags_inv = HIDEJUMPSUIT cold_protection = 0 heat_protection = 0 - species_fit = null sprite_sheets = null /obj/item/clothing/suit/armor/changeling/New() diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 827eefb569d..f6bed7b539f 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -23,7 +23,6 @@ var/datum/icon_snapshot/disguise var/stealth_armor = list(melee = 15, bullet = 15, laser = 15, energy = 15, bomb = 15, bio = 15, rad = 15) var/combat_armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 50, rad = 50) - species_fit = null sprite_sheets = null /obj/item/clothing/suit/armor/abductor/vest/proc/toggle_nodrop() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 37e286900f4..47b543a047d 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -89,7 +89,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d var/list/sprite_sheets = null var/icon_override = null //Used to override hardcoded clothing dmis in human clothing proc. var/sprite_sheets_obj = null //Used to override hardcoded clothing inventory object dmis in human clothing proc. - var/list/species_fit = null //This object has a different appearance when worn by these species var/trip_verb = TV_TRIP var/trip_chance = 0 diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index ce9f5d916a2..fa4b90e0e37 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -31,7 +31,6 @@ LIGHTERS ARE IN LIGHTERS.DM var/lastHolder = null var/smoketime = 300 var/chem_volume = 30 - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index ea70e29ef83..05f725fcf54 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -11,7 +11,6 @@ w_class = WEIGHT_CLASS_BULKY origin_tech = "biotech=4" actions_types = list(/datum/action/item_action/toggle_paddles) - species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/back.dmi' ) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 56ae2864071..cd65ba0fcb7 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -17,7 +17,6 @@ storage_slots = 21 burn_state = FLAMMABLE burntime = 20 - species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/back.dmi' ) diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/chameleon.dm similarity index 95% rename from code/modules/clothing/under/chameleon.dm rename to code/modules/clothing/chameleon.dm index f08ff54ee75..0a0a2e45abd 100644 --- a/code/modules/clothing/under/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -1,522 +1,516 @@ -#define EMP_RANDOMISE_TIME 300 - -/datum/action/chameleon_outfit - name = "Select Chameleon Outfit" - button_icon_state = "chameleon_outfit" - var/list/outfit_options //By default, this list is shared between all instances. It is not static because if it were, subtypes would not be able to have their own. If you ever want to edit it, copy it first. - -/datum/action/chameleon_outfit/New() - ..() - initialize_outfits() - -/datum/action/chameleon_outfit/proc/initialize_outfits() - var/static/list/standard_outfit_options - if(!standard_outfit_options) - standard_outfit_options = list() - for(var/path in subtypesof(/datum/outfit/job)) - var/datum/outfit/O = path - standard_outfit_options[initial(O.name)] = path - sortTim(standard_outfit_options, /proc/cmp_text_asc) - outfit_options = standard_outfit_options - -/datum/action/chameleon_outfit/Trigger() - return select_outfit(owner) - -/datum/action/chameleon_outfit/proc/select_outfit(mob/user) - if(!user || !IsAvailable()) - return FALSE - var/selected = input("Select outfit to change into", "Chameleon Outfit") as null|anything in outfit_options - if(!IsAvailable() || QDELETED(src) || QDELETED(user)) - return FALSE - var/outfit_type = outfit_options[selected] - if(!outfit_type) - return FALSE - var/datum/outfit/O = new outfit_type() - var/list/outfit_types = O.get_chameleon_disguise_info() - - for(var/V in user.chameleon_item_actions) - var/datum/action/item_action/chameleon/change/A = V - var/done = FALSE - for(var/T in outfit_types) - for(var/name in A.chameleon_list) - if(A.chameleon_list[name] == T) - A.update_look(user, T) - outfit_types -= T - done = TRUE - break - if(done) - break - //hardsuit helmets/suit hoods - if(ispath(O.suit, /obj/item/clothing/suit/hooded) && ishuman(user)) - var/mob/living/carbon/human/H = user - //make sure they are actually wearing the suit, not just holding it, and that they have a chameleon hat - if(istype(H.wear_suit, /obj/item/clothing/suit/chameleon) && istype(H.head, /obj/item/clothing/head/chameleon)) - var/helmet_type - var/obj/item/clothing/suit/hooded/hooded = O.suit - helmet_type = initial(hooded.hoodtype) - - if(helmet_type) - var/obj/item/clothing/head/chameleon/hat = H.head - hat.chameleon_action.update_look(user, helmet_type) - qdel(O) - return TRUE - - -/datum/action/item_action/chameleon/change - name = "Chameleon Change" - var/list/chameleon_blacklist = list() //This is a typecache - var/list/chameleon_list = list() - var/chameleon_type = null - var/chameleon_name = "Item" - - var/emp_timer - -/datum/action/item_action/chameleon/change/Grant(mob/M) - if(M && (owner != M)) - if(!M.chameleon_item_actions) - M.chameleon_item_actions = list(src) - var/datum/action/chameleon_outfit/O = new /datum/action/chameleon_outfit() - O.Grant(M) - else - M.chameleon_item_actions |= src - ..() - -/datum/action/item_action/chameleon/change/Remove(mob/M) - if(M && (M == owner)) - LAZYREMOVE(M.chameleon_item_actions, src) - if(!LAZYLEN(M.chameleon_item_actions)) - var/datum/action/chameleon_outfit/O = locate(/datum/action/chameleon_outfit) in M.actions - qdel(O) - ..() - -/datum/action/item_action/chameleon/change/proc/initialize_disguises() - if(button) - button.name = "Change [chameleon_name] Appearance" - - chameleon_blacklist |= typecacheof(target.type) - for(var/V in typesof(chameleon_type)) - if(ispath(V) && ispath(V, /obj/item)) - var/obj/item/I = V - if(chameleon_blacklist[V] || (initial(I.flags) & ABSTRACT) || !initial(I.icon_state)) - continue - var/chameleon_item_name = "[initial(I.name)] ([initial(I.icon_state)])" - chameleon_list[chameleon_item_name] = I - -/datum/action/item_action/chameleon/change/proc/select_look(mob/user) - var/obj/item/picked_item - var/picked_name - picked_name = input("Select [chameleon_name] to change into", "Chameleon [chameleon_name]", picked_name) as null|anything in chameleon_list - if(!picked_name) - return - picked_item = chameleon_list[picked_name] - if(!picked_item) - return - update_look(user, picked_item) - -/datum/action/item_action/chameleon/change/proc/random_look(mob/user) - var/picked_name = pick(chameleon_list) - // If a user is provided, then this item is in use, and we - // need to update our icons and stuff - - if(user) - update_look(user, chameleon_list[picked_name]) - - // Otherwise, it's likely a random initialisation, so we - // don't have to worry - - else - update_item(chameleon_list[picked_name]) - -/datum/action/item_action/chameleon/change/proc/update_look(mob/user, obj/item/picked_item) - if(isliving(user)) - var/mob/living/C = user - if(C.stat != CONSCIOUS) - return - - update_item(picked_item) - var/obj/item/thing = target - thing.update_slot_icon() - UpdateButtonIcon() - -/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item) - // Species-related variables are lists, which can not be retrieved using initial(). As such, we need to instantiate the picked item. - var/obj/item/P = new picked_item(null) - - target.name = P.name - target.desc = P.desc - target.icon_state = P.icon_state - - if(isitem(target)) - var/obj/item/I = target - - I.item_state = P.item_state - I.item_color = P.item_color - - I.icon_override = P.icon_override - I.species_fit = P.species_fit - I.sprite_sheets = P.sprite_sheets - - if(istype(I, /obj/item/clothing) && istype(P, /obj/item/clothing)) - var/obj/item/clothing/CL = I - var/obj/item/clothing/PCL = P - CL.flags_cover = PCL.flags_cover - - target.icon = P.icon - qdel(P) - -/datum/action/item_action/chameleon/change/Trigger() - if(!IsAvailable()) - return - - select_look(owner) - return 1 - -/datum/action/item_action/chameleon/change/proc/emp_randomise(var/amount = EMP_RANDOMISE_TIME) - START_PROCESSING(SSprocessing, src) - random_look(owner) - - var/new_value = world.time + amount - if(new_value > emp_timer) - emp_timer = new_value - -/datum/action/item_action/chameleon/change/process() - if(world.time > emp_timer) - STOP_PROCESSING(SSprocessing, src) - return - random_look(owner) - -/obj/item/clothing/under/chameleon - name = "black jumpsuit" - icon_state = "black" - item_state = "bl_suit" - item_color = "black" - desc = "It's a plain jumpsuit. It has a small dial on the wrist." - sensor_mode = SENSOR_OFF //Hey who's this guy on the Syndicate Shuttle?? - random_sensor = FALSE - resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/under/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/under - chameleon_action.chameleon_name = "Jumpsuit" - chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/under, /obj/item/clothing/under/color, /obj/item/clothing/under/rank), only_root_path = TRUE) - chameleon_action.initialize_disguises() - -/obj/item/clothing/under/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/under/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/suit/chameleon - name = "armor" - desc = "A slim armored vest that protects against most types of damage." - icon_state = "armor" - item_state = "armor" - blood_overlay_type = "armor" - resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' - ) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/suit/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/suit - chameleon_action.chameleon_name = "Suit" - chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/suit/armor/abductor), only_root_path = TRUE) - chameleon_action.initialize_disguises() - -/obj/item/clothing/suit/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/suit/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/glasses/chameleon - name = "Optical Meson Scanner" - desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition." - icon_state = "meson" - item_state = "meson" - resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' - ) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/glasses/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/glasses - chameleon_action.chameleon_name = "Glasses" - chameleon_action.chameleon_blacklist = list() - chameleon_action.initialize_disguises() - -/obj/item/clothing/glasses/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/glasses/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/gloves/chameleon - desc = "These gloves will protect the wearer from electric shock." - name = "insulated gloves" - icon_state = "yellow" - item_state = "ygloves" - - resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/gloves/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/gloves - chameleon_action.chameleon_name = "Gloves" - chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/gloves, /obj/item/clothing/gloves/color), only_root_path = TRUE) - chameleon_action.initialize_disguises() - -/obj/item/clothing/gloves/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/gloves/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/head/chameleon - name = "grey cap" - desc = "It's a baseball hat in a tasteful grey colour." - icon_state = "greysoft" - item_color = "grey" - - resistance_flags = NONE - armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' - ) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/head/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/head - chameleon_action.chameleon_name = "Hat" - chameleon_action.chameleon_blacklist = list() - chameleon_action.initialize_disguises() - -/obj/item/clothing/head/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/head/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/mask/chameleon - name = "gas mask" - desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate - icon_state = "gas_alt" - item_state = "gas_alt" - resistance_flags = NONE - armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - flags = AIRTIGHT | BLOCK_GAS_SMOKE_EFFECT - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE - gas_transfer_coefficient = 0.01 - permeability_coefficient = 0.01 - flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH - - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi' - ) - - var/obj/item/voice_changer/voice_changer - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/mask/chameleon/Initialize() - . = ..() - - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/mask - chameleon_action.chameleon_name = "Mask" - chameleon_action.chameleon_blacklist = list() - chameleon_action.initialize_disguises() - - voice_changer = new(src) - -/obj/item/clothing/mask/chameleon/Destroy() - QDEL_NULL(voice_changer) - return ..() - -/obj/item/clothing/mask/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/mask/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/clothing/shoes/chameleon - name = "black shoes" - icon_state = "black" - item_color = "black" - desc = "A pair of black shoes." - permeability_coefficient = 0.05 - resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/clothing/shoes/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/clothing/shoes - chameleon_action.chameleon_name = "Shoes" - chameleon_action.chameleon_blacklist = list() - chameleon_action.initialize_disguises() - -/obj/item/clothing/shoes/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/clothing/shoes/chameleon/noslip - name = "black shoes" - icon_state = "black" - item_color = "black" - desc = "A pair of black shoes." - flags = NOSLIP - -/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/storage/backpack/chameleon - name = "backpack" - - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/back.dmi' - ) - - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/storage/backpack/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/storage/backpack - chameleon_action.chameleon_name = "Backpack" - chameleon_action.initialize_disguises() - -/obj/item/storage/backpack/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/storage/backpack/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/storage/belt/chameleon - name = "toolbelt" - desc = "Holds tools." - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/storage/belt/chameleon/Initialize() - . = ..() - - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/storage/belt - chameleon_action.chameleon_name = "Belt" - chameleon_action.initialize_disguises() - -/obj/item/storage/belt/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/storage/belt/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/radio/headset/chameleon - name = "radio headset" - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/radio/headset/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/radio/headset - chameleon_action.chameleon_name = "Headset" - chameleon_action.initialize_disguises() - -/obj/item/radio/headset/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/radio/headset/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/pda/chameleon - name = "PDA" - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/pda/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/pda - chameleon_action.chameleon_name = "PDA" - chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/pda/heads), only_root_path = TRUE) - chameleon_action.initialize_disguises() - -/obj/item/pda/chameleon/emp_act(severity) - . = ..() - chameleon_action.emp_randomise() - -/obj/item/pda/chameleon/broken/Initialize() - . = ..() - chameleon_action.emp_randomise(INFINITY) - -/obj/item/stamp/chameleon - var/datum/action/item_action/chameleon/change/chameleon_action - -/obj/item/stamp/chameleon/Initialize() - . = ..() - chameleon_action = new(src) - chameleon_action.chameleon_type = /obj/item/stamp - chameleon_action.chameleon_name = "Stamp" - chameleon_action.initialize_disguises() - -/obj/item/stamp/chameleon/broken/Initialize() - . = ..() +#define EMP_RANDOMISE_TIME 300 + +/datum/action/chameleon_outfit + name = "Select Chameleon Outfit" + button_icon_state = "chameleon_outfit" + var/list/outfit_options //By default, this list is shared between all instances. It is not static because if it were, subtypes would not be able to have their own. If you ever want to edit it, copy it first. + +/datum/action/chameleon_outfit/New() + ..() + initialize_outfits() + +/datum/action/chameleon_outfit/proc/initialize_outfits() + var/static/list/standard_outfit_options + if(!standard_outfit_options) + standard_outfit_options = list() + for(var/path in subtypesof(/datum/outfit/job)) + var/datum/outfit/O = path + standard_outfit_options[initial(O.name)] = path + sortTim(standard_outfit_options, /proc/cmp_text_asc) + outfit_options = standard_outfit_options + +/datum/action/chameleon_outfit/Trigger() + return select_outfit(owner) + +/datum/action/chameleon_outfit/proc/select_outfit(mob/user) + if(!user || !IsAvailable()) + return FALSE + var/selected = input("Select outfit to change into", "Chameleon Outfit") as null|anything in outfit_options + if(!IsAvailable() || QDELETED(src) || QDELETED(user)) + return FALSE + var/outfit_type = outfit_options[selected] + if(!outfit_type) + return FALSE + var/datum/outfit/O = new outfit_type() + var/list/outfit_types = O.get_chameleon_disguise_info() + + for(var/V in user.chameleon_item_actions) + var/datum/action/item_action/chameleon/change/A = V + var/done = FALSE + for(var/T in outfit_types) + for(var/name in A.chameleon_list) + if(A.chameleon_list[name] == T) + A.update_look(user, T) + outfit_types -= T + done = TRUE + break + if(done) + break + //hardsuit helmets/suit hoods + if(ispath(O.suit, /obj/item/clothing/suit/hooded) && ishuman(user)) + var/mob/living/carbon/human/H = user + //make sure they are actually wearing the suit, not just holding it, and that they have a chameleon hat + if(istype(H.wear_suit, /obj/item/clothing/suit/chameleon) && istype(H.head, /obj/item/clothing/head/chameleon)) + var/helmet_type + var/obj/item/clothing/suit/hooded/hooded = O.suit + helmet_type = initial(hooded.hoodtype) + + if(helmet_type) + var/obj/item/clothing/head/chameleon/hat = H.head + hat.chameleon_action.update_look(user, helmet_type) + qdel(O) + return TRUE + + +/datum/action/item_action/chameleon/change + name = "Chameleon Change" + var/list/chameleon_blacklist = list() //This is a typecache + var/list/chameleon_list = list() + var/chameleon_type = null + var/chameleon_name = "Item" + + var/emp_timer + +/datum/action/item_action/chameleon/change/Grant(mob/M) + if(M && (owner != M)) + if(!M.chameleon_item_actions) + M.chameleon_item_actions = list(src) + var/datum/action/chameleon_outfit/O = new /datum/action/chameleon_outfit() + O.Grant(M) + else + M.chameleon_item_actions |= src + ..() + +/datum/action/item_action/chameleon/change/Remove(mob/M) + if(M && (M == owner)) + LAZYREMOVE(M.chameleon_item_actions, src) + if(!LAZYLEN(M.chameleon_item_actions)) + var/datum/action/chameleon_outfit/O = locate(/datum/action/chameleon_outfit) in M.actions + qdel(O) + ..() + +/datum/action/item_action/chameleon/change/proc/initialize_disguises() + if(button) + button.name = "Change [chameleon_name] Appearance" + + chameleon_blacklist |= typecacheof(target.type) + for(var/V in typesof(chameleon_type)) + if(ispath(V) && ispath(V, /obj/item)) + var/obj/item/I = V + if(chameleon_blacklist[V] || (initial(I.flags) & ABSTRACT) || !initial(I.icon_state)) + continue + var/chameleon_item_name = "[initial(I.name)] ([initial(I.icon_state)])" + chameleon_list[chameleon_item_name] = I + +/datum/action/item_action/chameleon/change/proc/select_look(mob/user) + var/obj/item/picked_item + var/picked_name + picked_name = input("Select [chameleon_name] to change into", "Chameleon [chameleon_name]", picked_name) as null|anything in chameleon_list + if(!picked_name) + return + picked_item = chameleon_list[picked_name] + if(!picked_item) + return + update_look(user, picked_item) + +/datum/action/item_action/chameleon/change/proc/random_look(mob/user) + var/picked_name = pick(chameleon_list) + // If a user is provided, then this item is in use, and we + // need to update our icons and stuff + + if(user) + update_look(user, chameleon_list[picked_name]) + + // Otherwise, it's likely a random initialisation, so we + // don't have to worry + + else + update_item(chameleon_list[picked_name]) + +/datum/action/item_action/chameleon/change/proc/update_look(mob/user, obj/item/picked_item) + if(isliving(user)) + var/mob/living/C = user + if(C.stat != CONSCIOUS) + return + + update_item(picked_item) + var/obj/item/thing = target + thing.update_slot_icon() + UpdateButtonIcon() + +/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item) + // Species-related variables are lists, which can not be retrieved using initial(). As such, we need to instantiate the picked item. + var/obj/item/P = new picked_item(null) + + target.name = P.name + target.desc = P.desc + target.icon_state = P.icon_state + + if(isitem(target)) + var/obj/item/I = target + + I.item_state = P.item_state + I.item_color = P.item_color + + I.icon_override = P.icon_override + I.sprite_sheets = P.sprite_sheets + + if(istype(I, /obj/item/clothing) && istype(P, /obj/item/clothing)) + var/obj/item/clothing/CL = I + var/obj/item/clothing/PCL = P + CL.flags_cover = PCL.flags_cover + + target.icon = P.icon + qdel(P) + +/datum/action/item_action/chameleon/change/Trigger() + if(!IsAvailable()) + return + + select_look(owner) + return 1 + +/datum/action/item_action/chameleon/change/proc/emp_randomise(var/amount = EMP_RANDOMISE_TIME) + START_PROCESSING(SSprocessing, src) + random_look(owner) + + var/new_value = world.time + amount + if(new_value > emp_timer) + emp_timer = new_value + +/datum/action/item_action/chameleon/change/process() + if(world.time > emp_timer) + STOP_PROCESSING(SSprocessing, src) + return + random_look(owner) + +/obj/item/clothing/under/chameleon + name = "black jumpsuit" + icon_state = "black" + item_state = "bl_suit" + item_color = "black" + desc = "It's a plain jumpsuit. It has a small dial on the wrist." + sensor_mode = SENSOR_OFF //Hey who's this guy on the Syndicate Shuttle?? + random_sensor = FALSE + resistance_flags = NONE + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/under/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/under + chameleon_action.chameleon_name = "Jumpsuit" + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/under, /obj/item/clothing/under/color, /obj/item/clothing/under/rank), only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/clothing/under/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/under/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/suit/chameleon + name = "armor" + desc = "A slim armored vest that protects against most types of damage." + icon_state = "armor" + item_state = "armor" + blood_overlay_type = "armor" + resistance_flags = NONE + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/suit.dmi' + ) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/suit/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/suit + chameleon_action.chameleon_name = "Suit" + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/suit/armor/abductor), only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/clothing/suit/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/suit/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/glasses/chameleon + name = "Optical Meson Scanner" + desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition." + icon_state = "meson" + item_state = "meson" + resistance_flags = NONE + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/eyes.dmi', + "Drask" = 'icons/mob/species/drask/eyes.dmi', + "Grey" = 'icons/mob/species/grey/eyes.dmi' + ) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/glasses/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/glasses + chameleon_action.chameleon_name = "Glasses" + chameleon_action.chameleon_blacklist = list() + chameleon_action.initialize_disguises() + +/obj/item/clothing/glasses/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/glasses/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/gloves/chameleon + desc = "These gloves will protect the wearer from electric shock." + name = "insulated gloves" + icon_state = "yellow" + item_state = "ygloves" + + resistance_flags = NONE + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/gloves/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/gloves + chameleon_action.chameleon_name = "Gloves" + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/gloves, /obj/item/clothing/gloves/color), only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/clothing/gloves/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/gloves/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/head/chameleon + name = "grey cap" + desc = "It's a baseball hat in a tasteful grey colour." + icon_state = "greysoft" + item_color = "grey" + + resistance_flags = NONE + armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/head.dmi' + ) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/head/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/head + chameleon_action.chameleon_name = "Hat" + chameleon_action.chameleon_blacklist = list() + chameleon_action.initialize_disguises() + +/obj/item/clothing/head/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/head/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/mask/chameleon + name = "gas mask" + desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate + icon_state = "gas_alt" + item_state = "gas_alt" + resistance_flags = NONE + armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + flags = AIRTIGHT | BLOCK_GAS_SMOKE_EFFECT + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + gas_transfer_coefficient = 0.01 + permeability_coefficient = 0.01 + flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH + + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', + "Drask" = 'icons/mob/species/drask/mask.dmi', + "Grey" = 'icons/mob/species/grey/mask.dmi' + ) + + var/obj/item/voice_changer/voice_changer + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/mask/chameleon/Initialize() + . = ..() + + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/mask + chameleon_action.chameleon_name = "Mask" + chameleon_action.chameleon_blacklist = list() + chameleon_action.initialize_disguises() + + voice_changer = new(src) + +/obj/item/clothing/mask/chameleon/Destroy() + QDEL_NULL(voice_changer) + return ..() + +/obj/item/clothing/mask/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/mask/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/clothing/shoes/chameleon + name = "black shoes" + icon_state = "black" + item_color = "black" + desc = "A pair of black shoes." + permeability_coefficient = 0.05 + resistance_flags = NONE + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/shoes/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/shoes + chameleon_action.chameleon_name = "Shoes" + chameleon_action.chameleon_blacklist = list() + chameleon_action.initialize_disguises() + +/obj/item/clothing/shoes/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/clothing/shoes/chameleon/noslip + name = "black shoes" + icon_state = "black" + item_color = "black" + desc = "A pair of black shoes." + flags = NOSLIP + +/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/storage/backpack/chameleon + name = "backpack" + + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/back.dmi' + ) + + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/storage/backpack/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/storage/backpack + chameleon_action.chameleon_name = "Backpack" + chameleon_action.initialize_disguises() + +/obj/item/storage/backpack/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/storage/backpack/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/storage/belt/chameleon + name = "toolbelt" + desc = "Holds tools." + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/storage/belt/chameleon/Initialize() + . = ..() + + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/storage/belt + chameleon_action.chameleon_name = "Belt" + chameleon_action.initialize_disguises() + +/obj/item/storage/belt/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/storage/belt/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/radio/headset/chameleon + name = "radio headset" + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/radio/headset/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/radio/headset + chameleon_action.chameleon_name = "Headset" + chameleon_action.initialize_disguises() + +/obj/item/radio/headset/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/radio/headset/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/pda/chameleon + name = "PDA" + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/pda/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/pda + chameleon_action.chameleon_name = "PDA" + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/pda/heads), only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/pda/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() + +/obj/item/pda/chameleon/broken/Initialize() + . = ..() + chameleon_action.emp_randomise(INFINITY) + +/obj/item/stamp/chameleon + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/stamp/chameleon/Initialize() + . = ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/stamp + chameleon_action.chameleon_name = "Stamp" + chameleon_action.initialize_disguises() + +/obj/item/stamp/chameleon/broken/Initialize() + . = ..() chameleon_action.emp_randomise(INFINITY) \ No newline at end of file diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index a0e3b169c7e..7508b6e5a25 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -189,7 +189,7 @@ BLIND // can't see anything var/clipped = 0 strip_delay = 20 put_on_delay = 40 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/gloves.dmi', "Drask" = 'icons/mob/species/drask/gloves.dmi' @@ -378,7 +378,7 @@ BLIND // can't see anything permeability_coefficient = 0.50 slowdown = SHOES_SLOWDOWN - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/shoes.dmi' ) @@ -568,12 +568,13 @@ BLIND // can't see anything permeability_coefficient = 0.90 slot_flags = SLOT_ICLOTHING armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) - species_fit = list("Vox", "Drask", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/uniform.dmi', "Drask" = 'icons/mob/species/drask/uniform.dmi', "Grey" = 'icons/mob/species/grey/uniform.dmi' ) + var/has_sensor = TRUE//For the crew computer 2 = unable to change mode var/sensor_mode = SENSOR_OFF var/random_sensor = TRUE diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index b527bb2717d..f489035715a 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -39,7 +39,7 @@ vision_flags = SEE_TURFS invis_view = SEE_INVISIBLE_MINIMUM //don't render darkness while wearing these prescription_upgradable = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -87,7 +87,7 @@ origin_tech = "magnets=2;engineering=1" prescription_upgradable = 0 scan_reagents = 1 //You can see reagents while wearing science goggles - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -111,7 +111,7 @@ desc = "These'll keep the soap out of your eyes." icon_state = "purple" item_state = "glasses" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) @@ -124,7 +124,7 @@ origin_tech = "materials=4;magnets=4;plasmatech=4;engineering=4" darkness_view = 8 invis_view = SEE_INVISIBLE_MINIMUM //don't render darkness while wearing these - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -136,7 +136,7 @@ desc = "Yarr." icon_state = "eyepatch" item_state = "eyepatch" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -148,7 +148,7 @@ icon_state = "monocle" item_state = "headset" // lol prescription_upgradable = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -162,7 +162,7 @@ item_state = "glasses" origin_tech = "magnets=3;engineering=3" vision_flags = SEE_OBJS - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -183,7 +183,7 @@ icon_state = "glasses" item_state = "glasses" prescription = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -200,7 +200,7 @@ name = "3D glasses" icon_state = "3d" item_state = "3d" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -211,7 +211,7 @@ desc = "Forest green glasses, like the kind you'd wear when hatching a nasty scheme." icon_state = "gglasses" item_state = "gglasses" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -227,7 +227,7 @@ flash_protect = 1 tint = 1 prescription_upgradable = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -288,7 +288,7 @@ darkness_view = 1 flash_protect = 1 tint = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -314,7 +314,7 @@ actions_types = list(/datum/action/item_action/toggle) flash_protect = 2 tint = 2 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -383,7 +383,7 @@ origin_tech = "magnets=3" vision_flags = SEE_MOBS flash_protect = -1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -414,7 +414,7 @@ desc = "Strangely ancient technology used to help provide rudimentary eye cover." icon_state = "sun" item_state = "sunglasses" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -532,7 +532,7 @@ actions_types = list(/datum/action/item_action/toggle) up = 0 tint = 0 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index d778ea5e63a..fb5ea498e9b 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -31,7 +31,7 @@ icon_state = "healthhud" origin_tech = "magnets=3;biotech=2" HUDType = DATA_HUD_MEDICAL_ADVANCED - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -60,7 +60,7 @@ icon_state = "diagnostichud" origin_tech = "magnets=2;engineering=2" HUDType = DATA_HUD_DIAGNOSTIC - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -84,7 +84,7 @@ var/global/list/jobs[0] HUDType = DATA_HUD_SECURITY_ADVANCED var/read_only = FALSE - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -127,7 +127,7 @@ flash_protect = 1 tint = 1 prescription_upgradable = 1 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Drask" = 'icons/mob/species/drask/eyes.dmi', @@ -142,7 +142,7 @@ desc = "A heads-up display capable of analyzing the health and status of plants growing in hydro trays and soil." icon_state = "hydroponichud" HUDType = DATA_HUD_HYDROPONIC - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi', "Grey" = 'icons/mob/species/grey/eyes.dmi' @@ -165,7 +165,7 @@ flags_cover = GLASSESCOVERSEYES actions_types = list(/datum/action/item_action/toggle) up = 0 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) @@ -181,7 +181,7 @@ flags_cover = GLASSESCOVERSEYES actions_types = list(/datum/action/item_action/toggle) up = 0 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index bbaf5b34e8b..70f0b1944de 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -59,7 +59,7 @@ icon_state = "welding" item_state = "welding" burn_state = FIRE_PROOF - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -126,7 +126,7 @@ icon_state = "swat" item_state = "swat" burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi' ) diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 4a51349e165..0e9d2bac8de 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -11,7 +11,7 @@ flags_inv = 0 actions_types = list(/datum/action/item_action/toggle_helmet_light) burn_state = FIRE_PROOF - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -95,7 +95,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/helmet.dmi' ) \ No newline at end of file diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 35b4b6a75e0..5972e0a8048 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -13,7 +13,7 @@ max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT strip_delay = 60 burn_state = FIRE_PROOF - species_fit = list("Vox", "Drask", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Drask" = 'icons/mob/species/drask/helmet.dmi', @@ -202,7 +202,7 @@ obj/item/clothing/head/blob item_state = "blobhat" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi' ) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 62873252ad1..c3377296177 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -76,7 +76,7 @@ desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/helmet.dmi' ) @@ -90,7 +90,7 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -103,7 +103,7 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -265,7 +265,7 @@ icon_state = "chickenhead" item_state = "chickensuit" flags = BLOCKHAIR - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -419,7 +419,7 @@ item_state = "griffinhat" flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -452,7 +452,7 @@ icon_state = "papersack" flags = BLOCKHAIR flags_inv = HIDEFACE|HIDEEARS - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -463,7 +463,7 @@ icon_state = "papersack_smile" flags = BLOCKHAIR flags_inv = HIDEFACE|HIDEEARS - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index ab0dffee5dc..2675d778366 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -25,7 +25,7 @@ flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) actions_types = list(/datum/action/item_action/toggle) burn_state = FIRE_PROOF - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi', "Unathi" = 'icons/mob/species/unathi/helmet.dmi', @@ -132,7 +132,7 @@ flags_inv = HIDEEARS cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -159,7 +159,7 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -230,7 +230,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH species_disguise = "High-tech robot" - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -256,7 +256,7 @@ desc = "A band of rubber with a very reflective looking mirror attached to the front of it. One of the early signs of medical budget cuts." icon_state = "head_mirror" item_state = "head_mirror" - species_fit = list("Vox, Drask") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi', "Drask" = 'icons/mob/species/drask/head.dmi', diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 93d420f8ede..81d36884ef2 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -6,7 +6,7 @@ item_color = "cargo" var/flipped = 0 actions_types = list(/datum/action/item_action/flip_cap) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index d66daf59760..78034a3c0c8 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -8,7 +8,7 @@ w_class = WEIGHT_CLASS_SMALL actions_types = list(/datum/action/item_action/adjust) adjusted_flags = SLOT_HEAD - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -29,7 +29,7 @@ flags = BLOCKHAIR flags_inv = HIDEFACE w_class = WEIGHT_CLASS_SMALL - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 55c305cf449..84c6d9394c5 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -10,7 +10,7 @@ permeability_coefficient = 0.50 actions_types = list(/datum/action/item_action/adjust) burn_state = FIRE_PROOF - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey" ) + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -36,7 +36,6 @@ item_state = "medical" permeability_coefficient = 0.01 put_on_delay = 10 - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") /obj/item/clothing/mask/breath/vox desc = "A weirdly-shaped breath mask." diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 1bd53217770..9fbf2506edd 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -10,7 +10,7 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 burn_state = FIRE_PROOF - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 231a353e153..85840d5db42 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -11,7 +11,7 @@ var/mute = MUZZLE_MUTE_ALL var/security_lock = FALSE // Requires brig access to remove 0 - Remove as normal var/locked = FALSE //Indicates if a mask is locked, should always start as 0. - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi' ) @@ -89,7 +89,7 @@ resist_time = 150 mute = MUZZLE_MUTE_MUFFLE flags = DROPDEL - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -197,7 +197,7 @@ permeability_coefficient = 0.01 armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 25, rad = 0) actions_types = list(/datum/action/item_action/adjust) - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -216,7 +216,7 @@ icon_state = "fake-moustache" flags_inv = HIDEFACE actions_types = list(/datum/action/item_action/pontificate) - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', @@ -295,7 +295,7 @@ var/voicechange = 0 var/temporaryname = " the Horse" var/originalname = "" - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/mask.dmi' ) @@ -390,7 +390,7 @@ desc = "It's the eater of worlds, and of children." icon_state = "pennywise_mask" item_state = "pennywise_mask" - species_fit = list("Vox") + flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR // Bandanas @@ -403,7 +403,7 @@ slot_flags = SLOT_MASK adjusted_flags = SLOT_HEAD icon_state = "bandbotany" - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', diff --git a/code/modules/clothing/patreon/glasses.dm b/code/modules/clothing/patreon/glasses.dm index 8f795b212a2..f52d54f7df2 100644 --- a/code/modules/clothing/patreon/glasses.dm +++ b/code/modules/clothing/patreon/glasses.dm @@ -7,7 +7,7 @@ desc = "Row row!" icon_state = "gar" item_state = "gar" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) diff --git a/code/modules/clothing/patreon/hats.dm b/code/modules/clothing/patreon/hats.dm index bfcc69972e4..abee0cb9466 100644 --- a/code/modules/clothing/patreon/hats.dm +++ b/code/modules/clothing/patreon/hats.dm @@ -9,7 +9,7 @@ icon_state = "mushhat" item_state = "mushhat" flags = BLOCKHAIR - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) @@ -20,7 +20,7 @@ desc = "Poshness incarnate." icon_state = "goldtophat" item_state = "goldtophat" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) @@ -45,7 +45,7 @@ icon_state = "guardhelm" item_state = "guardhelm" flags = BLOCKHAIR - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) @@ -57,7 +57,7 @@ icon_state = "blacksombrero" item_state = "blacksombrero" flags = BLOCKHAIR - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index 1131f1ee648..099b46a10b9 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -9,7 +9,7 @@ var/obj/machinery/camera/camera var/has_camera = TRUE strip_delay = 130 - species_fit = list("Grey", "Vox") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/helmet.dmi', "Vox" = 'icons/mob/species/vox/helmet.dmi' @@ -42,7 +42,7 @@ /obj/item/radio, /obj/item/analyzer, /obj/item/gun/energy/laser, /obj/item/gun/energy/pulse, \ /obj/item/gun/energy/gun/advtaser, /obj/item/melee/baton, /obj/item/gun/energy/gun, /obj/item/gun/projectile/automatic/lasercarbine, /obj/item/gun/energy/gun/blueshield, /obj/item/gun/energy/immolator/multi) strip_delay = 130 - species_fit = list("Drask", "Vox") + sprite_sheets = list( "Drask" = 'icons/mob/species/drask/suit.dmi', "Vox" = 'icons/mob/species/vox/suit.dmi' @@ -61,7 +61,6 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammacommander" item_color = "gammacommander" - species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/commander name = "emergency response team commander suit" @@ -73,7 +72,6 @@ name = "elite emergency response team commander suit" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "ert_gcommander" - species_fit = null //Security /obj/item/clothing/head/helmet/space/hardsuit/ert/security @@ -88,7 +86,6 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammasecurity" item_color = "gammasecurity" - species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/security name = "emergency response team security suit" @@ -100,7 +97,6 @@ name = "elite emergency response team security suit" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "ert_gsecurity" - species_fit = null //Engineer /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer @@ -116,7 +112,6 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammaengineer" item_color = "gammaengineer" - species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/engineer name = "emergency response team engineer suit" @@ -128,7 +123,6 @@ name = "elite emergency response team engineer suit" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "ert_gengineer" - species_fit = null //Medical /obj/item/clothing/head/helmet/space/hardsuit/ert/medical @@ -142,7 +136,6 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammamedical" item_color = "gammamedical" - species_fit = null /obj/item/clothing/suit/space/hardsuit/ert/medical name = "emergency response team medical suit" @@ -153,7 +146,6 @@ name = "elite emergency response team medical suit" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "ert_gmedical" - species_fit = null //Janitor /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor @@ -167,8 +159,6 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammajanitor" item_color = "gammajanitor" - species_fit = null - /obj/item/clothing/suit/space/hardsuit/ert/janitor name = "emergency response team janitor suit" desc = "A suit worn by the janitorial of a Nanotrasen Emergency Response Team. Has purple highlights. Armoured, space ready, and fire resistant." @@ -178,7 +168,6 @@ name = "elite emergency response team janitor suit" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT icon_state = "ert_gjanitor" - species_fit = null //Paranormal /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 9a0354b6b0f..ead2c04016d 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -498,7 +498,7 @@ armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 35, bio = 100, rad = 50) heat_protection = HEAD //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - species_fit = list("Grey") + sprite_sheets = list( "Grey" = 'icons/mob/species/grey/helmet.dmi' ) diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 8a79b192d0c..b0fb7f91b7e 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -8,7 +8,7 @@ permeability_coefficient = 0.01 armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50) species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Vox", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Grey" = 'icons/mob/species/grey/helmet.dmi' @@ -32,7 +32,7 @@ allowed = list(/obj/item/tank, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/restraints/handcuffs) armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50) species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -72,7 +72,7 @@ armor = list(melee = 40, bullet = 30, laser = 30, energy = 30, bomb = 50, bio = 90, rad = 20) strip_delay = 120 species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -99,13 +99,14 @@ name = "Santa's hat" desc = "Ho ho ho. Merrry X-mas!" icon_state = "santahat" - species_fit = list("Grey, Drask") + sprite_sheets = list( "Grey" = 'icons/mob/species/Grey/head.dmi', "Drask" = 'icons/mob/species/Drask/helmet.dmi' ) flags = BLOCKHAIR | STOPSPRESSUREDMAGE flags_cover = HEADCOVERSEYES + /obj/item/clothing/head/helmet/space/santahat/attack_self(mob/user as mob) if(src.icon_state == "santahat") src.icon_state = "santahat_beard" @@ -158,7 +159,7 @@ item_state = "paramedic-eva-helmet" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Vox", "Grey" , "Skrell" , "Tajaran" , "Drask" , "Unathi" , "Vulpkanin") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Grey" = 'icons/mob/species/grey/helmet.dmi', @@ -179,7 +180,7 @@ desc = "A brand new paramedic EVA suit. The nitrile seems a bit too thin to be space proof. Used for retrieving bodies in space." armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Vox", "Skrell" , "Tajaran" , "Drask" , "Unathi" , "Vulpkanin") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi', "Skrell" = 'icons/mob/species/skrell/suit.dmi', @@ -199,7 +200,7 @@ desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies." armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Tajaran", "Unathi", "Vox", "Vulpkanin") + sprite_sheets = list( "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', "Unathi" = 'icons/mob/species/unathi/suit.dmi', @@ -222,7 +223,7 @@ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) flash_protect = 0 species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Tajaran", "Unathi", "Vox", "Vulpkanin", "Grey") + sprite_sheets = list( "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', "Unathi" = 'icons/mob/species/unathi/helmet.dmi', @@ -243,7 +244,6 @@ icon_state = "spacemimehelmet" item_state = "spacemimehelmet" species_restricted = list("exclude","Diona","Vox","Wryn") - species_fit = null sprite_sheets = null sprite_sheets_obj = null @@ -254,7 +254,6 @@ icon_state = "spacemime_suit" item_state = "spacemime_items" species_restricted = list("exclude","Diona","Vox","Wryn") - species_fit = null sprite_sheets = null sprite_sheets_obj = null @@ -265,7 +264,6 @@ icon_state = "clownhelmet" item_state = "clownhelmet" species_restricted = list("exclude","Diona","Vox","Wryn") - species_fit = null sprite_sheets = null sprite_sheets_obj = null @@ -276,6 +274,5 @@ icon_state = "spaceclown_suit" item_state = "spaceclown_items" species_restricted = list("exclude","Diona","Vox","Wryn") - species_fit = null sprite_sheets = null sprite_sheets_obj = null diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm index 664e1dea237..1a2fabea889 100644 --- a/code/modules/clothing/suits/alien.dm +++ b/code/modules/clothing/suits/alien.dm @@ -1,6 +1,5 @@ //Unathi clothing. /obj/item/clothing/suit/unathi/ - species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 87d79e5f5ff..088bc937b46 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -8,7 +8,7 @@ strip_delay = 60 put_on_delay = 40 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -91,7 +91,6 @@ desc = "A vest drenched in the blood of Greytide. It has seen better days." icon_state = "bloody_armor" item_state = "bloody_armor" - species_fit = null sprite_sheets = null /obj/item/clothing/suit/armor/secjacket @@ -137,7 +136,6 @@ icon_state = "jensencoat" item_state = "jensencoat" flags_inv = 0 - species_fit = null sprite_sheets = null /obj/item/clothing/suit/armor/vest/warden @@ -383,7 +381,6 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT - species_fit = null sprite_sheets = null armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100) diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 0c85db3d533..86130ba8008 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -9,7 +9,7 @@ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES burn_state = FIRE_PROOF - species_fit = list("Vox", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Grey" = 'icons/mob/species/grey/head.dmi' @@ -33,7 +33,7 @@ strip_delay = 70 put_on_delay = 70 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -97,5 +97,5 @@ item_state = "bio_suit" strip_delay = 40 put_on_delay = 20 - species_fit = null + sprite_sheets = null diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 2d20a1d2937..0160a64bdb3 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -10,7 +10,7 @@ allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \ /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/emergency_oxygen,/obj/item/rad_laser) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -25,7 +25,7 @@ /obj/item/healthanalyzer, /obj/item/flashlight, \ /obj/item/radio, /obj/item/tank/emergency_oxygen,/obj/item/rad_laser) armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -39,7 +39,7 @@ blood_overlay_type = "armor" body_parts_covered = UPPER_TORSO|LOWER_TORSO allowed = list(/obj/item/reagent_containers/spray/plantbgone,/obj/item/plant_analyzer,/obj/item/seeds,/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator,/obj/item/reagent_containers/spray/pestspray,/obj/item/hatchet,/obj/item/storage/bag/plants) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -54,7 +54,7 @@ flags_inv = HIDEJUMPSUIT flags_size = ONESIZEFITSALL allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/emergency_oxygen) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -66,7 +66,7 @@ item_state = "bio_suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEJUMPSUIT - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -87,7 +87,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS hoodtype = /obj/item/clothing/head/chaplain_hood allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -102,7 +102,7 @@ flags_inv = HIDESHOES|HIDEJUMPSUIT hoodtype = /obj/item/clothing/head/nun_hood allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -142,7 +142,7 @@ permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list (/obj/item/kitchen/knife) - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -185,7 +185,7 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_size = ONESIZEFITSALL - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -222,7 +222,7 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_size = ONESIZEFITSALL - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -236,14 +236,13 @@ blood_overlay_type = "armor" allowed = list (/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/emergency_oxygen) burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) //Lawyer /obj/item/clothing/suit/storage/lawyer - species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -315,7 +314,7 @@ suit_adjusted = 1 actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -330,7 +329,7 @@ ignore_suitadjust = 0 actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -348,7 +347,7 @@ suit_adjusted = 1 actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -360,7 +359,7 @@ icon = 'icons/obj/clothing/belts.dmi' icon_state = "suspenders" blood_overlay_type = "armor" //it's the less thing that I can put here - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index c7ab509fb2c..f3759a67786 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -9,7 +9,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/food/pill,/obj/item/storage/pill_bottle,/obj/item/paper,/obj/item/rad_laser) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 0) - species_fit = list("Vox","Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi', "Grey" = 'icons/mob/species/grey/suit.dmi' diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 13ef3e074da..af83aaa9f7c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -18,7 +18,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO allowed = list (/obj/item/gun/energy/laser/tag/blue) burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -32,7 +32,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO allowed = list (/obj/item/gun/energy/laser/tag/red) burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -45,7 +45,7 @@ desc = "Yarr." icon_state = "pirate_old" item_state = "pirate_old" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -55,7 +55,7 @@ desc = "Yarr." icon_state = "pirate" item_state = "pirate" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -117,7 +117,7 @@ item_state = "wcoat" blood_overlay_type = "armor" body_parts_covered = UPPER_TORSO|LOWER_TORSO - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -262,7 +262,7 @@ desc = "Your classic, non-racist poncho." icon_state = "classicponcho" item_state = "classicponcho" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -351,7 +351,7 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0) allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) - species_fit = list("Vox") + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') /obj/item/clothing/head/winterhood @@ -363,7 +363,7 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT flags = NODROP|BLOCKHAIR flags_inv = HIDEEARS - species_fit = list("Vox") + sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') /obj/item/clothing/suit/hooded/wintercoat/captain @@ -465,7 +465,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen) hoodtype = /obj/item/clothing/head/hood - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -478,7 +478,7 @@ cold_protection = HEAD flags = NODROP|BLOCKHAIR flags_inv = HIDEEARS - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi' ) @@ -540,7 +540,7 @@ 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 = "ianshirt" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -590,7 +590,7 @@ desc = "It makes you stand out. Just the opposite of why it's typically worn. Nice try trying to blend in while wearing it." icon_state = "brtrenchcoat" item_state = "brtrenchcoat" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -600,7 +600,7 @@ desc = "That shade of black just makes you look a bit more evil. Good for those mafia types." icon_state = "bltrenchcoat" item_state = "bltrenchcoat" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -617,7 +617,7 @@ suit_adjusted = 1 actions_types = list(/datum/action/item_action/openclose) adjust_flavour = "unzip" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -751,7 +751,7 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS actions_types = list(/datum/action/item_action/zipper) adjust_flavour = "unzip" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -797,7 +797,7 @@ ignore_suitadjust = 0 actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -810,7 +810,7 @@ ignore_suitadjust = 0 actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 267a3c86802..f3b06e30c83 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -33,7 +33,7 @@ /obj/item/clothing/suit/fire/firefighter icon_state = "firesuit" item_state = "firefighter" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -52,7 +52,7 @@ icon_state = "atmos_firesuit" item_state = "firesuit_atmos" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -75,7 +75,7 @@ strip_delay = 70 put_on_delay = 70 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', "Grey" = 'icons/mob/species/grey/head.dmi' @@ -101,7 +101,7 @@ strip_delay = 70 put_on_delay = 70 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -129,7 +129,7 @@ strip_delay = 60 put_on_delay = 60 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi', "Grey" = 'icons/mob/species/grey/head.dmi' @@ -152,7 +152,7 @@ strip_delay = 60 put_on_delay = 60 burn_state = FIRE_PROOF - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index b1da17677de..bda05fe8d47 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -117,7 +117,7 @@ icon_state = "waistcoat" item_state = "waistcoat" item_color = "waistcoat" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -436,7 +436,7 @@ icon_state = "cowboyshirt" item_state = "cowboyshirt" item_color = "cowboyshirt" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -447,7 +447,7 @@ icon_state = "cowboyshirt_s" item_state = "cowboyshirt_s" item_color = "cowboyshirt_s" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -458,7 +458,7 @@ icon_state = "cowboyshirt_white" item_state = "cowboyshirt_white" item_color = "cowboyshirt_white" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -469,7 +469,7 @@ icon_state = "cowboyshirt_whites" item_state = "cowboyshirt_whites" item_color = "cowboyshirt_whites" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -480,7 +480,7 @@ icon_state = "cowboyshirt_pink" item_state = "cowboyshirt_pink" item_color = "cowboyshirt_pink" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -491,7 +491,7 @@ icon_state = "cowboyshirt_pinks" item_state = "cowboyshirt_pinks" item_color = "cowboyshirt_pinks" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -502,7 +502,7 @@ icon_state = "cowboyshirt_navy" item_state = "cowboyshirt_navy" item_color = "cowboyshirt_navy" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -513,7 +513,7 @@ icon_state = "cowboyshirt_navys" item_state = "cowboyshirt_navys" item_color = "cowboyshirt_navys" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -524,7 +524,7 @@ icon_state = "cowboyshirt_red" item_state = "cowboyshirt_red" item_color = "cowboyshirt_red" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) @@ -535,7 +535,7 @@ icon_state = "cowboyshirt_reds" item_state = "cowboyshirt_reds" item_color = "cowboyshirt_reds" - species_fit = list("Vox", "Drask", "Grey") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi', "Drask" = 'icons/mob/species/drask/suit.dmi', diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 3b2e9c75a20..09d8c669ccf 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -78,7 +78,7 @@ desc = "Sturdy mess of synthcotton belts and buckles, ready to share your burden." icon_state = "webbing" item_color = "webbing" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 08c7c403ff5..e7f29305929 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -120,7 +120,7 @@ desc = "Groovy!" icon_state = "psyche" item_color = "psyche" - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/uniform.dmi' ) diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index da905dd1e75..cfd828aeab1 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -85,7 +85,7 @@ armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) flags_size = ONESIZEFITSALL strip_delay = 50 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/uniform.dmi' ) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index d2b32f720cf..c7ad35e5f47 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -323,7 +323,6 @@ if(!has_action) new /datum/action/item_action/openclose(jacket)//this actually works jacket.adjust_flavour = "unbutton" - jacket.species_fit = null jacket.sprite_sheets = null user.update_inv_wear_suit() qdel(src) @@ -345,7 +344,6 @@ M.desc = "It looks heavily modified, but otherwise functions as a gas mask. The words “Property of Yon-Dale” can be seen on the inner band." M.icon = 'icons/obj/custom_items.dmi' M.icon_state = "gas_tariq" - M.species_fit = list("Vulpkanin") M.sprite_sheets = list( "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' ) @@ -844,7 +842,6 @@ actions_types = list() ignore_suitadjust = 1 adjust_flavour = null - species_fit = null sprite_sheets = null /obj/item/clothing/suit/storage/labcoat/fluff/pulsecoat //ozewse : Daniel Harper : Donated to them by Runemeds, who is the original donor. @@ -934,7 +931,6 @@ desc = "A labcoat with a few markings denoting it as the labcoat of roboticist." icon = 'icons/obj/custom_items.dmi' icon_state = "aeneasrinil_open" - species_fit = null sprite_sheets = null /obj/item/clothing/suit/jacket/fluff/kidosvest // Anxipal: Kido Qasteth @@ -946,7 +942,6 @@ ignore_suitadjust = 1 actions_types = list() adjust_flavour = null - species_fit = null sprite_sheets = null /obj/item/clothing/suit/jacket/fluff/jacksvest // Anxipal: Jack Harper @@ -957,7 +952,6 @@ ignore_suitadjust = TRUE actions_types = list() adjust_flavour = null - species_fit = null sprite_sheets = null /obj/item/clothing/suit/fluff/kluys // Kluys: Cripty Pandaen @@ -997,7 +991,6 @@ desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves." icon = 'icons/obj/custom_items.dmi' icon_state = "labcoat_red_open" - species_fit = null sprite_sheets = null /obj/item/clothing/suit/storage/labcoat/fluff/ionward_labcoat // Ionward: Gemini @@ -1005,7 +998,6 @@ desc = "A thin, faded, carbon fiber labcoat. On the back, a Technocracy vessel's logo. Inside, the name 'Gemini' is printed on the collar." icon = 'icons/obj/custom_items.dmi' icon_state = "ionward_labcoat_open" - species_fit = null sprite_sheets = null /obj/item/clothing/suit/fluff/stobarico_greatcoat // Stobarico: F.U.R.R.Y @@ -1059,7 +1051,7 @@ desc = "A somewhat worn but well kept set of vox tactical webbing. It has a couple of pouches attached." icon = 'icons/obj/custom_items.dmi' icon_state = "k3_webbing" - species_fit = list("Vox") + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') ignore_suitadjust = 0 actions_types = list(/datum/action/item_action/toggle) @@ -1338,7 +1330,6 @@ ignore_suitadjust = TRUE actions_types = list() adjust_flavour = null - species_fit = null sprite_sheets = null /obj/item/clothing/under/fluff/fox @@ -1481,7 +1472,6 @@ icon = 'icons/obj/clothing/ties.dmi' icon_state = "vest_black" item_state = "vest_black" - species_fit = null sprite_sheets = null /obj/item/clothing/under/pants/fluff/combat @@ -1498,7 +1488,6 @@ item_state = "elliot_windbreaker_open" adjust_flavour = "unzip" suit_adjusted = 1 - species_fit = null sprite_sheets = null /obj/item/storage/backpack/fluff/syndiesatchel //SkeletalElite: Rawkkihiki @@ -1723,7 +1712,6 @@ icon = 'icons/obj/custom_items.dmi' lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - species_fit = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi') icon_state = "kiaoutfit" item_state = "kiaoutfit" @@ -1747,7 +1735,6 @@ icon = 'icons/obj/custom_items.dmi' lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - species_fit = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/species/vox/mask.dmi') icon_state = "kiamask" item_state = "kiamask" @@ -1785,4 +1772,3 @@ item_state = "voxbodysuit" item_color = "voxbodysuit" body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - species_fit = list("Vox") \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index e55eee62dbc..6e1bbfb3fc3 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1217,7 +1217,7 @@ var/global/list/damage_icon_parts = list() //Adds a collar overlay above the helmet layer if the suit has one // Suit needs an identically named sprite in icons/mob/collar.dmi -// For suits with species_fit and sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/species/[species_name_here]/collar.dmi. +// For suits with sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/species/[species_name_here]/collar.dmi. /mob/living/carbon/human/proc/update_collar(var/update_icons=1) remove_overlay(COLLAR_LAYER) var/icon/C = new('icons/mob/collar.dmi') diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm index bfc87e0104c..0ebec2e724f 100644 --- a/code/modules/ninja/suit/mask.dm +++ b/code/modules/ninja/suit/mask.dm @@ -12,7 +12,7 @@ Contents: icon_state = "s-ninja(norm)" item_state = "s-ninja_mask" unacidable = 1 - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', diff --git a/code/modules/vr/vr_goggles.dm b/code/modules/vr/vr_goggles.dm index c2a185b0ffa..f2df5d2189e 100644 --- a/code/modules/vr/vr_goggles.dm +++ b/code/modules/vr/vr_goggles.dm @@ -7,7 +7,7 @@ icon_state = "3d" item_state = "3d" prescription_upgradable = 0 - species_fit = list("Vox") + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/eyes.dmi' ) diff --git a/paradise.dme b/paradise.dme index f96d9d6da59..00f7f8df8d6 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1301,6 +1301,7 @@ #include "code\modules\client\preference\loadout\loadout_shoes.dm" #include "code\modules\client\preference\loadout\loadout_suit.dm" #include "code\modules\client\preference\loadout\loadout_uniform.dm" +#include "code\modules\clothing\chameleon.dm" #include "code\modules\clothing\clothing.dm" #include "code\modules\clothing\ears\ears.dm" #include "code\modules\clothing\glasses\glasses.dm" @@ -1362,7 +1363,6 @@ #include "code\modules\clothing\suits\storage.dm" #include "code\modules\clothing\suits\utility.dm" #include "code\modules\clothing\suits\wiz_robe.dm" -#include "code\modules\clothing\under\chameleon.dm" #include "code\modules\clothing\under\color.dm" #include "code\modules\clothing\under\miscellaneous.dm" #include "code\modules\clothing\under\oldstation_uni.dm"