last touches

shiptest-ss13 · meemofcourse · Jan 22, 2025 · Jan 4, 2025 · Jan 5, 2025 · Jan 5, 2025
commit 1847fbe5207a2ef5a4d69ee2046265e9e0e4538b
@@ -1653,15 +1653,19 @@
 	pixel_x = 10;
 	pixel_y = 16
 	},
-/obj/item/reagent_containers/food/drinks/modglass{
-	icon_state = "mglass-6-";
-	pixel_x = 6;
-	pixel_y = -1
+/obj/item/folder{
+	pixel_x = -6;
+	pixel_y = 6
 	},
 /obj/item/pen{
 	pixel_x = -8;
 	pixel_y = 4
 	},
+/obj/item/reagent_containers/food/drinks/modglass{
+	icon_state = "mglass-6-";
+	pixel_x = 6;
+	pixel_y = -1
+	},
 /turf/open/floor/carpet,
 /area/ship/crew/dorm/captain)
 "HN" = (
@@ -2310,6 +2314,7 @@
 	},
 /obj/machinery/light/small/directional/west,
 /obj/item/blackmarket_uplink,
+/obj/item/computer_hardware/card_slot,
 /turf/open/floor/carpet,
 /area/ship/crew/dorm/captain)
 "So" = (

diff --git a/code/modules/unit_tests/icons/inhands.dm b/code/modules/unit_tests/icons/inhands.dm
 			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_NOTICE(src, "Missing inhand sprites for [item_path] in both '[lefthand_file]' & '[righthand_file]'.\n\titem_state = \"[item_state]\"[match_message]")
 		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]")
 		else if(missing_right)
	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_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 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 GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests : /datum/unit_test/defined_item_states `Missing inhand sprites for /obj/item/gun/energy/laser/captain in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "caplaser"` Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests : /datum/unit_test/defined_item_states `Missing inhand sprites for /obj/item/gun/energy/laser/captain/brazil in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "caplaser"` Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests : /datum/unit_test/defined_item_states `Missing inhand sprites for /obj/item/gun/energy/laser/captain/scattershot in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "caplaser"` Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests : /datum/unit_test/defined_item_states `Missing inhand sprites for /obj/item/gun/energy/laser/scatter/shotty in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "shotgun"` Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests : /datum/unit_test/defined_item_states `Missing inhand sprites for /obj/item/gun/energy/laser/mounted in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "armcannonlase"` Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests : /datum/unit_test/defined_item_states `Missing inhand sprites for /obj/item/gun/energy/laser/instakill in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "instagib"` Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests : /datum/unit_test/defined_item_states `Missing inhand sprites for /obj/item/gun/energy/laser/instakill/red in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "instagibred"` Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests : /datum/unit_test/defined_item_states `Missing inhand sprites for /obj/item/gun/energy/laser/instakill/blue in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "instagibblue"` Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests : /datum/unit_test/defined_item_states `Missing inhand sprites for /obj/item/gun/energy/lasercannon in both 'icons/mob/inhands/weapons/guns_lefthand.dmi' & 'icons/mob/inhands/weapons/guns_righthand.dmi'. item_state = "lasercannon"`
	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]")
	else if(missing_right)