Skip to content

Commit

Permalink
kills default clothing icon folder which was old and bad
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Oct 11, 2024
1 parent aeccb49 commit f9bb626
Show file tree
Hide file tree
Showing 22 changed files with 6 additions and 13 deletions.
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
4 changes: 2 additions & 2 deletions code/modules/instruments/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
name = "headphones"
desc = "Unce unce unce unce. Boop!"
icon = 'icons/obj/clothing/accessories.dmi'
lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
lefthand_file = 'icons/mob/inhands/clothing/ears_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing/ears_righthand.dmi'
icon_state = "headphones"
item_state = "earmuffs"
slot_flags = ITEM_SLOT_EARS | ITEM_SLOT_HEAD
Expand Down
4 changes: 0 additions & 4 deletions code/modules/mining/equipment/explorer_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@
/obj/item/clothing/suit/hooded/survivor
name = "survivor suit"
desc = "A ragged makeshift suit resembling the explorer suit, covered with the emblems of a failed revolution. It's been repaired so many times it's hard to tell if it's more suit or patch. The joints have been redesigned for quicker movement."
lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
icon_state = "survivor"
item_state = "survivor_suit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
Expand Down Expand Up @@ -194,8 +192,6 @@
/obj/item/clothing/suit/hooded/scrap
name = "scrap suit"
desc = "A ragged makeshift suit."
lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
icon_state = "survivor"
item_state = "survivor_suit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
Expand Down
2 changes: 1 addition & 1 deletion code/modules/unit_tests/_unit_tests.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

#ifdef BASIC_TESTS

//#include "icons/inhands.dm"
#include "icons/inhands.dm"
#include "icons/missing_icons.dm"
#include "icons/spritesheets.dm"
#include "icons/worn_icons.dm"
Expand Down
7 changes: 3 additions & 4 deletions code/modules/unit_tests/icons/inhands.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")

if(!(skip_left || skip_right) && !lefthand_file && !righthand_file)
TEST_FAIL("Missing both icon files for [item_path].\n\titem_state = \"[item_state]\"[match_message]")
TEST_NOTICE(src, "Missing both icon files for [item_path].\n\titem_state = \"[item_state]\"[match_message]")
continue

var/missing_left
Expand All @@ -80,7 +80,7 @@
if(!match_message && right_fallback && left_fallback)
fallback_log_message += "\n\t[item_path] has invalid value, using fallback icon.\n\titem_state = \"[item_state]\""
continue
TEST_FAIL("Missing inhand sprites for [item_path] in both '[lefthand_file]' & '[righthand_file]'.\n\titem_state = \"[item_state]\"[match_message]")
TEST_NOTICE(src, "Missing inhand sprites for [item_path] in both '[lefthand_file]' & '[righthand_file]'.\n\titem_state = \"[item_state]\"[match_message]")

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

View workflow job for this annotation

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/e_gun/turret in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "turretlaser"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

View workflow job for this annotation

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/e_gun/hos/brazil in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "hoslaser"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

View workflow job for this annotation

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/e_gun/hos/brazil/true in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "hoslaser"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

View workflow job for this annotation

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/e_gun/nuclear in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "nucgun"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

View workflow job for this annotation

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/e_gun/advtaser/mounted in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "armcannonstun4"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

View workflow job for this annotation

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/shrink_ray in both 'icons/mob/inhands/weapons/guns_lefthand.dmi' & 'icons/mob/inhands/weapons/guns_righthand.dmi'. item_state = "shrink_ray"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

View workflow job for this annotation

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/laser in both 'icons/mob/inhands/weapons/guns_lefthand.dmi' & 'icons/mob/inhands/weapons/guns_righthand.dmi'. item_state = "laser"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

View workflow job for this annotation

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/laser/e40_laser_secondary in both 'icons/mob/inhands/weapons/guns_lefthand.dmi' & 'icons/mob/inhands/weapons/guns_righthand.dmi'. item_state = "laser"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

View workflow job for this annotation

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/laser/empty_cell in both 'icons/mob/inhands/weapons/guns_lefthand.dmi' & 'icons/mob/inhands/weapons/guns_righthand.dmi'. item_state = "laser"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

View workflow job for this annotation

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/laser/practice in both 'icons/mob/inhands/weapons/guns_lefthand.dmi' & 'icons/mob/inhands/weapons/guns_righthand.dmi'. item_state = "laser"
else if(missing_left)
TEST_FAIL("Missing left inhand sprite for [item_path] in '[lefthand_file]'[left_fallback ? ", using fallback icon" : null].\n\titem_state = \"[item_state]\"[match_message]")

Check failure on line 85 in code/modules/unit_tests/icons/inhands.dm

View workflow job for this annotation

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

/datum/unit_test/defined_item_states: /datum/unit_test/defined_item_states

Missing left inhand sprite for /obj/item/clothing/mask/gas/space_ninja in 'icons/mob/inhands/clothing/masks_lefthand.dmi'. item_state = "s-ninja_mask"
else if(missing_right)
Expand All @@ -90,5 +90,4 @@
TEST_FAIL("Invalid item_state values should be set to null if there isn't a valid icon.[fallback_log_message]")

if(unset_inhand_var_message)
log_test("\tNotice - Possible inhand icon matches found. It is best to be explicit with inhand sprite values.[unset_inhand_var_message]")

TEST_NOTICE(src, "Possible inhand icon matches found. It is best to be explicit with inhand sprite values.[unset_inhand_var_message]")
Binary file modified icons/mob/inhands/clothing/ears_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/ears_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/glasses_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/glasses_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/gloves_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/gloves_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/hats_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/hats_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/masks_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/masks_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/shoes_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/shoes_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/suits_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing/suits_righthand.dmi
Binary file not shown.
Binary file removed icons/mob/inhands/clothing_lefthand.dmi
Binary file not shown.
Binary file removed icons/mob/inhands/clothing_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/items_lefthand.dmi
Binary file not shown.

0 comments on commit f9bb626

Please sign in to comment.