Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync

# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm

code/modules/organs/robolimbs.dm

@@ -112,6 +112,13 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	unavailable_to_build = 1
 	parts = list(BP_HEAD)
 
+/datum/robolimb/morpheus_alt2
+	company = "Morpheus - Skeleton Crew"
+	desc = "This limb is simple and functional; it's basically just a case for a brain."
+	icon = 'icons/mob/human_races/cyberlimbs/morpheus/morpheus_alt2.dmi'
+	unavailable_to_build = 1
+	parts = list(BP_HEAD)
+
 /datum/robolimb/veymed
 	company = "Vey-Med"
 	desc = "This high quality limb is nearly indistinguishable from an organic one."

code/modules/organs/subtypes/machine.dm

@@ -1,7 +1,6 @@
 /obj/item/organ/internal/cell
 	name = "microbattery"
 	desc = "A small, powerful cell for use in fully prosthetic bodies."
-	icon = 'icons/obj/power.dmi'
 	icon_state = "scell"
 	organ_tag = "cell"
 	parent_organ = BP_TORSO