fixes some of the issues of the createanddestroy unit test (#7648)

* send help

* polychromic createanddestroy fix

code/game/machinery/computer/station_alert.dm

@@ -50,5 +50,5 @@
 	. = ..()
 	if(machine_stat & (NOPOWER|BROKEN))
 		return
-	if(length(listener.alarms))
+	if(listener && length(listener.alarms)) //skyrat edit: fix createanddestroy
 		. += "alert:2"

code/game/objects/effects/decals/cleanable/humans.dm

@@ -112,7 +112,7 @@
 	. = ..()
 	if(!.)
 		return
-	AddComponent(/datum/component/rot, 0, 5 MINUTES, 0.7)
+	//AddComponent(/datum/component/rot, 0, 5 MINUTES, 0.7) skyrat edit
 
 /obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target)
 	return FALSE

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

@@ -174,6 +174,6 @@
 /obj/item/multitool/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
 	name = "electronic multitool"
 	desc = "Optimised version of a regular multitool. Streamlines processes handled by its internal microchip."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "multitool_cyborg"
 	toolspeed = 0.5

code/game/objects/items/kitchen.dm

@@ -232,7 +232,7 @@
 
 /obj/item/kitchen/knife/combat/cyborg
 	name = "cyborg knife"
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "knife_cyborg"
 	desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
 

code/game/objects/items/tools/crowbar.dm

@@ -201,7 +201,7 @@
 /obj/item/crowbar/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
 	name = "hydraulic crowbar"
 	desc = "A hydraulic prying tool, simple but powerful."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "crowbar_cyborg"
 	worn_icon_state = "crowbar"
 	usesound = 'sound/items/jaws_pry.ogg'

code/game/objects/items/tools/screwdriver.dm

@@ -172,7 +172,7 @@
 /obj/item/screwdriver/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
 	name = "automated screwdriver"
 	desc = "A powerful automated screwdriver, designed to be both precise and quick."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "screwdriver_cyborg"
 	hitsound = 'sound/items/drill_hit.ogg'
 	usesound = 'sound/items/drill_use.ogg'

code/game/objects/items/tools/weldingtool.dm

@@ -324,7 +324,7 @@
 /obj/item/weldingtool/largetank/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
 	name = "integrated welding tool"
 	desc = "An advanced welder designed to be used in robotic systems. Custom framework doubles the speed of welding."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "indwelder_cyborg"
 	toolspeed = 0.5
 

code/game/objects/items/tools/wirecutters.dm

@@ -76,7 +76,7 @@
 /obj/item/wirecutters/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
 	name = "powered wirecutters"
 	desc = "Cuts wires with the power of ELECTRICITY. Faster than normal wirecutters."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "wirecutters_cyborg"
 	worn_icon_state = "cutters"
 	toolspeed = 0.5

code/game/objects/items/tools/wrench.dm

@@ -74,7 +74,7 @@
 /obj/item/wrench/cyborg//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
 	name = "hydraulic wrench"
 	desc = "An advanced robotic wrench, powered by internal hydraulics. Twice as fast as the handheld version."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "wrench_cyborg"
 	toolspeed = 0.5
 

code/game/objects/items/toys.dm

@@ -244,7 +244,7 @@
 /obj/item/toy/gun
 	name = "cap gun"
 	desc = "Looks almost like the real thing! Ages 8 and up. Please recycle in an autolathe when you're out of caps."
-	icon = 'icons/obj/guns/ballistic.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	icon_state = "revolver"
 	inhand_icon_state = "gun"
 	worn_icon_state = "gun"
@@ -1570,7 +1570,7 @@
 /obj/item/toy/foamfinger
 	name = "foam finger"
 	desc = "root for the home team! wait, does this station even have a sports team?"
-	icon = 'icons/obj/guns/ballistic.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	icon_state = "foamfinger"
 	inhand_icon_state = "foamfinger_inhand"
 	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'

code/game/objects/items/weaponry.dm

@@ -230,7 +230,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	playsound(user, 'sound/items/screwdriver2.ogg', 50, TRUE)
 
 /obj/item/claymore/highlander/robot //BLOODTHIRSTY BORGS NOW COME IN PLAID
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "claymore_cyborg"
 	var/mob/living/silicon/robot/robot
 

code/game/objects/obj_defense.dm

@@ -191,7 +191,8 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
 	. = ..()
 	if((resistance_flags & UNACIDABLE) || (acid_volume <= 0) || acidpwr <= 0)
 		return FALSE
-
+	if(QDELETED(src)) //skyrat edit: fix createanddestroy
+		return FALSE
 	AddComponent(/datum/component/acid, acidpwr, acid_volume)
 	return TRUE
 

code/game/turfs/turf.dm

@@ -537,7 +537,8 @@ GLOBAL_LIST_EMPTY(station_turfs)
 	. = ..()
 	if((acidpwr <= 0) || (acid_volume <= 0))
 		return FALSE
-
+	if(QDELETED(src)) //skyrat edit: fix createanddestroy
+		return FALSE
 	AddComponent(/datum/component/acid, acidpwr, acid_volume)
 	for(var/obj/O in src)
 		if(intact && HAS_TRAIT(O, TRAIT_T_RAY_VISIBLE))

code/modules/antagonists/cult/blood_magic.dm

@@ -796,11 +796,13 @@
 
 /obj/item/melee/blood_magic/manipulator/attack_self(mob/living/user)
 	if(IS_CULTIST(user))
+		//skyrat edit
 		var/static/list/spells = list(
 			"Bloody Halberd (150)" = image(icon = 'icons/obj/items_and_weapons.dmi', icon_state = "occultpoleaxe0"),
-			"Blood Bolt Barrage (300)" = image(icon = 'icons/obj/guns/ballistic.dmi', icon_state = "arcane_barrage"),
+			"Blood Bolt Barrage (300)" = image(icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi', icon_state = "arcane_barrage"),
 			"Blood Beam (500)" = image(icon = 'icons/obj/items_and_weapons.dmi', icon_state = "disintegrate")
 			)
+		//skyrat edit
 		var/choice = show_radial_menu(user, src, spells, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE)
 		if(!check_menu(user))
 			to_chat(user, span_cultitalic("You decide against conducting a greater blood rite."))

code/modules/flufftext/Hallucination.dm

@@ -1248,7 +1248,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
 		halitem.plane = ABOVE_HUD_PLANE
 		switch(rand(1,6))
 			if(1) //revolver
-				halitem.icon = 'icons/obj/guns/ballistic.dmi'
+				halitem.icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 				halitem.icon_state = "revolver"
 				halitem.name = "Revolver"
 			if(2) //c4

code/modules/mob/living/carbon/carbon.dm

@@ -1321,4 +1321,5 @@
 
 /mob/living/carbon/proc/attach_rot(mapload)
 	SIGNAL_HANDLER
-	AddComponent(/datum/component/rot, 6 MINUTES, 10 MINUTES, 1)
+	if(mob_biotypes & (MOB_ORGANIC|MOB_UNDEAD))
+		AddComponent(/datum/component/rot, 6 MINUTES, 10 MINUTES, 1)

code/modules/mob/living/simple_animal/friendly/drone/drone_tools.dm

@@ -42,7 +42,7 @@
 /obj/item/crowbar/drone
 	name = "built-in crowbar"
 	desc = "A crowbar built into your chassis."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "crowbar_cyborg"
 	inhand_icon_state = "crowbar"
 	item_flags = NO_MAT_REDEMPTION
@@ -50,7 +50,7 @@
 /obj/item/screwdriver/drone
 	name = "built-in screwdriver"
 	desc = "A screwdriver built into your chassis."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "screwdriver_cyborg"
 	inhand_icon_state = "screwdriver"
 	item_flags = NO_MAT_REDEMPTION
@@ -69,7 +69,7 @@
 /obj/item/wrench/drone
 	name = "built-in wrench"
 	desc = "A wrench built into your chassis."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "wrench_cyborg"
 	inhand_icon_state = "wrench"
 	item_flags = NO_MAT_REDEMPTION
@@ -77,14 +77,14 @@
 /obj/item/weldingtool/drone
 	name = "built-in welding tool"
 	desc = "A welding tool built into your chassis."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "indwelder_cyborg"
 	item_flags = NO_MAT_REDEMPTION
 
 /obj/item/wirecutters/drone
 	name = "built-in wirecutters"
 	desc = "Wirecutters built into your chassis."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "wirecutters_cyborg"
 	inhand_icon_state = "cutters"
 	item_flags = NO_MAT_REDEMPTION

code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm

@@ -77,14 +77,14 @@
 
 /datum/action/innate/megafauna_attack/shotgun
 	name = "Shotgun Fire"
-	icon_icon = 'icons/obj/guns/ballistic.dmi'
+	icon_icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	button_icon_state = "shotgun"
 	chosen_message = "<span class='colossus'>You are now firing shotgun shots where you aim.</span>"
 	chosen_attack_num = 3
 
 /datum/action/innate/megafauna_attack/alternating_cardinals
 	name = "Alternating Shots"
-	icon_icon = 'icons/obj/guns/ballistic.dmi'
+	icon_icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	button_icon_state = "pistol"
 	chosen_message = "<span class='colossus'>You are now firing in alternating cardinal directions.</span>"
 	chosen_attack_num = 4

code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm

@@ -75,7 +75,7 @@ Difficulty: Extremely Hard
 
 /datum/action/innate/megafauna_attack/ice_shotgun
 	name = "Fire Ice Shotgun"
-	icon_icon = 'icons/obj/guns/ballistic.dmi'
+	icon_icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	button_icon_state = "shotgun"
 	chosen_message = "<span class='colossus'>You are now firing shotgun ice blasts.</span>"
 	chosen_attack_num = 3

code/modules/projectiles/guns/ballistic.dm

@@ -670,7 +670,7 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
 /obj/item/suppressor
 	name = "suppressor"
 	desc = "A syndicate small-arms suppressor for maximum espionage."
-	icon = 'icons/obj/guns/ballistic.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	icon_state = "suppressor"
 	w_class = WEIGHT_CLASS_TINY
 

code/modules/projectiles/guns/ballistic/bow.dm

@@ -2,7 +2,7 @@
 /obj/item/gun/ballistic/bow
 	name = "longbow"
 	desc = "While pretty finely crafted, surely you can find something better to use in the current year."
-	icon = 'icons/obj/guns/ballistic.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	icon_state = "bow"
 	inhand_icon_state = "bow"
 	load_sound = null

code/modules/projectiles/guns/energy/laser.dm

@@ -75,7 +75,7 @@
 
 /obj/item/gun/energy/laser/scatter/shotty
 	name = "energy shotgun"
-	icon = 'icons/obj/guns/ballistic.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	icon_state = "cshotgun"
 	inhand_icon_state = "shotgun"
 	desc = "A combat shotgun gutted and refitted with an internal laser system. Can switch between taser and scattered disabler shots."

code/modules/projectiles/guns/energy/mounted.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/energy/e_gun/advtaser/mounted
 	name = "mounted taser"
 	desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "taser"
 	inhand_icon_state = "armcannonstun4"
 	display_empty = FALSE
@@ -16,7 +16,7 @@
 /obj/item/gun/energy/laser/mounted
 	name = "mounted laser"
 	desc = "An arm mounted cannon that fires lethal lasers."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "laser_cyborg"
 	inhand_icon_state = "armcannonlase"
 	force = 5

code/modules/projectiles/guns/energy/special.dm

@@ -295,7 +295,7 @@
 	name = "cyborg lmg"
 	desc = "An LMG that fires 3D-printed flechettes. They are slowly resupplied using the cyborg's internal power source."
 	icon_state = "l6_cyborg"
-	icon = 'icons/obj/guns/ballistic.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	cell_type = "/obj/item/stock_parts/cell/secborg"
 	ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet)
 	can_charge = FALSE

code/modules/projectiles/guns/special/grenade_launcher.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/grenadelauncher
 	name = "grenade launcher"
 	desc = "A terrible, terrible thing. It's really awful!"
-	icon = 'icons/obj/guns/ballistic.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	icon_state = "riotgun"
 	inhand_icon_state = "riotgun"
 	w_class = WEIGHT_CLASS_BULKY

code/modules/reagents/reagent_containers/spray.dm

@@ -332,7 +332,7 @@
 /obj/item/reagent_containers/spray/chemsprayer
 	name = "chem sprayer"
 	desc = "A utility used to spray large amounts of reagents in a given area."
-	icon = 'icons/obj/guns/ballistic.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	icon_state = "chemsprayer"
 	inhand_icon_state = "chemsprayer"
 	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'

code/modules/vehicles/mecha/equipment/tools/medical_tools.dm

@@ -259,7 +259,7 @@
 /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun
 	name = "exosuit syringe gun"
 	desc = "Equipment for medical exosuits. A chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur."
-	icon = 'icons/obj/guns/ballistic.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	icon_state = "syringegun"
 	range = MECHA_MELEE|MECHA_RANGED
 	equip_cooldown = 10

modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm

@@ -5,7 +5,7 @@
 /obj/item/gun
 	name = "gun"
 	desc = "It's a gun. It's pretty terrible, though."
-	icon = 'icons/obj/guns/ballistic.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/ballistic.dmi' //skyrat edit
 	icon_state = "detective"
 	inhand_icon_state = "gun"
 	worn_icon_state = "gun"

modular_skyrat/modules/aesthetics/guns/code/guns.dm

@@ -97,7 +97,7 @@
 
 /obj/item/ammo_casing/energy/laser/rainbow
 	icon = 'modular_skyrat/modules/aesthetics/guns/icons/nucgun.dmi'
-	select_name = "fantastic kill"
+	select_name = "kill"
 	projectile_type = /obj/projectile/beam/laser/rainbow
 
 /obj/projectile/beam/laser/rainbow
@@ -106,7 +106,7 @@
 
 /obj/item/ammo_casing/energy/disabler/rainbow
 	icon = 'modular_skyrat/modules/aesthetics/guns/icons/nucgun.dmi'
-	select_name = "fantastic disable"
+	select_name = "disable"
 	projectile_type = /obj/projectile/beam/disabler/rainbow
 
 /obj/projectile/beam/disabler/rainbow
@@ -228,18 +228,18 @@
 
 /obj/item/gun/energy/kinetic_accelerator
 	icon = 'modular_skyrat/modules/aesthetics/guns/icons/energy.dmi'
-	
+
 /obj/item/gun/ballistic/rifle/boltaction
 	name = "\improper Mosin Nagant 91-30"
 	desc = "This piece of junk looks like something that could have been used 700 years ago. It feels slightly moist."
 	sawn_desc = "An extremely sawn-off Mosin Nagant, popularly known as an \"obrez\". There was probably a reason it wasn't manufactured this short to begin with."
 	icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
-	
+
 /obj/item/gun/ballistic/rifle/boltaction/brand_new
 	name = "\improper Mosin Nagant M39"
 	desc = "A freshly-produced Mosin Nagant variant issued by Nanotrasen for their interns. You would rather not damage it."
 	icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
-	
+
 /obj/item/gun/ballistic/rifle/boltaction/brand_new/quartermaster
 	name = "\improper FTU 'Archangel' Mosin"
 	desc = "A very... Modernized MN91-30 rifle, the frame even feels a little flimsy. This thing was probably built with a conversion kit from spaceBay."
@@ -250,7 +250,7 @@
 	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba
 	can_be_sawn_off = FALSE
 	realistic = TRUE
-	
+
 /obj/item/ammo_box/magazine/internal/boltaction/bubba
 	name = "mosin nagant extended internal magazine"
 	desc = "How did you get it out?"
@@ -258,7 +258,7 @@
 	caliber = CALIBER_A762
 	max_ammo = 8
 	multiload = TRUE
-	
+
 /obj/item/gun/ballistic/automatic/surplus
 	name = "\improper Type-69 Surplus Rifle"
 	desc = "One of countless obsolete ballistic rifles that still sees use as a cheap deterrent. Uses 10mm ammo and its bulky frame prevents one-hand firing."

modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm

@@ -282,8 +282,10 @@
 	STOP_PROCESSING(SSobj, src)
 
 /obj/machinery/bsa/full/Destroy()
-	control_unit.cannon = null
-	control_unit = null
+	if(control_unit)
+		if(control_unit.cannon)
+			control_unit.cannon = null
+		control_unit = null
 	. = ..()
 
 /obj/structure/filler

modular_skyrat/modules/bsa_overhaul/code/bsa_computer.dm

@@ -4,7 +4,7 @@
 	name = "bluespace artillery control"
 	use_power = NO_POWER_USE
 	circuit = /obj/item/circuitboard/computer/bsa_control
-	icon = 'icons/obj/machines/particle_accelerator.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/particle_accelerator.dmi'
 	icon_state = "control_boxp"
 	var/obj/machinery/bsa_powercore/core //The moveable power core link
 	var/obj/machinery/bsa/full/cannon

modular_skyrat/modules/cell_component/code/cell_component.dm

@@ -64,10 +64,10 @@ component_cell_out_of_charge/component_cell_removed proc using loc where necessa
 		inside_robot = TRUE
 	else if(start_with_cell)
 		var/obj/item/stock_parts/cell/new_cell
-		if(cell_override)
-			new_cell = new cell_override()
-		else
+		if(!cell_override)
 			new_cell = new /obj/item/stock_parts/cell/upgraded()
+		else
+			new_cell = new cell_override()
 		inserted_cell = new_cell
 		new_cell.forceMove(parent) //We use the parents location so things like EMP's can interact with the cell.
 	handle_cell_overlays()

modular_skyrat/modules/central_command_module/code/computers/import_console.dm

@@ -22,6 +22,12 @@ GLOBAL_LIST_EMPTY(cargo_control_consoles)
 		for(var/turf/open/floor/iterating_floor in iterating_import_bay)
 			possible_floors += iterating_floor
 
+/obj/machinery/computer/cargo_control_console/Destroy()
+	if(radio)
+		QDEL_NULL(radio)
+	. = ..()
+
+
 /obj/item/circuitboard/computer/cargo_control_console
 	name = "Cargo Console (Computer Board)"
 	greyscale_colors = CIRCUIT_COLOR_ENGINEERING

modular_skyrat/modules/customization/datums/elements/polychromic.dm

@@ -16,9 +16,12 @@
 		return
 	var/obj/item/our_thing = target
 	var/list/finished_list = list()
-	finished_list += ReadRGB("[colors[1]]0")
-	finished_list += ReadRGB("[colors[2]]0")
-	finished_list += ReadRGB("[colors[3]]0")
+	for(var/read_color in 1 to colors.len)
+		finished_list += ReadRGB("[colors[read_color]]0")
+	var/remaining_count = 3 - length(colors)
+	if(remaining_count > 0)
+		for(var/remaining_color in 1 to remaining_count)
+			finished_list += ReadRGB("FFF0")
 	finished_list += list(0,0,0,255)
 	for(var/index in 1 to finished_list.len)
 		finished_list[index] /= 255

modular_skyrat/modules/demon_floor/code/floor_demon.dm

@@ -59,7 +59,10 @@ GLOBAL_LIST_EMPTY(cluwne_maze)
 	return //we use a different hud
 
 /mob/living/simple_animal/hostile/floor_cluwne/Destroy()
-	QDEL_NULL(poi)
+	if(poi)
+		QDEL_NULL(poi)
+	if(cluwnehole)
+		QDEL_NULL(cluwnehole)
 	if(current_victim)
 		current_victim = null
 	return ..()

modular_skyrat/modules/exp_corps/code/clothing.dm

@@ -196,10 +196,6 @@
 		my_helmet.disable_nv()
 	my_helmet.update_appearance()
 
-/obj/item/clothing/head/helmet/expeditionary_corps/ComponentInitialize()
-	. = ..()
-	AddElement(/datum/element/update_icon_updates_onmob)
-
 /obj/item/clothing/head/helmet/expeditionary_corps/equipped(mob/user, slot)
 	. = ..()
 	current_user = user

modular_skyrat/modules/implants/code/organs/augments_arms.dm

@@ -37,7 +37,7 @@
 /obj/item/organ/cyberimp/arm/hacker
 	name = "hacking arm implant"
 	desc = "An small arm implant containing an advanced screwdriver, wirecutters, and multitool designed for engineers and on-the-field machine modification. Actually legal, despite what the name may make you think."
-	icon ='icons/obj/items_cyborg.dmi'
+	icon ='modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "multitool_cyborg"
 	items_to_create = list(/obj/item/screwdriver/cyborg, /obj/item/wirecutters/cyborg, /obj/item/multitool/abductor/implant)
 
@@ -49,7 +49,7 @@
 /obj/item/multitool/abductor/implant
 	name = "multitool"
 	desc = "An optimized, highly advanced stripped-down multitool able to interface with electronics far better than its standard counterpart."
-	icon = 'icons/obj/items_cyborg.dmi'
+	icon = 'modular_skyrat/modules/fixing_missing_icons/items_cyborg.dmi' //skyrat edit
 	icon_state = "multitool_cyborg"
 
 /obj/item/organ/cyberimp/arm/janitor

modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm

@@ -444,9 +444,9 @@
 		SEND_SIGNAL(my_turf, COMSIG_TURF_LIQUIDS_CREATION, src)
 
 	update_liquid_vis()
-
-	QUEUE_SMOOTH(src)
-	QUEUE_SMOOTH_NEIGHBORS(src)
+	if(z)
+		QUEUE_SMOOTH(src)
+		QUEUE_SMOOTH_NEIGHBORS(src)
 
 	/* //Cant do it immediately, hmhm
 	if(isspaceturf(my_turf))

modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm

@@ -282,11 +282,6 @@
 		"pinkn" = image(icon = src.icon, icon_state = "dephelmet_pinkn"),
 		"tealn" = image(icon = src.icon, icon_state = "dephelmet_tealn"))
 
-//to update model
-/obj/item/clothing/head/helmet/space/deprivation_helmet/ComponentInitialize()
-	. = ..()
-	AddElement(/datum/element/update_icon_updates_onmob)
-
 //to change model
 /obj/item/clothing/head/helmet/space/deprivation_helmet/AltClick(mob/user, obj/item/I)
 	if(color_changed == FALSE)