Merge remote-tracking branch 'ParadiseSS13/master' into removes-headcrabs

code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm

@@ -30,7 +30,7 @@
 		/obj/item/reagent_containers/food/snacks/tatortot,
 		/obj/item/storage/box/fakesyndiesuit,
 		/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
-		/obj/item/toy/figure/syndie,
+		/obj/item/toy/figure/crew/syndie,
 		/obj/item/toy/nuke,
 		/obj/item/toy/plushie/nukeplushie,
 		/obj/item/toy/sword,

code/modules/arcade/arcade_prize.dm

@@ -10,8 +10,8 @@
 	var/opening = 0
 	var/possible_contents = list(/obj/random/carp_plushie, /obj/random/plushie, /obj/random/figure, /obj/item/toy/eight_ball, /obj/item/stack/tickets)
 
-/obj/item/toy/prizeball/New()
-	..()
+/obj/item/toy/prizeball/Initialize(mapload)
+	. = ..()
 	icon_state = pick("prizeball_1","prizeball_2","prizeball_3")
 
 /obj/item/toy/prizeball/attack_self(mob/user as mob)

code/modules/arcade/prize_datums.dm

@@ -200,7 +200,7 @@ GLOBAL_DATUM_INIT(global_prizes, /datum/prizes, new())
 /datum/prize_item/toy_xeno
 	name = "Xeno Action Figure"
 	desc = "A lifelike replica of the horrific xeno scourge."
-	typepath = /obj/item/toy/toy_xeno
+	typepath = /obj/item/toy/figure/xeno
 	cost = 80
 
 /datum/prize_item/rubberducky
@@ -272,13 +272,13 @@ GLOBAL_DATUM_INIT(global_prizes, /datum/prizes, new())
 /datum/prize_item/owl
 	name = "Owl Action Figure"
 	desc = "Remember: heroes don't grief!"
-	typepath = /obj/item/toy/owl
+	typepath = /obj/item/toy/figure/owl
 	cost = 125
 
 /datum/prize_item/griffin
 	name = "Griffin Action Figure"
 	desc = "If you can't be the best, you can always be the WORST."
-	typepath = /obj/item/toy/griffin
+	typepath = /obj/item/toy/figure/griffin
 	cost = 125
 
 /datum/prize_item/codex_gigas

code/modules/clothing/shoes/miscellaneous.dm

@@ -327,6 +327,10 @@
 	var/recharging_rate = 60 //default 6 seconds between each dash
 	var/recharging_time = 0 //time until next dash
 
+/obj/item/clothing/shoes/bhop/item_action_slot_check(slot)
+	if(slot == slot_shoes)
+		return TRUE
+
 /obj/item/clothing/shoes/bhop/ui_action_click(mob/user, action)
 	if(!isliving(user))
 		return

code/modules/mining/abandonedcrates.dm

@@ -61,7 +61,7 @@
 		if(53 to 54)
 			new /obj/item/toy/balloon(src)
 		if(55 to 56)
-			var/newitem = pick(subtypesof(/obj/item/toy/prize))
+			var/newitem = pick(subtypesof(/obj/item/toy/figure/mech))
 			new newitem(src)
 		if(57 to 58)
 			new /obj/item/toy/syndicateballoon(src)

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

@@ -404,6 +404,10 @@
 /mob/living/carbon/proc/tintcheck()
 	return 0
 
+/mob/living/carbon/proc/create_dna()
+	if(!dna)
+		dna = new()
+
 /mob/living/carbon/proc/getDNA()
 	return dna
 

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

@@ -14,38 +14,47 @@
 	. = ..()
 
 /mob/living/carbon/human/Initialize(mapload, datum/species/new_species = /datum/species/human)
-	if(!dna)
-		dna = new /datum/dna(null)
-		// Species name is handled by set_species()
+	create_dna()
 
 	. = ..()
 
-	set_species(new_species, 1, delay_icon_update = 1, skip_same_check = TRUE)
-
-	if(dna.species)
-		real_name = dna.species.get_random_name(gender)
-		name = real_name
-		if(mind)
-			mind.name = real_name
-
-	create_reagents(330)
-
-	handcrafting = new()
-
-	// Set up DNA.
-	if(dna)
-		dna.ready_dna(src)
-		dna.real_name = real_name
-		sync_organ_dna(1)
-
-	physiology = new()
-
-	AddComponent(/datum/component/footstep, FOOTSTEP_MOB_HUMAN, 1, -6)
+	setup_dna(new_species)
+	setup_other()
 
 	UpdateAppearance()
 	GLOB.human_list += src
 
+/**
+  * Sets up DNA and species.
+  *
+  * Arguments:
+  * * new_species - The new species to assign.
+  */
+/mob/living/carbon/human/proc/setup_dna(datum/species/new_species)
+	set_species(new_species, use_default_color = TRUE, delay_icon_update = TRUE, skip_same_check = TRUE)
+	// Name
+	real_name = dna.species.get_random_name(gender)
+	name = real_name
+	if(mind)
+		mind.name = real_name
+	// DNA ready
+	dna.ready_dna(src)
+	dna.real_name = real_name
+	sync_organ_dna()
+
+/**
+  * Sets up other variables and components that may be needed for gameplay.
+  */
+/mob/living/carbon/human/proc/setup_other()
+	create_reagents(330)
+	physiology = new()
+
+/mob/living/carbon/human/ComponentInitialize()
+	AddComponent(/datum/component/footstep, FOOTSTEP_MOB_HUMAN, 1, -6)
+
 /mob/living/carbon/human/OpenCraftingMenu()
+	if(!handcrafting)
+		handcrafting = new()
 	handcrafting.ui_interact(src)
 
 /mob/living/carbon/human/prepare_data_huds()
@@ -1211,7 +1220,7 @@
 	sec_hud_set_ID()
 
 
-/mob/living/carbon/human/proc/set_species(datum/species/new_species, default_colour, delay_icon_update = FALSE, skip_same_check = FALSE, retain_damage = FALSE, transformation = FALSE)
+/mob/living/carbon/human/proc/set_species(datum/species/new_species, use_default_color = FALSE, delay_icon_update = FALSE, skip_same_check = FALSE, retain_damage = FALSE, transformation = FALSE)
 	if(!skip_same_check)
 		if(dna.species.name == initial(new_species.name))
 			return
@@ -1246,7 +1255,7 @@
 	hunger_drain = dna.species.hunger_drain
 	digestion_ratio = dna.species.digestion_ratio
 
-	if(dna.species.base_color && default_colour)
+	if(dna.species.base_color && use_default_color)
 		//Apply colour.
 		skin_colour = dna.species.base_color
 	else

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -416,7 +416,11 @@
 		/obj/item/clothing/mask/gas/sechailer/cyborg
 	)
 	emag_modules = list(/obj/item/gun/energy/laser/cyborg)
-	special_rechargables = list(/obj/item/melee/baton/loaded, /obj/item/gun/energy/disabler/cyborg)
+	special_rechargables = list(
+		/obj/item/melee/baton/loaded,
+		/obj/item/gun/energy/disabler/cyborg,
+		/obj/item/gun/energy/laser/cyborg
+	)
 
 /obj/item/robot_module/security/update_cells(unlink_cell = FALSE)
 	var/obj/item/melee/baton/B = locate(/obj/item/melee/baton/loaded) in modules

code/modules/projectiles/guns/energy.dm

@@ -203,3 +203,12 @@
 			var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot
 			if(R.cell.use(shot.e_cost)) 		//Take power from the borg...
 				cell.give(shot.e_cost)	//... to recharge the shot
+
+/obj/item/gun/energy/cyborg_recharge(coeff, emagged)
+	if(cell.charge < cell.maxcharge)
+		var/obj/item/ammo_casing/energy/E = ammo_type[select]
+		cell.give(E.e_cost * coeff)
+		on_recharge()
+		update_icon()
+	else
+		charge_tick = 0

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

@@ -55,12 +55,3 @@
 /obj/item/gun/energy/disabler/cyborg/newshot()
 	..()
 	robocharge()
-
-/obj/item/gun/energy/disabler/cyborg/cyborg_recharge(coeff, emagged)
-	if(cell.charge < cell.maxcharge)
-		var/obj/item/ammo_casing/energy/E = ammo_type[select]
-		cell.give(E.e_cost * coeff)
-		on_recharge()
-		update_icon()
-	else
-		charge_tick = 0