Removes some non-existant typepaths (#27362)

* Adds CI for missing icon_states

* yeah

* more fixes

* more fixes

* seems good

* moar

* fix

* yea

* hrtyhrt

* yeah

* WOE

* Removes some non-existant typepaths

* yes

code/modules/antagonists/antag_org/antag_org_syndicate.dm

@@ -56,7 +56,7 @@
 		Get the job done, and we'll be one step closer to ending Nanotrasen's slave empire."
 	focus = 70
 	targeted_departments = list(DEPARTMENT_SCIENCE)
-	theft_targets = list(/datum/theft_objective/reactive, /datum/theft_objective/steal/documents, /datum/theft_objective/hand_tele)
+	theft_targets = list(/datum/theft_objective/reactive, /datum/theft_objective/documents, /datum/theft_objective/hand_tele)
 
 /datum/antag_org/syndicate/electra // Mostly target Engineering
 	name = "Electra Dynamics"
@@ -78,7 +78,7 @@
 	intro_desc = "You are an undercover agent of the Federation Analytics and Intelligence Directorate, a Trans-Solar agency keeping tabs on the Corporate Wars, among other duties. \
 		Be quick, be efficient, and don't get caught. The Directorate will deny any involvement with your presence here."
 	forced_objectives = list(/datum/objective/assassinate/syndicate, /datum/objective/steal)
-	theft_targets = list(/datum/theft_objective/blueprints, /datum/theft_objective/steal/documents)
+	theft_targets = list(/datum/theft_objective/blueprints, /datum/theft_objective/documents)
 	chaos_level = ORG_CHAOS_HUNTER
 
 /datum/antag_org/syndicate/gorlex // Hijack only

code/modules/awaymissions/loot.dm

@@ -1,11 +1,11 @@
-/obj/effect/spawner/away/lootdrop
+/obj/effect/spawner/away_lootdrop
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "x2"
 	var/lootcount = 1		//how many items will be spawned
 	var/lootdoubles = 0		//if the same item can be spawned twice
 	var/loot = ""			//a list of possible items to spawn- a string of paths
 
-/obj/effect/spawner/away/lootdrop/Initialize(mapload)
+/obj/effect/spawner/away_lootdrop/Initialize(mapload)
 	..()
 	var/list/things = params2list(loot)
 

code/modules/clothing/chameleon.dm

@@ -40,7 +40,7 @@
 	var/list/outfit_types = O.get_chameleon_disguise_info()
 
 	for(var/V in user.chameleon_item_actions)
-		var/datum/action/item_action/chameleon/change/action = V
+		var/datum/action/item_action/chameleon_change/action = V
 		for(var/T in outfit_types)
 			if(ispath(T, action.chameleon_type))
 				action.update_look(user, T)
@@ -60,7 +60,7 @@
 	return TRUE
 
 
-/datum/action/item_action/chameleon/change
+/datum/action/item_action/chameleon_change
 	name = "Chameleon Change"
 	var/static/list/chameleon_blacklist = list() //This is a typecache
 	var/static/list/chameleon_list = list()
@@ -69,12 +69,12 @@
 	var/obj/item/holder
 	var/emp_timer
 
-/datum/action/item_action/chameleon/change/New(Target)
+/datum/action/item_action/chameleon_change/New(Target)
 	. = ..()
 	holder = Target
 	
 
-/datum/action/item_action/chameleon/change/Grant(mob/M)
+/datum/action/item_action/chameleon_change/Grant(mob/M)
 	if(M && (owner != M))
 		if(!M.chameleon_item_actions)
 			M.chameleon_item_actions = list(src)
@@ -84,7 +84,7 @@
 			M.chameleon_item_actions |= src
 	..()
 
-/datum/action/item_action/chameleon/change/Remove(mob/M)
+/datum/action/item_action/chameleon_change/Remove(mob/M)
 	if(M && (M == owner))
 		LAZYREMOVE(M.chameleon_item_actions, src)
 		if(!LAZYLEN(M.chameleon_item_actions))
@@ -92,23 +92,23 @@
 			qdel(O)
 	..()
 
-/datum/action/item_action/chameleon/change/UpdateButton(atom/movable/screen/movable/action_button/button, status_only, force)
+/datum/action/item_action/chameleon_change/UpdateButton(atom/movable/screen/movable/action_button/button, status_only, force)
 	. = ..()
 	if(.)
 		button.name = "Change [chameleon_name] Appearance"
 
-/datum/action/item_action/chameleon/change/ui_host()
+/datum/action/item_action/chameleon_change/ui_host()
 	return holder
 
-/datum/action/item_action/chameleon/change/ui_state(mob/user)
+/datum/action/item_action/chameleon_change/ui_state(mob/user)
 	return GLOB.physical_state
 
-/datum/action/item_action/chameleon/change/ui_data(mob/user)
+/datum/action/item_action/chameleon_change/ui_data(mob/user)
 	var/list/data = list()
 	data["selected_appearance"] = "[holder.name]_[holder.icon_state]"
 	return data
 
-/datum/action/item_action/chameleon/change/ui_static_data(mob/user, datum/tgui/ui = null)
+/datum/action/item_action/chameleon_change/ui_static_data(mob/user, datum/tgui/ui = null)
 	var/list/data = list()
 	var/list/chameleon_skins = list()
 	for(var/chameleon_type in chameleon_list[chameleon_name])
@@ -122,14 +122,14 @@
 	data["chameleon_skins"] = chameleon_skins
 	return data
 
-/datum/action/item_action/chameleon/change/ui_interact(mob/user, datum/tgui/ui = null)
+/datum/action/item_action/chameleon_change/ui_interact(mob/user, datum/tgui/ui = null)
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
 		ui = new(user, src, "Chameleon", "Change [chameleon_name] Appearance")
 		ui.open()
 		ui.set_autoupdate(FALSE)
 
-/datum/action/item_action/chameleon/change/ui_act(action, list/params)
+/datum/action/item_action/chameleon_change/ui_act(action, list/params)
 	if(..())
 		return
 
@@ -137,7 +137,7 @@
 		if("change_appearance")
 			update_look(usr, chameleon_list[chameleon_name][params["new_appearance"]])
 
-/datum/action/item_action/chameleon/change/proc/initialize_disguises()
+/datum/action/item_action/chameleon_change/proc/initialize_disguises()
 	UpdateButtons()
 	chameleon_blacklist |= typecacheof(target.type)
 	if(!isnull(chameleon_list[chameleon_name]))
@@ -152,10 +152,10 @@
 			if(isnull(chameleon_list[chameleon_name][chameleon_item_name]))
 				chameleon_list[chameleon_name][chameleon_item_name] = I
 
-/datum/action/item_action/chameleon/change/proc/select_look(mob/user)
+/datum/action/item_action/chameleon_change/proc/select_look(mob/user)
 	ui_interact(user)
 
-/datum/action/item_action/chameleon/change/proc/random_look(mob/user)
+/datum/action/item_action/chameleon_change/proc/random_look(mob/user)
 	var/picked_name = pick(chameleon_list[chameleon_name])
 	// If a user is provided, then this item is in use, and we
 	// need to update our icons and stuff
@@ -169,7 +169,7 @@
 	else
 		update_item(chameleon_list[chameleon_name][picked_name])
 
-/datum/action/item_action/chameleon/change/proc/update_look(mob/user, obj/item/picked_item)
+/datum/action/item_action/chameleon_change/proc/update_look(mob/user, obj/item/picked_item)
 	if(isliving(user))
 		var/mob/living/C = user
 		if(C.stat != CONSCIOUS)
@@ -181,7 +181,7 @@
 		SStgui.update_uis(src)
 	UpdateButtons()
 
-/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item)
+/datum/action/item_action/chameleon_change/proc/update_item(obj/item/picked_item)
 	target.name = initial(picked_item.name)
 	target.desc = initial(picked_item.desc)
 	target.icon_state = initial(picked_item.icon_state)
@@ -208,14 +208,14 @@
 
 	target.icon = initial(picked_item.icon)
 
-/datum/action/item_action/chameleon/change/Trigger(left_click)
+/datum/action/item_action/chameleon_change/Trigger(left_click)
 	if(!IsAvailable())
 		return
 
 	select_look(owner)
 	return 1
 
-/datum/action/item_action/chameleon/change/proc/emp_randomise(amount = EMP_RANDOMISE_TIME)
+/datum/action/item_action/chameleon_change/proc/emp_randomise(amount = EMP_RANDOMISE_TIME)
 	START_PROCESSING(SSprocessing, src)
 	random_look(owner)
 
@@ -223,7 +223,7 @@
 	if(new_value > emp_timer)
 		emp_timer = new_value
 
-/datum/action/item_action/chameleon/change/process()
+/datum/action/item_action/chameleon_change/process()
 	if(world.time > emp_timer)
 		STOP_PROCESSING(SSprocessing, src)
 		return
@@ -249,7 +249,7 @@
 		"Grey" = 'icons/mob/clothing/species/grey/under/color.dmi'
 		)
 
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/clothing/under/chameleon/Initialize(mapload)
 	. = ..()
@@ -301,7 +301,7 @@
 		"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
 	)
 
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/clothing/suit/chameleon/Initialize(mapload)
 	. = ..()
@@ -338,7 +338,7 @@
 		"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi'
 	)
 
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/clothing/glasses/chameleon/Initialize(mapload)
 	. = ..()
@@ -377,7 +377,7 @@
 	examine_extensions = list(EXAMINE_HUD_SECURITY_READ, EXAMINE_HUD_SECURITY_WRITE)
 	flash_protect = FLASH_PROTECTION_FLASH
 
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/clothing/glasses/hud/security/chameleon/Initialize(mapload)
 	. = ..()
@@ -402,7 +402,7 @@
 // for style
 // also its this typepath because random shit type checks based on the meson path
 /obj/item/clothing/glasses/meson/chameleon
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/clothing/glasses/meson/chameleon/Initialize(mapload)
 	. = ..()
@@ -431,7 +431,7 @@
 	resistance_flags = NONE
 	armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
 
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/clothing/gloves/chameleon/Initialize(mapload)
 	. = ..()
@@ -469,7 +469,7 @@
 		"Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi'
 	)
 
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/clothing/head/chameleon/Initialize(mapload)
 	. = ..()
@@ -514,7 +514,7 @@
 		"Grey" = 'icons/mob/clothing/species/grey/mask.dmi'
 	)
 
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/clothing/mask/chameleon/Initialize(mapload)
 	. = ..()
@@ -564,7 +564,7 @@
 	resistance_flags = NONE
 	armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
 
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/clothing/shoes/chameleon/Initialize(mapload)
 	. = ..()
@@ -600,7 +600,7 @@
 		"Vox" = 'icons/mob/clothing/species/vox/back.dmi'
 	)
 
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/storage/backpack/chameleon/Initialize(mapload)
 	. = ..()
@@ -624,7 +624,7 @@
 /obj/item/storage/belt/chameleon
 	name = "tool-belt"
 	desc = "Can hold various tools."
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/storage/belt/chameleon/Initialize(mapload)
 	. = ..()
@@ -648,7 +648,7 @@
 
 /obj/item/radio/headset/chameleon
 	name = "radio headset"
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/radio/headset/chameleon/Initialize(mapload)
 	. = ..()
@@ -671,7 +671,7 @@
 
 /obj/item/pda/chameleon
 	name = "PDA"
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/pda/chameleon/Initialize(mapload)
 	. = ..()
@@ -695,7 +695,7 @@
 
 /obj/item/stamp/chameleon
 	dye_color = DYE_RAINBOW
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/stamp/chameleon/Initialize(mapload)
 	. = ..()
@@ -712,7 +712,7 @@
 	. = ..()
 	chameleon_action.emp_randomise(INFINITY)
 
-/datum/action/item_action/chameleon/change/modsuit/update_item(obj/item/picked_item)
+/datum/action/item_action/chameleon_change/modsuit/update_item(obj/item/picked_item)
 	if(ismodcontrol(target))
 		var/obj/item/mod/control/C = target
 		C.current_disguise = FALSE
@@ -729,7 +729,7 @@
 		for(var/obj/item/mod/module/chameleon/tosignal in C.contents)
 			tosignal.RegisterSignal(C, COMSIG_MOD_ACTIVATE, TYPE_PROC_REF(/obj/item/mod/module/chameleon, return_look), TRUE)
 
-/datum/action/item_action/chameleon/change/modsuit/select_look(mob/user)
+/datum/action/item_action/chameleon_change/modsuit/select_look(mob/user)
 	if(ismodcontrol(target))
 		var/obj/item/mod/control/C = target
 		if(C.current_disguise) //backup check

code/modules/clothing/head/beret.dm

@@ -179,7 +179,7 @@
 
 
 //Special Roles
-/obj/item/clothing/head/beret/solgov/command
+/obj/item/clothing/head/beret/solgov
 	name = "\improper TSF Lieutenant's beret"
 	desc = "A beret worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant."
 	icon_state = "beret_solgovc"
@@ -188,7 +188,7 @@
 	armor = list(MELEE = 10, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 75)
 	strip_delay = 80
 
-/obj/item/clothing/head/beret/solgov/command/elite
+/obj/item/clothing/head/beret/solgov/elite
 	name = "\improper MARSOC Lieutenant's beret"
 	desc = "A beret worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. The insignia signifies the wearer bears the rank of a Lieutenant."
 	armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)

code/modules/clothing/masks/voicemodulator.dm

@@ -20,7 +20,7 @@
 	icon_state = "swat"
 	item_state = "swat"
 
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon_change/chameleon_action
 
 /obj/item/clothing/mask/gas/voice_modulator/chameleon/Initialize(mapload)
 	. = ..()

code/modules/clothing/suits/misc_suits.dm

@@ -840,7 +840,7 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 
 //Basic jacket and subtypes
-/obj/item/clothing/suit/greatcoat/sec
+/obj/item/clothing/suit/sec_greatcoat
 	name = "security greatcoat"
 	desc = "A wool-lined coat made from rugged materials that altogether make up to be a comfortable coat.\ GLORY TO ARSTOSKHA!!"
 	icon_state = "secgreatcoat"

code/modules/clothing/under/misc_jumpsuits.dm

@@ -58,7 +58,7 @@
 	item_state = "gy_suit"
 	item_color = "vice"
 
-/obj/item/clothing/under/misc/gimmick/rank/captain/suit
+/obj/item/clothing/under/misc/gimmick_captain_suit
 	name = "captain's suit"
 	desc = "A green suit and yellow necktie. Exemplifies authority."
 	icon_state = "green_suit"

code/modules/food_and_drinks/recipes/recipes_grill.dm

@@ -124,7 +124,7 @@
 	)
 	result = /obj/item/food/wingfangchu
 
-/datum/recipe/grill/human/kebab
+/datum/recipe/grill/human_kebab
 	items = list(
 		/obj/item/stack/rods,
 		/obj/item/food/meat/human,

code/modules/food_and_drinks/recipes/recipes_microwave.dm

@@ -293,7 +293,7 @@
 	)
 	result = /obj/item/food/donut/spaceman/jelly/cherry
 
-/datum/recipe/microwave/human/burger
+/datum/recipe/microwave/human_burger
 	items = list(
 		/obj/item/food/meat/human,
 		/obj/item/food/grown/lettuce,
@@ -312,7 +312,7 @@
 	items = list(
 		/obj/item/food/bun,
 		/obj/item/food/grown/lettuce,
-		/obj/item/food/meat //do not place this recipe before /datum/recipe/microwave/human/burger
+		/obj/item/food/meat //do not place this recipe before /datum/recipe/microwave/human_burger
 	)
 	result = /obj/item/food/burger/plain
 

code/modules/martial_arts/adminfu.dm

@@ -1,7 +1,7 @@
 /datum/martial_art/adminfu
 	name = "Way of the Dancing Admin"
 	has_explaination_verb = TRUE
-	combos = list(/datum/martial_combo/adminfu/healing_palm)
+	combos = list(/datum/martial_combo/healing_palm)
 	weight = 99999999 //Matt Malvor?
 
 /datum/martial_art/adminfu/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)

code/modules/martial_arts/combos/adminfu/healing_palm.dm

@@ -1,10 +1,10 @@
-/datum/martial_combo/adminfu/healing_palm
+/datum/martial_combo/healing_palm
 	name = "Healing Palm"
 	steps = list(MARTIAL_COMBO_STEP_GRAB, MARTIAL_COMBO_STEP_HELP)
 	explaination_text = "Heals or revives a creature."
 	combo_text_override = "Grab, switch hands, Help"
 
-/datum/martial_combo/adminfu/healing_palm/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
+/datum/martial_combo/healing_palm/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
 	user.do_attack_animation(target)
 	target.visible_message("<span class='warning'>[user] smacks [target] in the forehead!</span>")
 

code/modules/mining/equipment/explorer_gear.dm

@@ -125,7 +125,7 @@
 	resistance_flags = FIRE_PROOF
 	hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
 
-/obj/item/clothing/head/space/prisoner_gulag
+/obj/item/clothing/head/helmet/space/prisoner_gulag
 	name = "gulag helmet"
 	desc = "A metallic helmet designed to operate with the mining suit, while dense it offers little protection aside heat."
 	icon_state = "hardsuit_gulag"

code/modules/mob/living/carbon/alien/humanoid/humanoid_emote.dm

@@ -1,10 +1,10 @@
 /**
  * Emotes usable by humanoid xenomorphs.
  */
-/datum/emote/living/carbon/alien/humanoid
+/datum/emote/living/carbon/alien_humanoid
 	mob_type_allowed_typecache = list(/mob/living/carbon/alien/humanoid)
 
-/datum/emote/living/carbon/alien/humanoid/roar
+/datum/emote/living/carbon/alien_humanoid/roar
 	key = "roar"
 	key_third_person = "roars"
 	message = "roars!"
@@ -13,7 +13,7 @@
 	sound = "sound/voice/hiss5.ogg"
 	volume = 80
 
-/datum/emote/living/carbon/alien/humanoid/hiss
+/datum/emote/living/carbon/alien_humanoid/hiss
 	key = "hiss"
 	key_third_person = "hisses"
 	message = "hisses!"
@@ -22,7 +22,7 @@
 	sound = "sound/voice/hiss1.ogg"
 	volume = 30
 
-/datum/emote/living/carbon/alien/humanoid/gnarl
+/datum/emote/living/carbon/alien_humanoid/gnarl
 	key = "gnarl"
 	key_third_person = "gnarls"
 	message = "gnarls and shows its teeth."

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

@@ -168,7 +168,7 @@
 			to_chat(H, "<span class='warning'>You cannot weave a cocoon in your current state.</span>")
 			return
 		H.visible_message("<span class='notice'>[H] finishes weaving a cocoon!</span>", "<span class='notice'>You finish weaving your cocoon.</span>")
-		var/obj/structure/moth/cocoon/C = new(get_turf(H))
+		var/obj/structure/moth_cocoon/C = new(get_turf(H))
 		H.forceMove(C)
 		C.preparing_to_emerge = TRUE
 		H.apply_status_effect(STATUS_EFFECT_COCOONED)
@@ -181,14 +181,14 @@
 /**
  * Removes moth from cocoon, restores burnt wings
  */
-/datum/action/innate/cocoon/proc/emerge(obj/structure/moth/cocoon/C)
+/datum/action/innate/cocoon/proc/emerge(obj/structure/moth_cocoon/C)
 	for(var/mob/living/carbon/human/H in C.contents)
 		H.remove_status_effect(STATUS_EFFECT_COCOONED)
 		H.remove_status_effect(STATUS_EFFECT_BURNT_WINGS)
 	C.preparing_to_emerge = FALSE
 	qdel(C)
 
-/obj/structure/moth/cocoon
+/obj/structure/moth_cocoon
 	name = "\improper Nian cocoon"
 	desc = "Someone wrapped in a Nian cocoon."
 	icon = 'icons/effects/effects.dmi'
@@ -197,11 +197,11 @@
 	max_integrity = 60
 	var/preparing_to_emerge
 
-/obj/structure/moth/cocoon/Initialize(mapload)
+/obj/structure/moth_cocoon/Initialize(mapload)
 	. = ..()
 	icon_state = pick("cocoon1", "cocoon2", "cocoon3")
 
-/obj/structure/moth/cocoon/Destroy()
+/obj/structure/moth_cocoon/Destroy()
 	if(!preparing_to_emerge)
 		visible_message("<span class='danger'>[src] splits open from within!</span>")
 	else

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

@@ -1110,7 +1110,7 @@
 	max_amount = 25
 
 //Energy stack for landmines
-/datum/robot_storage/energy/janitor/landmine
+/datum/robot_storage/energy/jani_landmine
 	name = "Landmine Synthesizer"
 	statpanel_name = "Landmines"
 	max_amount = 4

code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm

@@ -54,7 +54,7 @@
 	add_language("Tkachi")
 	evolve_action.Grant(src)
 
-/mob/living/simple_animal/nian_caterpillar/proc/evolve(obj/structure/moth/cocoon/C, datum/mind/M)
+/mob/living/simple_animal/nian_caterpillar/proc/evolve(obj/structure/moth_cocoon/C, datum/mind/M)
 	if(stat != CONSCIOUS)
 		return FALSE
 
@@ -136,7 +136,7 @@
 	button_overlay_icon = 'icons/effects/effects.dmi'
 	button_overlay_icon_state = "cocoon1"
 
-/datum/action/innate/nian_caterpillar_emerge/proc/emerge(obj/structure/moth/cocoon/C)
+/datum/action/innate/nian_caterpillar_emerge/proc/emerge(obj/structure/moth_cocoon/C)
 	for(var/mob/living/carbon/human/H in C)
 		H.remove_status_effect(STATUS_EFFECT_COCOONED)
 		H.remove_status_effect(STATUS_EFFECT_BURNT_WINGS)
@@ -148,7 +148,7 @@
 
 	user.visible_message("<span class='notice'>[user] begins to hold still and concentrate on weaving a cocoon...</span>", "<span class='notice'>You begin to focus on weaving a cocoon... (This will take [COCOON_WEAVE_DELAY / 10] seconds, and you must hold still.)</span>")
 	if(do_after(user, COCOON_WEAVE_DELAY, FALSE, user))
-		var/obj/structure/moth/cocoon/C = new(get_turf(user))
+		var/obj/structure/moth_cocoon/C = new(get_turf(user))
 		var/datum/mind/H = user.mind
 		user.evolve(C, H)
 		addtimer(CALLBACK(src, PROC_REF(emerge), C), COCOON_EMERGE_DELAY, TIMER_UNIQUE)

code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm

@@ -45,7 +45,7 @@
 
 /mob/living/simple_animal/hostile/gorilla/Initialize(mapload)
 	. = ..()
-	var/datum/action/innate/gorilla/gorilla_toggle/toggle = new
+	var/datum/action/innate/gorilla_toggle/toggle = new
 	toggle.Grant(src)
 	var/static/default_cache = typecacheof(list(/obj/structure/closet/crate)) // Normal crates only please, no weird sized ones
 	carriable_cache = default_cache
@@ -54,14 +54,14 @@
 	LAZYCLEARLIST(crates_in_hand)
 	return ..()
 
-/datum/action/innate/gorilla/gorilla_toggle
+/datum/action/innate/gorilla_toggle
 	name = "Toggle Stand"
 	desc = "Toggles between crawling and standing up."
 	button_overlay_icon = 'icons/mob/actions/actions_animal.dmi'
 	button_overlay_icon_state = "gorilla_toggle"
 	check_flags = AB_CHECK_CONSCIOUS
 
-/datum/action/innate/gorilla/gorilla_toggle/Activate()
+/datum/action/innate/gorilla_toggle/Activate()
 	. = ..()
 	var/mob/living/simple_animal/hostile/gorilla/gorilla = owner
 	if(!istype(gorilla))

code/modules/mob/living/simple_animal/hostile/hellhound.dm

@@ -37,7 +37,7 @@
 
 /mob/living/simple_animal/hostile/hellhound/Initialize(mapload)
 	. = ..()
-	var/datum/action/innate/demon/whisper/whisper_action = new
+	var/datum/action/innate/demon_whisper/whisper_action = new
 	whisper_action.Grant(src)
 	ADD_TRAIT(src, TRAIT_NOBREATH, SPECIES_TRAIT)
 

code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm

@@ -24,7 +24,7 @@
 	name = "Short Horns"
 	icon_state = "short_horns"
 
-/datum/sprite_accessory/hairy/unathi/curled
+/datum/sprite_accessory/hair/unathi/curled
 	name = "Curled Horns"
 	icon_state = "curled_horns"
 

code/modules/mod/mod_control.dm

@@ -90,7 +90,7 @@
 	/// Is the jetpack on so we should make ion effects?
 	var/jetpack_active = FALSE
 	/// Cham option for when the cham module is installed.
-	var/datum/action/item_action/chameleon/change/modsuit/chameleon_action
+	var/datum/action/item_action/chameleon_change/modsuit/chameleon_action
 	/// Is the control unit disquised?
 	var/current_disguise = FALSE
 

code/modules/power/engines/singularity/particle_accelerator/particle_control.dm

@@ -26,7 +26,7 @@
 	var/list/obj/structure/particle_accelerator/connected_parts
 	var/assembled = 0
 	var/parts = null
-	var/datum/wires/particle_acc/control_box/wires = null
+	var/datum/wires/particle_accelerator/wires = null
 	/// Layout of the particle accelerator. Used by the UI
 	var/list/layout = list(
 		list(list("name" = "EM Containment Grid Left", "icon_state" = "emitter_right", "status" = "", "dir" = "1"), list("name" = "Blank1", "icon_state" = "blank", "status" = "good", "dir" = "1"), list("name" = "Blank2", "icon_state" = "blank", "status" = "good", "dir" = "1"), list("name" = "Blank3", "icon_state" = "blank", "status" = "good", "dir" = "1")),

code/modules/reagents/chemistry/reagents/drinks_reagents.dm

@@ -538,7 +538,7 @@
 	drink_desc = "Made with real grapes! Shocking!"
 	taste_description = "grape soda"
 
-/datum/reagent/consumable/drink/coco/icecoco
+/datum/reagent/consumable/drink/icecoco
 	name = "Iced Cocoa"
 	id = "icecoco"
 	description = "Hot cocoa and ice, refreshing and cool."

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -360,7 +360,7 @@
 	color = "#302000" // rgb: 48, 32, 0
 	taste_description = "oil"
 
-/datum/reagent/consumbale/olivepaste
+/datum/reagent/consumable/olivepaste
 	name = "Olive Paste"
 	id = "olivepaste"
 	description = "A mushy pile of freshly ground olives."

code/modules/response_team/ert.dm

@@ -308,12 +308,12 @@ GLOBAL_LIST_EMPTY(ert_request_messages)
 // -- AMBER TEAM --
 
 /datum/response_team/amber
-	engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/amber
-	security_outfit = /datum/outfit/job/centcom/response_team/security/amber
-	medical_outfit = /datum/outfit/job/centcom/response_team/medic/amber
-	command_outfit = /datum/outfit/job/centcom/response_team/commander/amber
-	janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/amber
-	paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/amber
+	engineering_outfit = /datum/outfit/job/response_team/engineer/amber
+	security_outfit = /datum/outfit/job/response_team/security/amber
+	medical_outfit = /datum/outfit/job/response_team/medic/amber
+	command_outfit = /datum/outfit/job/response_team/commander/amber
+	janitor_outfit = /datum/outfit/job/response_team/janitorial/amber
+	paranormal_outfit = /datum/outfit/job/response_team/paranormal/amber
 
 /datum/response_team/amber/announce_team()
 	if(silent)
@@ -323,12 +323,12 @@ GLOBAL_LIST_EMPTY(ert_request_messages)
 // -- RED TEAM --
 
 /datum/response_team/red
-	engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/red
-	security_outfit = /datum/outfit/job/centcom/response_team/security/red
-	medical_outfit = /datum/outfit/job/centcom/response_team/medic/red
-	command_outfit = /datum/outfit/job/centcom/response_team/commander/red
-	janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/red
-	paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/red
+	engineering_outfit = /datum/outfit/job/response_team/engineer/red
+	security_outfit = /datum/outfit/job/response_team/security/red
+	medical_outfit = /datum/outfit/job/response_team/medic/red
+	command_outfit = /datum/outfit/job/response_team/commander/red
+	janitor_outfit = /datum/outfit/job/response_team/janitorial/red
+	paranormal_outfit = /datum/outfit/job/response_team/paranormal/red
 	borg_path = /mob/living/silicon/robot/ert/red
 
 /datum/response_team/red/announce_team()
@@ -339,12 +339,12 @@ GLOBAL_LIST_EMPTY(ert_request_messages)
 // -- GAMMA TEAM --
 
 /datum/response_team/gamma
-	engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/gamma
-	security_outfit = /datum/outfit/job/centcom/response_team/security/gamma
-	medical_outfit = /datum/outfit/job/centcom/response_team/medic/gamma
-	command_outfit = /datum/outfit/job/centcom/response_team/commander/gamma
-	janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/gamma
-	paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/gamma
+	engineering_outfit = /datum/outfit/job/response_team/engineer/gamma
+	security_outfit = /datum/outfit/job/response_team/security/gamma
+	medical_outfit = /datum/outfit/job/response_team/medic/gamma
+	command_outfit = /datum/outfit/job/response_team/commander/gamma
+	janitor_outfit = /datum/outfit/job/response_team/janitorial/gamma
+	paranormal_outfit = /datum/outfit/job/response_team/paranormal/gamma
 	borg_path = /mob/living/silicon/robot/ert/gamma
 
 /datum/response_team/gamma/announce_team()
@@ -352,7 +352,7 @@ GLOBAL_LIST_EMPTY(ert_request_messages)
 		return
 	GLOB.major_announcement.Announce("Attention, [station_name()]. We are sending a code GAMMA elite Emergency Response Team. Standby.", "ERT En-Route")
 
-/datum/outfit/job/centcom/response_team
+/datum/outfit/job/response_team
 	name = "Response team"
 	var/rt_assignment = "Emergency Response Team Member"
 	var/rt_job = "This is a bug"

code/modules/response_team/ert_outfits.dm

@@ -1,6 +1,6 @@
 /* ERT OUTFIT DATUMS */
 
-/datum/outfit/job/centcom/response_team/imprint_idcard(mob/living/carbon/human/H)
+/datum/outfit/job/response_team/imprint_idcard(mob/living/carbon/human/H)
 	var/obj/item/card/id/W = H.wear_id
 	if(!istype(W))
 		return
@@ -15,7 +15,7 @@
 	if(H.mind && H.mind.initial_account && H.mind.initial_account.account_number)
 		W.associated_account_number = H.mind.initial_account.account_number
 
-/datum/outfit/job/centcom/response_team/imprint_pda(mob/living/carbon/human/H)
+/datum/outfit/job/response_team/imprint_pda(mob/living/carbon/human/H)
 	var/obj/item/pda/PDA = H.wear_pda
 	if(istype(PDA))
 		PDA.owner = H.real_name
@@ -23,14 +23,14 @@
 		PDA.ownrank = rt_assignment
 		PDA.name = "PDA-[H.real_name] ([PDA.ownjob])"
 
-/datum/outfit/job/centcom/response_team/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/job/response_team/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 
 	H.job = rt_mob_job
 
 //////////////////// COMMANDER ///////////////////
 
-/datum/outfit/job/centcom/response_team/commander
+/datum/outfit/job/response_team/commander
 	name = "RT Commander"
 	rt_assignment = "Emergency Response Team Leader"
 	rt_job = "Emergency Response Team Leader"
@@ -42,13 +42,13 @@
 	l_pocket = /obj/item/pinpointer
 	r_pocket = /obj/item/melee/classic_baton/telescopic
 
-/datum/outfit/job/centcom/response_team/commander/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/job/response_team/commander/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 
 	H.rename_character(null, "[pick("Lieutenant", "Captain", "Major")] [pick(GLOB.last_names)]")
 	H.age = rand(35, 45)
 
-/datum/outfit/job/centcom/response_team/commander/amber
+/datum/outfit/job/response_team/commander/amber
 	name = "RT Commander (Amber)"
 	shoes = /obj/item/clothing/shoes/combat
 	suit = /obj/item/clothing/suit/armor/vest/ert/command
@@ -63,7 +63,7 @@
 		/obj/item/flashlight = 1
 	)
 
-/datum/outfit/job/centcom/response_team/commander/red
+/datum/outfit/job/response_team/commander/red
 	name = "RT Commander (Red)"
 	shoes = /obj/item/clothing/shoes/combat
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/commander
@@ -89,7 +89,7 @@
 		/obj/item/bio_chip/death_alarm
 	)
 
-/datum/outfit/job/centcom/response_team/commander/gamma
+/datum/outfit/job/response_team/commander/gamma
 	name = "RT Commander (Gamma)"
 	shoes = /obj/item/clothing/shoes/magboots/elite
 	back = /obj/item/mod/control/pre_equipped/responsory/commander
@@ -120,7 +120,7 @@
 
 //////////////////// SECURITY ///////////////////
 
-/datum/outfit/job/centcom/response_team/security
+/datum/outfit/job/response_team/security
 	name = "RT Security"
 	rt_assignment = "Emergency Response Team Officer"
 	rt_job = "Emergency Response Team Officer"
@@ -131,7 +131,7 @@
 	pda = /obj/item/pda/heads/ert/security
 	id = /obj/item/card/id/ert/security
 
-/datum/outfit/job/centcom/response_team/security/amber
+/datum/outfit/job/response_team/security/amber
 	name = "RT Security (Amber)"
 	shoes = /obj/item/clothing/shoes/combat
 	suit = /obj/item/clothing/suit/armor/vest/ert/security
@@ -147,7 +147,7 @@
 		/obj/item/flashlight/seclite = 1
 	)
 
-/datum/outfit/job/centcom/response_team/security/red
+/datum/outfit/job/response_team/security/red
 	name = "RT Security (Red)"
 	shoes = /obj/item/clothing/shoes/combat
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/security
@@ -174,7 +174,7 @@
 		/obj/item/bio_chip/death_alarm
 	)
 
-/datum/outfit/job/centcom/response_team/security/gamma
+/datum/outfit/job/response_team/security/gamma
 	name = "RT Security (Gamma)"
 	shoes = /obj/item/clothing/shoes/magboots/elite
 	belt = /obj/item/storage/belt/security/response_team_gamma
@@ -208,7 +208,7 @@
 
 //////////////////// ENGINEER ///////////////////
 
-/datum/outfit/job/centcom/response_team/engineer
+/datum/outfit/job/response_team/engineer
 	name = "RT Engineer"
 	rt_assignment = "Emergency Response Team Engineer"
 	rt_job = "Emergency Response Team Engineer"
@@ -219,7 +219,7 @@
 	id = /obj/item/card/id/ert/engineering
 	belt = /obj/item/storage/belt/utility/chief/full
 
-/datum/outfit/job/centcom/response_team/engineer/amber
+/datum/outfit/job/response_team/engineer/amber
 	name = "RT Engineer (Amber)"
 	shoes = /obj/item/clothing/shoes/magboots
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer
@@ -243,7 +243,7 @@
 		/obj/item/organ/internal/eyes/cybernetic/shield
 	)
 
-/datum/outfit/job/centcom/response_team/engineer/red
+/datum/outfit/job/response_team/engineer/red
 	name = "RT Engineer (Red)"
 	shoes = /obj/item/clothing/shoes/magboots/advance
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma
@@ -272,7 +272,7 @@
 		/obj/item/bio_chip/death_alarm
 	)
 
-/datum/outfit/job/centcom/response_team/engineer/gamma
+/datum/outfit/job/response_team/engineer/gamma
 	name = "RT Engineer (Gamma)"
 	shoes = /obj/item/clothing/shoes/magboots/elite
 	back = /obj/item/mod/control/pre_equipped/responsory/engineer
@@ -305,7 +305,7 @@
 
 //////////////////// MEDIC ///////////////////
 
-/datum/outfit/job/centcom/response_team/medic
+/datum/outfit/job/response_team/medic
 	name = "RT Medic"
 	rt_assignment = "Emergency Response Team Medic"
 	rt_job = "Emergency Response Team Medic"
@@ -315,7 +315,7 @@
 	pda = /obj/item/pda/heads/ert/medical
 	id = /obj/item/card/id/ert/medic
 
-/datum/outfit/job/centcom/response_team/medic/amber
+/datum/outfit/job/response_team/medic/amber
 	name = "RT Medic (Amber)"
 	head = /obj/item/clothing/head/helmet/ert/medical
 	shoes = /obj/item/clothing/shoes/white
@@ -337,7 +337,7 @@
 		/obj/item/soap/nanotrasen = 1
 	)
 
-/datum/outfit/job/centcom/response_team/medic/red
+/datum/outfit/job/response_team/medic/red
 	name = "RT Medic (Red)"
 	rt_mob_job = "ERT Medical"
 	shoes = /obj/item/clothing/shoes/magboots
@@ -370,7 +370,7 @@
 		/obj/item/bio_chip/death_alarm
 	)
 
-/datum/outfit/job/centcom/response_team/medic/gamma
+/datum/outfit/job/response_team/medic/gamma
 	name = "RT Medic (Gamma)"
 	shoes = /obj/item/clothing/shoes/magboots/elite
 	glasses = /obj/item/clothing/glasses/night
@@ -407,7 +407,7 @@
 
 //////////////////// PARANORMAL ///////////////////
 
-/datum/outfit/job/centcom/response_team/paranormal
+/datum/outfit/job/response_team/paranormal
 	name = "RT Paranormal"
 	rt_assignment = "Emergency Response Team Inquisitor"
 	rt_job = "Emergency Response Team Inquisitor"
@@ -428,19 +428,19 @@
 		/obj/item/storage/bible = 1
 	)
 
-/datum/outfit/job/centcom/response_team/paranormal/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/job/response_team/paranormal/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(istype(H.mind))
 		ADD_TRAIT(H.mind, TRAIT_HOLY, ROUNDSTART_TRAIT)
 
-/datum/outfit/job/centcom/response_team/paranormal/amber
+/datum/outfit/job/response_team/paranormal/amber
 	name = "RT Paranormal (Amber)"
 	suit = /obj/item/clothing/suit/armor/vest/ert/security/paranormal
 	head = /obj/item/clothing/head/helmet/ert/security/paranormal
 	suit_store = /obj/item/gun/energy/disabler
 	r_pocket = /obj/item/nullrod
 
-/datum/outfit/job/centcom/response_team/paranormal/red
+/datum/outfit/job/response_team/paranormal/red
 	name = "RT Paranormal (Red)"
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal
 	suit_store = /obj/item/gun/energy/gun
@@ -464,7 +464,7 @@
 		/obj/item/bio_chip/death_alarm
 	)
 
-/datum/outfit/job/centcom/response_team/paranormal/gamma
+/datum/outfit/job/response_team/paranormal/gamma
 	name = "RT Paranormal (Gamma)"
 	l_pocket = /obj/item/grenade/clusterbuster/holy
 	back = /obj/item/mod/control/pre_equipped/responsory/inquisitory/chaplain
@@ -492,7 +492,7 @@
 
 //////////////////// JANITORIAL ///////////////////
 
-/datum/outfit/job/centcom/response_team/janitorial
+/datum/outfit/job/response_team/janitorial
 	name = "RT Janitor"
 	rt_assignment = "Emergency Response Team Janitor"
 	rt_job = "Emergency Response Team Janitor"
@@ -513,13 +513,13 @@
 		/obj/item/melee/flyswatter = 1
 	)
 
-/datum/outfit/job/centcom/response_team/janitorial/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/job/response_team/janitorial/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()
 	if(visualsOnly)
 		return
 	ADD_TRAIT(H, TRAIT_NEVER_MISSES_DISPOSALS, ROUNDSTART_TRAIT)
 
-/datum/outfit/job/centcom/response_team/janitorial/amber
+/datum/outfit/job/response_team/janitorial/amber
 	name = "RT Janitor (Amber)"
 	suit = /obj/item/clothing/suit/armor/vest/ert/janitor
 	head = /obj/item/clothing/head/helmet/ert/janitor
@@ -531,7 +531,7 @@
 		/obj/item/organ/internal/cyberimp/arm/janitorial/advanced
 	)
 
-/datum/outfit/job/centcom/response_team/janitorial/red
+/datum/outfit/job/response_team/janitorial/red
 	name = "RT Janitor (Red)"
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor
 	glasses = /obj/item/clothing/glasses/hud/janitor/sunglasses
@@ -550,7 +550,7 @@
 		/obj/item/bio_chip/death_alarm
 	)
 
-/datum/outfit/job/centcom/response_team/janitorial/gamma
+/datum/outfit/job/response_team/janitorial/gamma
 	name = "RT Janitor (Gamma)"
 	glasses = /obj/item/clothing/glasses/hud/janitor/night
 	back = /obj/item/mod/control/pre_equipped/responsory/janitor

code/modules/vehicle/tg_vehicles/scooter.dm

@@ -80,8 +80,8 @@
 
 /obj/tgvehicle/scooter/skateboard/generate_actions()
 	. = ..()
-	initialize_controller_action_type(/datum/action/vehicle/scooter/skateboard/ollie, VEHICLE_CONTROL_DRIVE)
-	initialize_controller_action_type(/datum/action/vehicle/scooter/skateboard/kickflip, VEHICLE_CONTROL_DRIVE)
+	initialize_controller_action_type(/datum/action/vehicle/skateboard/ollie, VEHICLE_CONTROL_DRIVE)
+	initialize_controller_action_type(/datum/action/vehicle/skateboard/kickflip, VEHICLE_CONTROL_DRIVE)
 
 /obj/tgvehicle/scooter/skateboard/post_buckle_mob(mob/living/M)//allows skateboards to be non-dense but still allows 2 skateboarders to collide with each other
 	set_density(TRUE)

code/modules/vehicle/tg_vehicles/tg_vehicle_actions.dm

@@ -198,13 +198,13 @@
 	vehicle_target = null
 	return ..()
 
-/datum/action/vehicle/scooter/skateboard/ollie
+/datum/action/vehicle/skateboard/ollie
 	name = "Ollie"
 	desc = "Get some air! Land on a table or fence to do a gnarly grind."
 	button_overlay_icon_state = "skateboard_ollie"
 	check_flags = AB_CHECK_CONSCIOUS
 
-/datum/action/vehicle/scooter/skateboard/ollie/Trigger(left_click)
+/datum/action/vehicle/skateboard/ollie/Trigger(left_click)
 	. = ..()
 	if(!.)
 		return
@@ -248,13 +248,13 @@
 	rider.pass_flags = old_pass
 	vehicle.pass_flags = old_v_pass
 
-/datum/action/vehicle/scooter/skateboard/kickflip
+/datum/action/vehicle/skateboard/kickflip
 	name = "Kickflip"
 	desc = "Kick your board up and catch it."
 	button_overlay_icon_state = "skateboard_ollie"
 	check_flags = AB_CHECK_CONSCIOUS
 
-/datum/action/vehicle/scooter/skateboard/kickflip/Trigger(left_click)
+/datum/action/vehicle/skateboard/kickflip/Trigger(left_click)
 	var/obj/tgvehicle/scooter/skateboard/board = vehicle_target
 	var/mob/living/rider = owner