should be all of em

shiptest-ss13 · Sep 29, 2024 · 931ec8e · 931ec8e
1 parent 3f3ffdf
commit 931ec8e
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 91 deletions.
diff --git a/code/game/objects/items/melee/charged.dm b/code/game/objects/items/melee/charged.dm
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
@@ -63,7 +63,7 @@
 #endif
 
 #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"

diff --git a/code/modules/unit_tests/icons/inhands.dm b/code/modules/unit_tests/icons/inhands.dm
@@ -26,8 +26,8 @@
 	//Add EVEN MORE paths if needed here!
 	//generate_possible_icon_states_list("your/folder/path/inhands/")
 
-	for(var/obj/item/item_path as anything in (subtypesof(/obj/item/melee) + subtypesof(/obj/item/gun)))
-		if(initial(item_path.item_flags) & ABSTRACT || isbadpath(item_path))
+	for(var/obj/item/item_path as anything in (subtypesof(/obj/item)))
+		if(initial(item_path.item_flags) & ABSTRACT)
 			continue
 
 		var/skip_left

diff --git a/code/modules/unit_tests/icons/worn_icons.dm b/code/modules/unit_tests/icons/worn_icons.dm
@@ -25,7 +25,7 @@
 
 	for(var/obj/item/item_path as anything in (subtypesof(/obj/item/clothing)))
 		var/cached_slot_flags = initial(item_path.slot_flags)
-		if(!cached_slot_flags || (cached_slot_flags & ITEM_SLOT_LPOCKET) || (cached_slot_flags & ITEM_SLOT_RPOCKET) || initial(item_path.item_flags) & ABSTRACT || isbadpath(item_path))
+		if(!cached_slot_flags || (cached_slot_flags & ITEM_SLOT_LPOCKET) || (cached_slot_flags & ITEM_SLOT_RPOCKET) || initial(item_path.item_flags) & ABSTRACT)
 			continue
 
 		var/mob_overlay_icon = initial(item_path.mob_overlay_icon) //override icon file. where our sprite is contained if set. (ie modularity stuff)

diff --git a/sound/weapons/effects/ric1.ogg b/sound/weapons/effects/ric1.ogg
diff --git a/sound/weapons/effects/ric2.ogg b/sound/weapons/effects/ric2.ogg
diff --git a/sound/weapons/effects/ric3.ogg b/sound/weapons/effects/ric3.ogg
diff --git a/sound/weapons/effects/ric4.ogg b/sound/weapons/effects/ric4.ogg
diff --git a/sound/weapons/effects/ric5.ogg b/sound/weapons/effects/ric5.ogg