Merge pull request #15679 from keronshb/familyfix

Fixes Families (thanks Hardsync)

code/modules/antagonists/gang/gang.dm

@@ -67,6 +67,11 @@
 		if(handler) // if we have a handler, the handler should track this gang
 			handler.gangs += my_gang
 			my_gang.current_theme = handler.current_theme
+		else if(GLOB.families_override_theme)
+			my_gang.current_theme = new GLOB.families_override_theme
+		else
+			var/theme_to_use = pick(subtypesof(/datum/gang_theme))
+			my_gang.current_theme = new theme_to_use
 		my_gang.name = gang_name
 		my_gang.gang_id = gang_id
 		my_gang.acceptable_clothes = acceptable_clothes.Copy()

code/modules/vehicles/mecha/combat/five_stars.dm

@@ -4,7 +4,6 @@
 	icon = 'icons/mecha/mecha_96x96.dmi'
 	icon_state = "five_stars"
 	armor = list(MELEE = 100, BULLET = 50, LASER = 35, ENERGY = 35, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
-	step_in = 4
 	dir_in = 1 //Facing North.
 	max_integrity = 800
 	pixel_x = -32