Missing icons unit test expansion

code/__DEFINES/equipment.dm

@@ -27,8 +27,8 @@
 #define ITEM_UNCATCHABLE (1<<9)
 /// Used for nonstandard marine clothing to ignore 'specialty' var.
 #define NO_NAME_OVERRIDE (1<<10)
-/// Used for armors or uniforms that don't have a snow/desert/etc icon state set via select_gamemode_skin (not all item types currently perform this test though).
-#define NO_SNOW_TYPE (1<<11)
+/// Used for armors or uniforms that don't have a snow/desert/etc icon state set via select_gamemode_skin.
+#define NO_GAMEMODE_SKIN (1<<11)
 
 #define INVULNERABLE (1<<12)
 

code/_globalvars/bitfields.dm

@@ -145,7 +145,7 @@ DEFINE_BITFIELD(flags_atom, list(
 	"RELAY_CLICK" = RELAY_CLICK,
 	"ITEM_UNCATCHABLE" = ITEM_UNCATCHABLE,
 	"NO_NAME_OVERRIDE" = NO_NAME_OVERRIDE,
-	"NO_SNOW_TYPE" = NO_SNOW_TYPE,
+	"NO_GAMEMODE_SKIN" = NO_GAMEMODE_SKIN,
 	"INVULNERABLE" = INVULNERABLE,
 	"CAN_BE_SYRINGED" = CAN_BE_SYRINGED,
 	"CAN_BE_DISPENSED_INTO" = CAN_BE_DISPENSED_INTO,

code/datums/effects/xeno_strains/prae_acid_stacks.dm

@@ -45,8 +45,9 @@
 	if (!ishuman(affected_atom))
 		return ..()
 
-	var/mob/living/carbon/human/H = affected_atom
-	addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, update_xeno_hostile_hud)), 3)
+	var/mob/living/carbon/human/human = affected_atom
+	if(!QDELETED(human))
+		addtimer(CALLBACK(human, TYPE_PROC_REF(/mob/living/carbon/human, update_xeno_hostile_hud)), 3)
 
 	return ..()
 

code/game/machinery/camera/presets.dm

@@ -67,6 +67,13 @@
 		status = FALSE
 	kick_viewers()
 
+/obj/structure/machinery/camera/vehicle/update_icon()
+	. = ..()
+	if(stat & EMPED)
+		icon_state = "vehicle_cameraemp"
+	else
+		icon_state = "vehicle_camera"
+
 // AUTONAME
 
 /obj/structure/machinery/camera/autoname

code/game/machinery/doors/door.dm

@@ -219,7 +219,6 @@
 
 	operating = TRUE
 	do_animate("opening")
-	icon_state = "door0"
 	set_opacity(FALSE)
 	if(length(filler_turfs))
 		change_filler_opacity(opacity)

code/game/machinery/doors/multi_tile.dm

@@ -116,16 +116,6 @@
 	req_access = null
 	req_one_access = list(ACCESS_CIVILIAN_PUBLIC)
 
-/obj/structure/machinery/door/airlock/multi_tile/shuttle
-	name = "Shuttle Podlock"
-	icon = 'icons/obj/structures/doors/1x2blast_vert.dmi'
-	icon_state = "pdoor1"
-	opacity = TRUE
-	openspeed = 12
-	req_access = null
-	not_weldable = 1
-
-
 // ALMAYER
 
 /obj/structure/machinery/door/airlock/multi_tile/almayer

code/game/machinery/kitchen/juicer.dm

@@ -29,6 +29,10 @@
 	. = ..()
 	beaker = new /obj/item/reagent_container/glass/beaker/large(src)
 
+/obj/structure/machinery/juicer/Destroy()
+	QDEL_NULL(beaker)
+	return ..()
+
 /obj/structure/machinery/juicer/update_icon()
 	icon_state = "juicer"+num2text(!QDELETED(beaker))
 	return

code/game/objects/effects/aliens.dm

@@ -107,7 +107,7 @@
 		if(isliving(atm)) //For extinguishing mobs on fire
 			var/mob/living/M = atm
 
-			if(M != cause_data.resolve_mob())
+			if(M != cause_data?.resolve_mob())
 				M.ExtinguishMob()
 
 			if(M.stat == DEAD) // NO. DAMAGING. DEAD. MOBS.
@@ -150,7 +150,7 @@
 
 /obj/effect/xenomorph/spray/Crossed(AM as mob|obj)
 	..()
-	if(AM == cause_data.resolve_mob())
+	if(AM == cause_data?.resolve_mob())
 		return
 
 	if(isliving(AM))

code/game/objects/effects/decals/cleanable/blood/robots.dm

@@ -31,10 +31,10 @@
 	random_icon_states = list("gibarm", "gibleg")
 
 /obj/effect/decal/cleanable/blood/gibs/robot/up
-	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibup1","gibup1") //2:7 is close enough to 1:4
+	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7", "gibup", "gibup") //2:7 is close enough to 1:4
 
 /obj/effect/decal/cleanable/blood/gibs/robot/down
-	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibdown1","gibdown1") //2:7 is close enough to 1:4
+	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibdown","gibdown") //2:7 is close enough to 1:4
 
 /obj/effect/decal/cleanable/blood/oil
 	name = "motor oil"

code/game/objects/items.dm

@@ -239,13 +239,20 @@
 /obj/item/proc/suicide_act(mob/user)
 	return
 
-/*Global item proc for all of your unique item skin needs. Works with any
-item, and will change the skin to whatever you specify here. You can also
-manually override the icon with a unique skin if wanted, for the outlier
-cases. Override_icon_state should be a list.*/
+/**
+ * Global item proc for all of your unique item skin needs. Works with any
+ * item, and will change the skin to whatever you specify here. You can also
+ * manually override the icon with a unique skin if wanted, for the outlier
+ * cases. Override_icon_state should be a list. Generally requires NO_GAMEMODE_SKIN
+ * to not be set for changes to be applied.
+ *
+ * Returns whether changes were applied.
+ */
 /obj/item/proc/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
 	if(type != expected_type)
-		return
+		return FALSE
+	if(flags_atom & NO_GAMEMODE_SKIN)
+		return FALSE
 
 	var/new_icon_state
 	var/new_protection
@@ -254,19 +261,22 @@ cases. Override_icon_state should be a list.*/
 		new_icon_state = override_icon_state[SSmapping.configs[GROUND_MAP].map_name]
 	if(LAZYLEN(override_protection))
 		new_protection = override_protection[SSmapping.configs[GROUND_MAP].map_name]
-	switch(SSmapping.configs[GROUND_MAP].camouflage_type)
-		if("snow")
-			icon_state = new_icon_state ? new_icon_state : "s_" + icon_state
-			item_state = new_item_state ? new_item_state : "s_" + item_state
-		if("desert")
-			icon_state = new_icon_state ? new_icon_state : "d_" + icon_state
-			item_state = new_item_state ? new_item_state : "d_" + item_state
-		if("classic")
-			icon_state = new_icon_state ? new_icon_state : "c_" + icon_state
-			item_state = new_item_state ? new_item_state : "c_" + item_state
+	if(!isnull(icon_state) || new_icon_state || new_item_state)
+		switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+			if("snow")
+				icon_state = new_icon_state ? new_icon_state : "s_" + icon_state
+				item_state = new_item_state ? new_item_state : "s_" + item_state
+			if("desert")
+				icon_state = new_icon_state ? new_icon_state : "d_" + icon_state
+				item_state = new_item_state ? new_item_state : "d_" + item_state
+			if("classic")
+				icon_state = new_icon_state ? new_icon_state : "c_" + icon_state
+				item_state = new_item_state ? new_item_state : "c_" + item_state
 	if(new_protection)
 		min_cold_protection_temperature = new_protection
 
+	return TRUE
+
 /obj/item/get_examine_text(mob/user)
 	. = list()
 	var/size

code/game/objects/items/devices/binoculars.dm

@@ -12,8 +12,6 @@
 	throwforce = 5
 	throw_range = 15
 	throw_speed = SPEED_VERY_FAST
-	/// If FALSE won't change icon_state to a camo marine bino.
-	var/uses_camo = TRUE
 	var/tile_offset = 11
 	var/viewsize = 12
 	var/hvh_tile_offset = 6 //same as miniscopes
@@ -23,8 +21,6 @@
 
 /obj/item/device/binoculars/Initialize()
 	. = ..()
-	if(!uses_camo)
-		return
 	select_gamemode_skin(type)
 
 /obj/item/device/binoculars/attack_self(mob/user)
@@ -55,7 +51,7 @@
 /obj/item/device/binoculars/civ
 	desc = "A pair of binoculars."
 	icon_state = "binoculars_civ"
-	uses_camo = FALSE
+	flags_atom = FPRINT|CONDUCT|NO_GAMEMODE_SKIN // same sprite for all gamemodes
 
 //RANGEFINDER with ability to acquire coordinates
 /obj/item/device/binoculars/range
@@ -516,7 +512,7 @@
 	icon_state = "designator_e"
 
 	//laser_con is to add you to the list of laser users.
-	flags_atom = FPRINT|CONDUCT
+	flags_atom = FPRINT|CONDUCT|NO_GAMEMODE_SKIN
 	force = 5
 	w_class = SIZE_SMALL
 	throwforce = 5

code/game/objects/items/devices/walkman.dm

@@ -176,7 +176,7 @@
 		var/mob/living/carbon/human/H = loc
 		H.regenerate_icons()
 
-/obj/item/device/walkman/get_mob_overlay(mob/user_mob, slot)
+/obj/item/device/walkman/get_mob_overlay(mob/user_mob, slot, default_bodytype = "Default")
 	var/image/ret = ..()
 	if((slot == WEAR_L_EAR || slot == WEAR_R_EAR) && !paused)
 		var/image/I = overlay_image(ret.icon, "+music", color, RESET_COLOR)

code/game/objects/items/explosives/mine.dm

@@ -34,6 +34,8 @@
 	. = ..()
 	if(map_deployed)
 		deploy_mine(null)
+	else
+		cause_data = create_cause_data(initial(name))
 
 /obj/item/explosive/mine/Destroy()
 	QDEL_NULL(tripwire)

code/game/objects/items/handcuffs.dm

@@ -75,7 +75,7 @@
 	throw_range = 5
 	matter = list("metal" = 500)
 
-/obj/item/restraint/handcuffs/get_mob_overlay(mob/user_mob, slot)
+/obj/item/restraint/handcuffs/get_mob_overlay(mob/user_mob, slot, default_bodytype = "Default")
 	var/image/ret = ..()
 
 	var/image/handcuffs = overlay_image('icons/mob/mob.dmi', "handcuff1", color, RESET_COLOR)

code/game/objects/items/shards.dm

@@ -16,6 +16,8 @@
 	var/source_sheet_type = /obj/item/stack/sheet/glass
 	var/shardsize
 	var/count = 1
+	/// Whether to add small/medium/large to the end of the icon_state on Initialize
+	var/random_size = TRUE
 	garbage = TRUE
 
 /obj/item/shard/attack(mob/living/carbon/M, mob/living/carbon/user)
@@ -26,22 +28,21 @@
 
 /obj/item/shard/Initialize()
 	. = ..()
-	shardsize = pick("large", "medium", "small")
-	switch(shardsize)
-		if("small")
-			pixel_x = rand(-12, 12)
-			pixel_y = rand(-12, 12)
-			icon_state += shardsize
-		if("medium")
-			pixel_x = rand(-8, 8)
-			pixel_y = rand(-8, 8)
-			icon_state += shardsize
-		if("large")
-			pixel_x = rand(-5, 5)
-			pixel_y = rand(-5, 5)
-			icon_state += shardsize
-
-
+	if(random_size)
+		shardsize = pick("large", "medium", "small")
+		switch(shardsize)
+			if("small")
+				pixel_x = rand(-12, 12)
+				pixel_y = rand(-12, 12)
+				icon_state += shardsize
+			if("medium")
+				pixel_x = rand(-8, 8)
+				pixel_y = rand(-8, 8)
+				icon_state += shardsize
+			if("large")
+				pixel_x = rand(-5, 5)
+				pixel_y = rand(-5, 5)
+				icon_state += shardsize
 
 /obj/item/shard/attackby(obj/item/W, mob/user)
 	if ( iswelder(W))
@@ -237,6 +238,7 @@
 	desc = "Some shrapnel that used to be embedded underneath someone's skin."
 	icon_state = "small"
 	damage_on_move = 2
+	random_size = FALSE
 
 /obj/item/shard/shrapnel/upp/bits
 	name = "tiny shrapnel"
@@ -251,6 +253,7 @@
 	matter = list("bone" = 50)
 	desc = "It looks like it came from a prehistoric animal."
 	damage_on_move = 0.6
+	random_size = FALSE
 
 /obj/item/shard/shrapnel/bone_chips/human
 	name = "human bone fragments"