Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kills default clothing icon folder which was old and bad #22

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/flashlight.dm
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
color = LIGHT_COLOR_GREEN
base_icon_state = "glowstick"
icon_state = "glowstick"
item_state = "glowstick"
item_state = null
grind_results = list(/datum/reagent/phenol = 15, /datum/reagent/hydrogen = 10, /datum/reagent/oxygen = 5) //Meth-in-a-stick
var/fuel = 0
toggle_on_sound = 'sound/effects/glowstick.ogg'
Expand Down
9 changes: 0 additions & 9 deletions code/game/objects/items/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,6 @@
name = "space carp plushie"
desc = "An adorable stuffed toy that resembles a space carp."
icon_state = "carpplush"
item_state = "carp_plushie"
attack_verb = list("bitten", "eaten", "fin slapped")
squeak_override = list('sound/weapons/bite.ogg'=1)

Expand Down Expand Up @@ -501,31 +500,27 @@
name = "lizard plushie"
desc = "An adorable stuffed toy that resembles a lizard."
icon_state = "plushie_lizard"
item_state = "plushie_lizard"
attack_verb = list("clawed", "hissed", "tail slapped")
squeak_override = list('sound/weapons/slash.ogg' = 1)

/obj/item/toy/plush/snakeplushie
name = "snake plushie"
desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing."
icon_state = "plushie_snake"
item_state = "plushie_snake"
attack_verb = list("bitten", "hissed", "tail slapped")
squeak_override = list('sound/weapons/bite.ogg' = 1)

/obj/item/toy/plush/nukeplushie
name = "operative plushie"
desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious."
icon_state = "plushie_nuke"
item_state = "plushie_nuke"
attack_verb = list("shot", "nuked", "detonated")
squeak_override = list('sound/effects/hit_punch.ogg' = 1)

/obj/item/toy/plush/slimeplushie
name = "slime plushie"
desc = "An adorable stuffed toy that resembles a slime. It is practically just a hacky sack."
icon_state = "plushie_slime"
item_state = "plushie_slime"
attack_verb = list("blorbled", "slimed", "absorbed")
squeak_override = list('sound/effects/blobattack.ogg' = 1)
gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy
Expand All @@ -534,7 +529,6 @@
name = "awakened plushie"
desc = "An ancient plushie that has grown enlightened to the true nature of reality."
icon_state = "plushie_awake"
item_state = "plushie_awake"

/obj/item/toy/plush/awakenedplushie/ComponentInitialize()
. = ..()
Expand All @@ -544,7 +538,6 @@
name = "bee plushie"
desc = "A cute toy that resembles an even cuter bee."
icon_state = "plushie_h"
item_state = "plushie_h"
attack_verb = list("stung")
gender = FEMALE
squeak_override = list('sound/voice/moth/scream_moth.ogg'=1)
Expand Down Expand Up @@ -606,7 +599,6 @@
name = "moth plushie"
desc = "A plushie depicting an adorable mothperson, featuring realistic mothperson agony sounds every time you hug it."
icon_state = "moffplush"
item_state = "moffplush"
attack_verb = list("fluttered", "flapped")
squeak_override = list('sound/voice/moth/scream_moth.ogg'=1)

Expand Down Expand Up @@ -705,7 +697,6 @@
name = "spider plushie"
desc = "A plushie depicting an adorable rendition of a large spider. Additional legs give it four times the hugging power!"
icon_state = "spiderplush"
item_state = "spiderplush"
attack_verb = list("bites", "skitters")
squeak_override = list('sound/weapons/bite.ogg' = 10, 'sound/voice/hiss1.ogg' = 1, 'sound/voice/hiss2.ogg' = 1, 'sound/voice/hiss3.ogg' = 1, 'sound/voice/hiss4.ogg' = 1)
var/spraycharges = 10
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/pneumaticCannon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
attack_verb = list("bludgeoned", "smashed", "beaten")
icon = 'icons/obj/pneumaticCannon.dmi'
icon_state = "pneumaticCannon"
item_state = "bulldog"
item_state = "spur"
lefthand_file = GUN_LEFTHAND_ICON
righthand_file = GUN_RIGHTHAND_ICON
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50)
Expand Down
11 changes: 0 additions & 11 deletions code/game/objects/items/stacks/sheets/leather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name = "hide"
desc = "Something went wrong."
icon_state = "sheet-hide"
item_state = "sheet-hide"
novariants = TRUE

/obj/item/stack/sheet/animalhide/human
Expand Down Expand Up @@ -30,7 +29,6 @@ GLOBAL_LIST_INIT(human_recipes, list( \
desc = "The by-product of corgi farming."
singular_name = "corgi hide piece"
icon_state = "sheet-corgi"
item_state = "sheet-corgi"


GLOBAL_LIST_INIT(gondola_recipes, list ( \
Expand All @@ -43,15 +41,13 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \
desc = "A thin layer of mothroach hide."
singular_name = "mothroach hide piece"
icon_state = "sheet-mothroach"
item_state = "sheet-mothroach"
merge_type = /obj/item/stack/sheet/animalhide/mothroach

/obj/item/stack/sheet/animalhide/gondola
name = "gondola hide"
desc = "The extremely valuable product of gondola hunting."
singular_name = "gondola hide piece"
icon_state = "sheet-gondola"
item_state = "sheet-gondola"

/obj/item/stack/sheet/animalhide/gondola/get_main_recipes()
. = ..()
Expand All @@ -62,14 +58,12 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \
desc = "The by-product of cat farming."
singular_name = "cat hide piece"
icon_state = "sheet-cat"
item_state = "sheet-cat"

/obj/item/stack/sheet/animalhide/monkey
name = "monkey hide"
desc = "The by-product of monkey farming."
singular_name = "monkey hide piece"
icon_state = "sheet-monkey"
item_state = "sheet-monkey"

GLOBAL_LIST_INIT(monkey_recipes, list ( \
new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1), \
Expand All @@ -84,14 +78,12 @@ GLOBAL_LIST_INIT(monkey_recipes, list ( \
desc = "Sssssss..."
singular_name = "lizard skin piece"
icon_state = "sheet-lizard"
item_state = "sheet-lizard"

/obj/item/stack/sheet/animalhide/xeno
name = "alien hide"
desc = "The skin of a terrible creature."
singular_name = "alien hide piece"
icon_state = "sheet-xeno"
item_state = "sheet-xeno"

//don't see anywhere else to put these, maybe together they could be used to make the xenos suit?
/obj/item/stack/sheet/xenochitin
Expand Down Expand Up @@ -119,14 +111,12 @@ GLOBAL_LIST_INIT(monkey_recipes, list ( \
desc = "This hide was stripped of its hair, but still needs washing and tanning."
singular_name = "hairless hide piece"
icon_state = "sheet-hairlesshide"
item_state = "sheet-hairlesshide"

/obj/item/stack/sheet/wethide
name = "wet hide"
desc = "This hide has been cleaned but still needs to be dried."
singular_name = "wet hide piece"
icon_state = "sheet-wetleather"
item_state = "sheet-wetleather"
var/wetness = 30 //Reduced when exposed to high temperautres
var/drying_threshold_temperature = 500 //Kelvin to start drying

Expand All @@ -138,7 +128,6 @@ GLOBAL_LIST_INIT(monkey_recipes, list ( \
desc = "The by-product of mob grinding."
singular_name = "leather piece"
icon_state = "sheet-leather"
item_state = "sheet-leather"

GLOBAL_LIST_INIT(leather_recipes, list ( \
new/datum/stack_recipe("wallet", /obj/item/storage/wallet, 1), \
Expand Down
11 changes: 0 additions & 11 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -312,69 +312,58 @@
name = "messenger bag"
desc = "A sturdy backpack worn over one shoulder."
icon_state = "courierbag"
item_state = "courierbag"
greyscale_icon_state = "satchel"
greyscale_colors = list(list(15, 16), list(19, 13), list(13, 18))

/obj/item/storage/backpack/messenger/chem
name = "chemistry messenger bag"
desc = "A sterile backpack worn over one shoulder. This one is in Chemistry colors."
icon_state = "courierbagchem"
item_state = "courierbagchem"

/obj/item/storage/backpack/messenger/med
name = "medical messenger bag"
desc = "A sterile backpack worn over one shoulder used in medical departments."
icon_state = "courierbagmed"
item_state = "courierbagmed"

/obj/item/storage/backpack/messenger/para
name = "paramedic messenger bag"
desc = "A fancy backpack worn over one shoulder. This one is in Paramedic colors."
icon_state = "courierbagpara"
item_state = "courierbagpara"

/obj/item/storage/backpack/messenger/viro
name = "virology messenger bag"
desc = "A sterile backpack worn over one shoulder. This one is in Virology colors."
icon_state = "courierbagviro"
item_state = "courierbagviro"

/obj/item/storage/backpack/messenger/tox
name = "science messenger bag"
desc = "A backpack worn over one shoulder. Useful for holding science materials."
icon_state = "courierbagtox"
item_state = "courierbagtox"

/obj/item/storage/backpack/messenger/com
name = "captain's messenger bag"
desc = "A special backpack worn over one shoulder. This one is made specifically for officers."
icon_state = "courierbagcom"
item_state = "courierbagcom"

/obj/item/storage/backpack/messenger/engi
name = "engineering messenger bag"
desc = "A strong backpack worn over one shoulder. This one is designed for Industrial work."
icon_state = "courierbagengi"
item_state = "courierbagengi"

/obj/item/storage/backpack/messenger/hyd
name = "hydroponics messenger bag"
desc = "A backpack worn over one shoulder. This one is designed for plant-related work."
icon_state = "courierbaghyd"
item_state = "courierbaghyd"

/obj/item/storage/backpack/messenger/sec
name = "security messenger bag"
desc = "A tactical backpack worn over one shoulder. This one is in Security colors."
icon_state = "courierbagsec"
item_state = "courierbagsec"

/obj/item/storage/backpack/messenger/inteq
name = "inteq messenger bag"
desc = "A comfortable leather strapped messenger bag worn over one shoulder. This one denotes the wearer as an IRMG operator"
icon_state = "courierbaginteq"
item_state = "courierbaginteq"

/*
* Duffelbag Types
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/items/storage/guncases.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
name = "gun case"
desc = "A large box designed for holding firearms and magazines safely."
icon = 'icons/obj/guncase.dmi'
lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
icon_state = "guncase"
item_state = "infiltrator_case"
force = 12
Expand Down Expand Up @@ -99,6 +101,8 @@
name = "pistol case"
desc = "A large box designed for holding pistols and magazines safely."
icon = 'icons/obj/guncase.dmi'
lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
icon_state = "guncase"
item_state = "infiltrator_case"
force = 12
Expand Down
6 changes: 3 additions & 3 deletions code/modules/client/loadout/_loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ GLOBAL_LIST_EMPTY(gear_datums)
if(G == initial(G.subtype_path))
continue

if(!use_name)
WARNING("Loadout - Missing display name: [G]")
if(!use_name && initial(G.path))
WARNING("Loadout gear [G] is missing display name")
continue
if(!initial(G.path) && use_category != "OOC") //OOC category does not contain actual items
WARNING("Loadout - Missing path definition: [G]")
WARNING("Loadout gear [G] is missing path definition")
continue

if(!GLOB.loadout_categories[use_category])
Expand Down
2 changes: 0 additions & 2 deletions code/modules/clothing/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
var/visor_flags_cover = 0 //same as above, but for flags_cover
//what to toggle when toggled with weldingvisortoggle()
var/visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | VISOR_VISIONFLAGS | VISOR_DARKNESSVIEW | VISOR_INVISVIEW
lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
var/alt_desc = null
var/toggle_message = null
var/alt_toggle_message = null
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/factions/ngr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
name = "\improper NGR phorid envirosuit"
desc = "A button-up envirosuit with use intended for phorids of the New Gorlex Republic. Ensures they don't die of combustion."
icon_state = "ngr_envirosuit"
item_state = "ngr_envirosuit"
item_state = "envirosuit"
icon = 'icons/obj/clothing/faction/ngr/uniforms.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/uniforms.dmi'

Expand Down
Loading
Loading