review

shiptest-ss13 · FalloutFalcon · Feb 14, 2025 · Jan 11, 2025 · Jan 11, 2025 · Jan 11, 2025
commit d1a39f876c59da2cc87498421317ec3484b3fb37
@@ -270,8 +270,6 @@
 */
 	///The types of attachments allowed, a list of types. SUBTYPES OF AN ALLOWED TYPE ARE ALSO ALLOWED.
 	var/list/valid_attachments = list()
-	///The types of attachments allowed for this type of gun. Eg. Pistols/Rifles/Shotguns/etc.
-	var/list/weapon_class_attachments = list()
 	///The types of attachments that are unique to this gun. Adds it to the base valid_attachments list. So if this gun takes a special stock, add it here.
 	var/list/unique_attachments = list()
 	///The types of attachments that aren't allowed. Removes it from the base valid_attachments list.
@@ -352,7 +350,6 @@
 	. = ..()
 	var/list/attachment_list = valid_attachments
 	attachment_list += unique_attachments
-	attachment_list += weapon_class_attachments
 	if(refused_attachments)
 		for(var/to_remove in attachment_list)
 			if(refused_attachments.Find(to_remove))

@@ -54,7 +54,7 @@
 	)
 
 	//truly a doohickey for every occasion
-	weapon_class_attachments = list (
+	unique_attachments = list (
 		/obj/item/attachment/scope,
 		/obj/item/attachment/long_scope,
 		/obj/item/attachment/energy_bayonet,

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/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/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/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)