Fulp 2.0 (#135)

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* all of our stuff

* reorganizes all the folders

* changing all the .dmi files

* The last of 'em

* updates readmes

* fix + readme

* haha revert

* Update fulp_defines.dm

* Create readme.MD

* fixes checks

* last commit was a lie

* Updated readmes

* modularizes mentorhelp + removes mentorhelp mute

* Update mentorhelp.dm

* More modularization?

* Fixes the server

* Update fulp_defines.dm

* Automatic changelog compile [ci skip]

* maybe fixes world

* Updates world

* Digi shoes :trollface:

* Update fulp_world.dm

* Update fulp_world.dm

* Update fulp_world.dm

* Update fulp_world.dm

* Update fulp_world.dm

* Update fulp_world.dm

* Update fulp_world.dm

* Update fulp_world.dm

* Update fulp_world.dm

* Update fulp_world.dm

* die die die

* fixes runtime

Co-authored-by: Changelogs <action@github.com>

code/__DEFINES/admin.dm

@@ -6,7 +6,6 @@
 #define MUTE_PRAY (1<<2)
 #define MUTE_ADMINHELP (1<<3)
 #define MUTE_DEADCHAT (1<<4)
-#define MUTE_MENTORHELP (1<<5) // Fulpstation Mentorhelp
 #define MUTE_ALL (~0)
 
 //Some constants for DB_Ban

code/__HELPERS/roundend.dm

@@ -220,7 +220,8 @@
 	for(var/client/C in GLOB.clients)
 		if(!C.credits)
 			C.RollCredits()
-		C.playcreditsmusic(40) // FULP - Yay, round-end music is back! src: C.playtitlemusic(40)
+//		C.playtitlemusic(40)
+		C.playcreditsmusic(40) // FULP - Yay, round-end music is back!
 		if(speed_round)
 			C.give_award(/datum/award/achievement/misc/speed_round, C.mob)
 		HandleRandomHardcoreScore(C)

code/___fulp_defines/fulp_defines.dm

@@ -3,29 +3,47 @@
  *	Therefore, Fulp DEFINES must all be placed in this folder, despite modularity.
  */
 
-/// Role defines
-#define ROLE_BLOODSUCKER "bloodsucker" // Bloodsuckers - Defines the role for preferences
-#define ROLE_MONSTERHUNTER "monster hunter" // Monster Hunters - Defines the role for preferences
+/*
+ *	Role Defines, used for Antagonist jobs.
+ */
+/// Bloodsuckers - Defines the role for preferences
+#define ROLE_BLOODSUCKER "bloodsucker"
+/// Monster Hunters - Defines the role for preferences
+#define ROLE_MONSTERHUNTER "monster hunter"
 
-/// Source Traits
-#define BLOODSUCKER_TRAIT "bloodsucker" // Source trait for Bloodsuckers/Monster Hunters/Vassals
+/*
+ *	Source Trait Defines
+ */
+/// Source trait for Bloodsuckers/Monster Hunters/Vassals
+#define BLOODSUCKER_TRAIT "bloodsucker"
 
-/// Human sub-species defines
-#define isbeefman(A) (is_species(A,/datum/species/beefman))
-
-/// Martial art defines
+/*
+ *	Martial art Defines
+ */
+/// Used in hunterfu.dm
 #define MARTIALART_HUNTERFU "hunter-fu"
+/// Used in deputy_block.dm
 #define MARTIALART_DEPUTYBLOCK "deputy block"
 
-/// Bloodsucker defines
-#define TRAIT_NORUNNING "norunning" // You walk!
-#define TRAIT_NOPULSE "nopulse" // Your heart doesn't beat.
-#define TRAIT_MASQUERADE "masquerade" // Falsifies Health analyzers
-#define TRAIT_COLDBLOODED "coldblooded"	// Your body is literal room temperature. Does not make you immune to the temp.
-#define COMSIG_LIVING_BIOLOGICAL_LIFE "biological_life" // Used for Bloodsucker's LifeTick() signal
+/*
+ *	Bloodsucker Defines
+ */
+/// You walk!
+#define TRAIT_NORUNNING "norunning"
+/// Your heart doesn't beat.
+#define TRAIT_NOPULSE "nopulse"
+/// Falsifies Health analyzers
+#define TRAIT_MASQUERADE "masquerade"
+/// Your body is literal room temperature. Does not make you immune to the temp.
+#define TRAIT_COLDBLOODED "coldblooded"
+/// Used for Bloodsucker's LifeTick() signal
+#define COMSIG_LIVING_BIOLOGICAL_LIFE "biological_life"
+/// Unused define, kept here in case Swain wants to use it.
 #define BLOODSUCKER_LEVEL_TO_EMBRACE 3
 
-/// Deputy defines
+/*
+ *	Deputy Defines
+ */
 #define TRAIT_ENGINEERINGDEPUTY "engineeringdeputy"
 #define TRAIT_MEDICALDEPUTY "medicaldeputy"
 #define TRAIT_SCIENCEDEPUTY "sciencedeputy"
@@ -34,5 +52,10 @@
 ///Used to assign the Service deputy, since TG doesnt have such a thing (Who knows why, its great!)
 #define SEC_DEPT_SERVICE "Service"
 
-/// Mentorhelp defines
+/*
+ *	Misc Defines
+ */
+/// Human sub-species defines
+#define isbeefman(A) (is_species(A,/datum/species/beefman))
+/// Defines the Mentorhelp's Mentorsay button
 #define COMSIG_KB_ADMIN_MSAY_DOWN "keybinding_mentor_msay_down"

code/controllers/subsystem/ticker.dm

@@ -730,9 +730,7 @@ SUBSYSTEM_DEF(ticker)
 	save_admin_data()
 	update_everything_flag_in_db()
 	if(!round_end_sound)
-		// FULP-ONLY STARTS - Adds a pointer to the new modular pick_round_end_sound() proc from Fulp's sound.dm
-		// Original code left in comment
-
+		// FULP EDIT STARTS - Adds a pointer to the new modular pick_round_end_sound() proc from Fulp's sound.dm - Original code left commented out.
 		round_end_sound = pick_round_end_sound()
 	/*
 		round_end_sound = pick(\
@@ -747,8 +745,7 @@ SUBSYSTEM_DEF(ticker)
 		'sound/roundend/petersondisappointed.ogg',
 		'sound/roundend/bully2.ogg'\
 		)
-		*/
-		// FULP-ONLY ENDS
+	*/ 	// FULP-ONLY ENDS
 	///The reference to the end of round sound that we have chosen.
 	var/sound/end_of_round_sound_ref = sound(round_end_sound)
 	for(var/mob/M in GLOB.player_list)

code/game/objects/items/implants/implant_mindshield.dm

@@ -26,8 +26,6 @@
 		if(target.mind.has_antag_datum(/datum/antagonist/brainwashed))
 			target.mind.remove_antag_datum(/datum/antagonist/brainwashed)
 			deconverted = TRUE
-		if(target.mind.has_antag_datum(/datum/antagonist/vassal)) // Fulpstation Bloodsuckers
-			SSticker.mode.remove_vassal(target.mind)
 
 		if(target.mind.has_antag_datum(/datum/antagonist/rev/head)|| target.mind.unconvertable)
 			if(!silent)

code/game/world.dm

@@ -49,7 +49,6 @@ GLOBAL_VAR(restart_counter)
 	config.Load(params[OVERRIDE_CONFIG_DIRECTORY_PARAMETER])
 
 	load_admins()
-	load_mentors() // FULP - Mentorhelp
 
 	//SetupLogs depends on the RoundID, so lets check
 	//DB schema and set RoundID if we can
@@ -279,8 +278,6 @@ GLOBAL_VAR(restart_counter)
 
 /world/proc/update_status()
 
-	status = update_status_fulp()  // FULPSTATION Use our code and bail!
-	/*
 	var/list/features = list()
 
 	if(GLOB.master_mode)
@@ -330,7 +327,7 @@ GLOBAL_VAR(restart_counter)
 		s += ": [jointext(features, ", ")]"
 
 	status = s
-*/
+
 /world/proc/update_hub_visibility(new_visibility)
 	if(new_visibility == GLOB.hub_visibility)
 		return

code/modules/admin/admin.dm

@@ -105,7 +105,6 @@
 		body += "<A href='?_src_=holder;[HrefToken()];mute=[M.ckey];mute_type=[MUTE_OOC]'><font color='[(muted & MUTE_OOC)?"red":"blue"]'>OOC</font></a> | "
 		body += "<A href='?_src_=holder;[HrefToken()];mute=[M.ckey];mute_type=[MUTE_PRAY]'><font color='[(muted & MUTE_PRAY)?"red":"blue"]'>PRAY</font></a> | "
 		body += "<A href='?_src_=holder;[HrefToken()];mute=[M.ckey];mute_type=[MUTE_ADMINHELP]'><font color='[(muted & MUTE_ADMINHELP)?"red":"blue"]'>ADMINHELP</font></a> | "
-		body += "<A href='?_src_=holder;[HrefToken()];mute=[M.ckey];mute_type=[MUTE_MENTORHELP]'><font color='[(muted & MUTE_MENTORHELP)?"red":"blue"]'>MHELP</font></a> | " // Fulpstation Mentorhelp
 		body += "<A href='?_src_=holder;[HrefToken()];mute=[M.ckey];mute_type=[MUTE_DEADCHAT]'><font color='[(muted & MUTE_DEADCHAT)?"red":"blue"]'>DEADCHAT</font></a>\]"
 		body += "(<A href='?_src_=holder;[HrefToken()];mute=[M.ckey];mute_type=[MUTE_ALL]'><font color='[(muted & MUTE_ALL)?"red":"blue"]'>toggle all</font></a>)"
 

code/modules/admin/verbs/randomverbs.dm

@@ -228,9 +228,6 @@
 		if(MUTE_DEADCHAT)
 			mute_string = "deadchat and DSAY"
 			feedback_string = "Deadchat"
-		if(MUTE_MENTORHELP) // Fulpstation Mentorhelp
-			mute_string = "mhelp"
-			feedback_string = "Mentor Help"
 		if(MUTE_ALL)
 			mute_string = "everything"
 			feedback_string = "Everything"

code/modules/client/preferences.dm

@@ -350,7 +350,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 				dat += "<span style='border: 1px solid #161616; background-color: #[features["ethcolor"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=color_ethereal;task=input'>Change</a><BR>"
 
-			if(istype(pref_species, /datum/species/beefman)) // [FULP EDIT START] Yeah we did the same as Ethereal so sue us
+			if(istype(pref_species, /datum/species/beefman)) // FULP EDIT START Yeah we did the same as Ethereal so sue us
 				if(!use_skintones)
 					dat += APPEARANCE_CATEGORY_COLUMN
 				// Fill Empties
@@ -363,7 +363,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "<a href='?_src_=prefs;preference=mouth_beef;task=input'>[features["beefmouth"]]</a><BR>"
 
 //			if((EYECOLOR in pref_species.species_traits) && !(NOEYESPRITES in pref_species.species_traits))
-			if((EYECOLOR in pref_species.species_traits)) // [FULP EDIT ENDS]  If we want Eye Color, let it show eye color. Maybe we want eye color to affect something else? (Beef Eyes) && !(NOEYESPRITES in pref_species.species_traits))
+			if((EYECOLOR in pref_species.species_traits)) // FULP EDIT ENDS  If we want Eye Color, let it show eye color. Maybe we want eye color to affect something else? (Beef Eyes) && !(NOEYESPRITES in pref_species.species_traits))
 
 				if(!use_skintones && !mutant_colors)
 					dat += APPEARANCE_CATEGORY_COLUMN
@@ -1449,7 +1449,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(new_etherealcolor)
 						features["ethcolor"] = GLOB.color_list_ethereal[new_etherealcolor]
 
-				if("color_beef") // [FULP EDIT START] We are copying Ethereal
+				if("color_beef") // FULP EDIT START We are copying Ethereal
 					var/new_beefcolor = input(user, "Select your doneness:", "Character Preference") as null|anything in GLOB.color_list_beefman
 					if(new_beefcolor)
 						features["beefcolor"] = GLOB.color_list_beefman[new_beefcolor]
@@ -1460,7 +1460,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				if("mouth_beef")
 					var/new_mouth = input(user, "Choose your Mouth:", "Character Preference")  as null|anything in GLOB.mouths_beefman
 					if(new_mouth)
-						features["beefmouth"] = new_mouth // [FULP EDIT END]
+						features["beefmouth"] = new_mouth // FULP EDIT END
 
 				if("tail_lizard")
 					var/new_tail

code/modules/jobs/jobs.dm

@@ -60,6 +60,10 @@ GLOBAL_LIST_INIT(security_positions, list(
 	"Head of Security",
 	"Warden",
 	"Detective",
+	/// FULP JOBS EDIT - Adding our jobs to the list
+	"Brig Physician",
+	"Deputy",
+	/// FULP EDIT ENDS
 	"Security Officer"))
 
 /// These aren't defacto jobs, but are the special departmental variants for sec officers.
@@ -67,6 +71,13 @@ GLOBAL_LIST_INIT(security_sub_positions, list(
 	"Security Officer (Cargo)",
 	"Security Officer (Engineering)",
 	"Security Officer (Medical)",
+	/// FULP JOBS EDIT - Adding our jobs to the list, and we're not trusting trailing commas here.
+	"Deputy (Engineering)",
+	"Deputy (Supply)",
+	"Deputy (Science)",
+	"Deputy (Medical)",
+	"Deputy (Service)",
+	/// FULP EDIT ENDS
 	"Security Officer (Science)",
 ))
 

code/modules/mob/dead/new_player/new_player.dm

@@ -337,7 +337,8 @@
 		if(!arrivals_docked)
 			var/atom/movable/screen/splash/Spl = new(character.client, TRUE)
 			Spl.Fade(TRUE)
-			character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25)
+//			character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25)
+			character.playsound_local(get_turf(character), 'fulp_modules/fulp_configs/sound/ApproachingFulp.ogg', 25) // Fulpstation Config edit - Use our latejoining sound instead
 
 		character.update_parallax_teleport()
 

code/modules/surgery/bodyparts/_bodyparts.dm

@@ -847,7 +847,7 @@
 //			limb.icon = 'icons/mob/human_parts_greyscale.dmi'
 			switch(species_id) // [FULP EDIT STARTS]
 				if("beefman") //If we ever add more unique races - this should be a list of them.
-					limb.icon = 'fulp_modules/beefman_port/icons/mob/beefman_bodyparts.dmi'
+					limb.icon = 'fulp_modules/main_features/beefmen/icons/mob/beefman_bodyparts.dmi'
 				else
 					limb.icon = 'icons/mob/human_parts_greyscale.dmi'// [FULP EDIT END]
 			if(should_draw_gender)
@@ -870,7 +870,7 @@
 //		limb.icon = icon
 		switch(species_id) // [FULP EDIT STARTS]
 			if("beefman")
-				limb.icon = 'fulp_modules/beefman_port/icons/mob/beefman_bodyparts.dmi'
+				limb.icon = 'fulp_modules/main_features/beefmen/icons/mob/beefman_bodyparts.dmi'
 			else
 				limb.icon = 'icons/mob/human_parts.dmi' // [FULP EDIT END]
 		limb.icon_state = "[body_zone]" //Inorganic limbs are agender

fulp_modules/ZFulpcode/readme.MD

@@ -1,6 +1,6 @@
-## Code Overwrites
+# Code Overwrites
 
-### Description:
+## Description:
 
 Code Overwrites allow us to edit a TG File without directly interacting with it. Please use this to overwrite files, as to avoid conflicts.
 Bonus points if you document it and make it modular so we know where to find which overwrites.

fulp_modules/edits/container_init/readme.MD

@@ -0,0 +1,5 @@
+# Folder: container_init
+
+## Description:
+
+	This file is meant for modularly adding items to vending machines and lockers.

fulp_modules/edits/readme.MD

@@ -0,0 +1,5 @@
+# Folder: Edits
+
+## Description:
+
+	This file is for all PRs that simply edit TG stuff, and isnt its own folder.

fulp_modules/features/barsigns/barsigns.dm

@@ -5,46 +5,46 @@
 /// Redirect our barsigns to use OUR .dmi file instead.
 /obj/structure/sign/barsign/set_sign(datum/barsign/sign)
 	. = ..()
-	icon = sign.fulpbarsign ? 'fulp_modules/barsigns_port/barsigns.dmi' : 'icons/obj/barsigns.dmi'
+	icon = sign.fulpbarsign ? 'fulp_modules/features/barsigns/barsigns.dmi' : 'icons/obj/barsigns.dmi'
 
 /// Barsigns!
 /datum/barsign/bassproshots
-	fulpbarsign = 'fulp_modules/barsigns_port/barsigns.dmi'
+	fulpbarsign = 'fulp_modules/features/barsigns/barsigns.dmi'
 	name = "Bass Pro Shots"
 	icon = "bassproshots"
 	desc = "When the Nuke Ops all come down all they really wanna see is the bar by the kitchen down in Space Station 13."
 	hidden = FALSE
 
 /datum/barsign/franksmeatshop
-	fulpbarsign = 'fulp_modules/barsigns_port/barsigns.dmi'
+	fulpbarsign = 'fulp_modules/features/barsigns/barsigns.dmi'
 	name = "Franks Meat Shop"
 	icon = "franksmeatshop"
 	desc = "Home to the valid salad"
 	hidden = FALSE
 
 /datum/barsign/thefulpmoment
-	fulpbarsign = 'fulp_modules/barsigns_port/barsigns.dmi'
+	fulpbarsign = 'fulp_modules/features/barsigns/barsigns.dmi'
 	name = "The Fulp Moment"
 	icon = "thefulpmoment"
 	desc = "The Problems of the Future, Today!"
 	hidden = FALSE
 
 /datum/barsign/thebluespacediner
-	fulpbarsign = 'fulp_modules/barsigns_port/barsigns.dmi'
+	fulpbarsign = 'fulp_modules/features/barsigns/barsigns.dmi'
 	name = "The Blue Space Diner"
 	icon = "thebluespacediner"
 	desc = "Don't slip on the blue banana!"
 	hidden = FALSE
 
 /datum/barsign/thegoldroom
-	fulpbarsign = 'fulp_modules/barsigns_port/barsigns.dmi'
+	fulpbarsign = 'fulp_modules/features/barsigns/barsigns.dmi'
 	name = "The Gold Room"
 	icon = "thegoldroom"
 	desc = "The finest rum in the galaxy."
 	hidden = FALSE
 
 /datum/barsign/theeldritchhorror
-	fulpbarsign = 'fulp_modules/barsigns_port/barsigns.dmi'
+	fulpbarsign = 'fulp_modules/features/barsigns/barsigns.dmi'
 	name = "The Eldritch Horror"
 	icon = "theeldritchhorror"
 	desc = "This bar is praised for reasons far beyond your mortal understanding, but hey, the drinks are insane."

fulp_modules/features/ert/code/hardsuits.dm

@@ -3,8 +3,8 @@
 /obj/item/clothing/head/helmet/space/hardsuit/ert/commandermed
 	name = "medical emergency response team commander helmet"
 	desc = "The integrated helmet of an ERT hardsuit, belonging to a Specialized Chief Medical Officer. It has a built-in Security hud."
-	worn_icon = 'fulp_modules/departmental_ert/icons/hardsuit_worn.dmi'
-	icon = 'fulp_modules/departmental_ert/icons/hardsuit.dmi'
+	worn_icon = 'fulp_modules/features/ert/icons/hardsuit_worn.dmi'
+	icon = 'fulp_modules/features/ert/icons/hardsuit.dmi'
 	icon_state = "hardsuit0-medert_commander"
 	hardsuit_type = "medert_commander"
 
@@ -25,8 +25,8 @@
 /obj/item/clothing/suit/space/hardsuit/ert/commandermed
 	name = "medical emergency response team commander hardsuit"
 	desc = "The standard issue hardsuit of the ERT, belonging to a Specialized Chief Medical Officer. Offers superb protection against environmental hazards."
-	worn_icon = 'fulp_modules/departmental_ert/icons/hardsuit_worn.dmi'
-	icon = 'fulp_modules/departmental_ert/icons/hardsuit.dmi'
+	worn_icon = 'fulp_modules/features/ert/icons/hardsuit_worn.dmi'
+	icon = 'fulp_modules/features/ert/icons/hardsuit.dmi'
 	inhand_icon_state = "ert_medical"
 	icon_state = "medert_commander"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/commandermed
@@ -36,8 +36,8 @@
 /obj/item/clothing/head/helmet/space/hardsuit/ert/commandersec
 	name = "security emergency response team commander helmet"
 	desc = "The integrated helmet of an ERT hardsuit, belonging to a Specialized Head of Security. It has a built-in Security hud."
-	worn_icon = 'fulp_modules/departmental_ert/icons/hardsuit_worn.dmi'
-	icon = 'fulp_modules/departmental_ert/icons/hardsuit.dmi'
+	worn_icon = 'fulp_modules/features/ert/icons/hardsuit_worn.dmi'
+	icon = 'fulp_modules/features/ert/icons/hardsuit.dmi'
 	icon_state = "hardsuit-secert_commander"
 	hardsuit_type = "secert_commander"
 	actions_types = list()
@@ -59,8 +59,8 @@
 /obj/item/clothing/suit/space/hardsuit/ert/commandersec
 	name = "security emergency response team commander hardsuit"
 	desc = "The standard issue hardsuit of the ERT, belonging to a Specialized Head of Security. Offers protection against enviromental hazards, along with protection to shoves."
-	worn_icon = 'fulp_modules/departmental_ert/icons/hardsuit_worn.dmi'
-	icon = 'fulp_modules/departmental_ert/icons/hardsuit.dmi'
+	worn_icon = 'fulp_modules/features/ert/icons/hardsuit_worn.dmi'
+	icon = 'fulp_modules/features/ert/icons/hardsuit.dmi'
 	inhand_icon_state = "ert_security"
 	icon_state = "secert_commander"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/commandersec
@@ -71,8 +71,8 @@
 /obj/item/clothing/head/helmet/space/hardsuit/ert/commandereng
 	name = "engineering emergency response team commander helmet"
 	desc = "The integrated helmet of an ERT hardsuit, belonging to a Specialized Chief Engineer. It has a built-in Security hud."
-	worn_icon = 'fulp_modules/departmental_ert/icons/hardsuit_worn.dmi'
-	icon = 'fulp_modules/departmental_ert/icons/hardsuit.dmi'
+	worn_icon = 'fulp_modules/features/ert/icons/hardsuit_worn.dmi'
+	icon = 'fulp_modules/features/ert/icons/hardsuit.dmi'
 	icon_state = "hardsuit0-engert_commander"
 	hardsuit_type = "engert_commander"
 
@@ -93,8 +93,8 @@
 /obj/item/clothing/suit/space/hardsuit/ert/commandereng
 	name = "engineering emergency response team commander hardsuit"
 	desc = "The standard issue hardsuit of the ERT, belonging to a Specialized Chief Engineer. Offers superb protection against environmental hazards."
-	worn_icon = 'fulp_modules/departmental_ert/icons/hardsuit_worn.dmi'
-	icon = 'fulp_modules/departmental_ert/icons/hardsuit.dmi'
+	worn_icon = 'fulp_modules/features/ert/icons/hardsuit_worn.dmi'
+	icon = 'fulp_modules/features/ert/icons/hardsuit.dmi'
 	inhand_icon_state = "ert_engineer"
 	icon_state = "engert_commander"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/commandereng
@@ -104,16 +104,16 @@
 /obj/item/clothing/head/helmet/space/hardsuit/ert/clown/commander
 	name = "clown emergency response team commander helmet"
 	desc = "The integrated helmet of an ERT hardsuit, this one is colourful, with a green visor!"
-	worn_icon = 'fulp_modules/departmental_ert/icons/hardsuit_worn.dmi'
-	icon = 'fulp_modules/departmental_ert/icons/hardsuit.dmi'
+	worn_icon = 'fulp_modules/features/ert/icons/hardsuit_worn.dmi'
+	icon = 'fulp_modules/features/ert/icons/hardsuit.dmi'
 	icon_state = "hardsuit0-clownert_commander"
 	hardsuit_type = "clownert_commander"
 
 /obj/item/clothing/suit/space/hardsuit/ert/clown/commander
 	name = "clown emergency response team commander hardsuit"
 	desc = "The non-standard issue hardsuit of the Honk Prime, this one is colourful! Offers superb protection against environmental hazards. Does not offer superb protection against a ravaging crew."
-	worn_icon = 'fulp_modules/departmental_ert/icons/hardsuit_worn.dmi'
-	icon = 'fulp_modules/departmental_ert/icons/hardsuit.dmi'
+	worn_icon = 'fulp_modules/features/ert/icons/hardsuit_worn.dmi'
+	icon = 'fulp_modules/features/ert/icons/hardsuit.dmi'
 	icon_state = "clownert_commander"
 	inhand_icon_state = "ert_clown"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/clown/commander

fulp_modules/features/ert/code/procs.dm

@@ -1,7 +1,7 @@
 /datum/antagonist/ert/proc/engi_ert_alert()
 	if(prob(5))
 		// You get a sudden urge to build a NEW state-of-the-art supermatter chamber!
-		owner.current.playsound_local(get_turf(owner.current), 'fulp_modules/departmental_ert/sounds/home_depot.ogg', 100, FALSE, pressure_affected = FALSE)
+		owner.current.playsound_local(get_turf(owner.current), 'fulp_modules/features/ert/sounds/home_depot.ogg', 100, FALSE, pressure_affected = FALSE)
 
 /datum/antagonist/ert/proc/choose_medert_outfit()
 	var/mob/living/carbon/human/H = owner.current

fulp_modules/features/food/code/food.dm

@@ -1,7 +1,7 @@
 /obj/item/food/burger/catburger
 	name = "catburger"
 	desc = "Finally those catpeople are worth something!"
-	icon = 'fulp_modules/food/icon/food.dmi'
+	icon = 'fulp_modules/features/food/icons/food.dmi'
 	icon_state = "catburger"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("bun" = 4, "meat" = 2, "cat" = 2)
@@ -10,7 +10,7 @@
 /obj/item/food/bread/sausage
 	name = "sausagebread loaf"
 	desc = "Dont think about it"
-	icon = 'fulp_modules/food/icon/food.dmi'
+	icon = 'fulp_modules/features/food/icons/food.dmi'
 	icon_state = "sausagebread"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 10, /datum/reagent/consumable/nutriment/protein = 12)
 	tastes = list("bread" = 10, "meat" = 10)
@@ -22,7 +22,7 @@
 /obj/item/food/breadslice/sausage
 	name = "sausagebread slice"
 	desc = "A slice of delicious sausagebread."
-	icon = 'fulp_modules/food/icon/food.dmi'
+	icon = 'fulp_modules/features/food/icons/food.dmi'
 	icon_state = "sausagebreadslice"
 	foodtypes = GRAIN | MEAT
 	food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/nutriment/protein = 2.4)
@@ -31,7 +31,7 @@
 /obj/item/food/eggssausage
 	name = "egg with sausage"
 	desc = "Better than a single fried egg."
-	icon = 'fulp_modules/food/icon/food.dmi'
+	icon = 'fulp_modules/features/food/icons/food.dmi'
 	icon_state = "eggsausage"
 	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/nutriment = 4)
 	foodtypes = MEAT | FRIED | BREAKFAST

fulp_modules/features/fulp_clothing/digitigrade/code/digi_shoes.dm

@@ -4,9 +4,9 @@
 	name = "digitigrade laceup shoes"
 	desc = "Shoes for only the coldest-blooded of lawyers."
 	flags_inv = FULL_DIGITIGRADE
-	icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
 	icon_state = "digi_laceups"
-	worn_icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_feet.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_feet.dmi'
 
 ///Workboots
 
@@ -14,9 +14,9 @@
 	name = "digitigrade workboots"
 	desc = "Nanotrasen-issue Engineering lace-up work boots for the hardworking lizardfolk."
 	flags_inv = FULL_DIGITIGRADE
-	icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
 	icon_state = "digi_workboots"
-	worn_icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_feet.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_feet.dmi'
 
 ///Combat Boots
 
@@ -24,9 +24,9 @@
 	name = "digitigrade combat boots"
 	desc = "Robust combat boots especially for lizardmen. Perfect for walking over piled human corpses."
 	flags_inv = FULL_DIGITIGRADE
-	icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
 	icon_state = "digi_combats"
-	worn_icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_feet.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_feet.dmi'
 	resistance_flags = FIRE_PROOF
 	permeability_coefficient = 0.05
 	body_parts_covered = LEG_LEFT|LEG_RIGHT
@@ -38,9 +38,9 @@
 	name = "digitigrade jackboots"
 	desc = "Nanotrasen-issue lizard Security combat boots for lizard combat scenarios or lizard combat situations."
 	flags_inv = FULL_DIGITIGRADE
-	icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
 	icon_state = "digi_jackboots"
-	worn_icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_feet.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_feet.dmi'
 
 ///Clown Shoes
 
@@ -48,9 +48,9 @@
 	name = "digitigrade clown shoes"
 	desc = "Shoes of the sort made famous by acclaimed lizardman clown Pies-The-Janitor. Ctrl-click to toggle waddle dampeners."
 	flags_inv = FULL_DIGITIGRADE
-	icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
 	icon_state = "digi_clown"
-	worn_icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_feet.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_feet.dmi'
 
 ///Sandals
 
@@ -58,9 +58,9 @@
 	name = "digitigrade sandals"
 	desc = "Snugly fitting sandals for smugly dressed lizardfolk."
 	flags_inv = FULL_DIGITIGRADE
-	icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
 	icon_state = "digi_wizard"
-	worn_icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_feet.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_feet.dmi'
 
 ///Generic Shoes
 
@@ -68,9 +68,9 @@
 	name = "digitigrade brown shoes"
 	desc = "A pair of digitigrade brown shoes. Shame they don't come in more colours."
 	flags_inv = FULL_DIGITIGRADE
-	icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
 	icon_state = "digi_brown"
-	worn_icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_feet.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_feet.dmi'
 
 ///Magboots
 
@@ -78,10 +78,10 @@
 	name = "digitigrade magboots"
 	desc = "A custom-made variant set of magnetic boots, intended to ensure lizardfolk can safely perform EVA."
 	flags_inv = FULL_DIGITIGRADE
-	icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
 	icon_state = "digi_magboots0"
 	magboot_state = "digi_magboots"
-	worn_icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_feet.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_feet.dmi'
 
 /datum/design/digi_magboots
 	name = "Digitigrade Magnetic Boots"
@@ -99,9 +99,9 @@
 	name = "digitigrade mime shoes"
 	desc = "For the quiestest of lizardfolk."
 	flags_inv = FULL_DIGITIGRADE
-	icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
 	icon_state = "digi_mime"
-	worn_icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_feet.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_feet.dmi'
 
 ///Jump Boots
 
@@ -109,8 +109,8 @@
 	name = "digitigrade jump boots"
 	desc = "A specialized pair of combat boots with a built-in propulsion system for rapid foward movement. Customized for Digitigrade lizards."
 	flags_inv = FULL_DIGITIGRADE
-	icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_shoes.dmi'
 	icon_state = "digi_jumpboots"
-	worn_icon = 'fulp_modules/fulp_clothing/digitigrade/icons/digi_feet.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/digitigrade/icons/digi_feet.dmi'
 	resistance_flags = FIRE_PROOF
 	permeability_coefficient = 0.05

fulp_modules/features/fulp_clothing/wintercoats/code/wintercoats.dm

@@ -3,10 +3,10 @@
 /obj/item/clothing/suit/hooded/wintercoat/security/pris
 	name = "\improper prisoner's winter coat"
 	desc = "Made just for the times when the prison runs out of working space heaters."
-	icon = 'fulp_modules/fulp_clothing/wintercoats/icons/wintercoats_icons.dmi'
-	worn_icon = 'fulp_modules/fulp_clothing/wintercoats/icons/wintercoats.dmi'
-	lefthand_file = 'fulp_modules/fulp_clothing/wintercoats/icons/wintercoat_lefthand.dmi'
-	righthand_file = 'fulp_modules/fulp_clothing/wintercoats/icons/wintercoat_righthand.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/wintercoats/icons/wintercoats_icons.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/wintercoats/icons/wintercoats.dmi'
+	lefthand_file = 'fulp_modules/features/fulp_clothing/wintercoats/icons/wintercoat_lefthand.dmi'
+	righthand_file = 'fulp_modules/features/fulp_clothing/wintercoats/icons/wintercoat_righthand.dmi'
 	icon_state = "wintercoat_pris"
 	inhand_icon_state = "wintercoat_pris"
 	cold_protection = CHEST|GROIN|LEGS|ARMS
@@ -16,6 +16,6 @@
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/fulp/security/pris
 
 /obj/item/clothing/head/hooded/winterhood/fulp/security/pris
-	worn_icon = 'fulp_modules/fulp_clothing/wintercoats/icons/wintercoats.dmi'
-	icon = 'fulp_modules/fulp_clothing/wintercoats/icons/wintercoathoods.dmi'
+	worn_icon = 'fulp_modules/features/fulp_clothing/wintercoats/icons/wintercoats.dmi'
+	icon = 'fulp_modules/features/fulp_clothing/wintercoats/icons/wintercoathoods.dmi'
 	icon_state = "winterhood_pris"

fulp_modules/features/halloween_event/costumes_2019/centaur.dm

@@ -1,8 +1,8 @@
 /obj/item/clothing/suit/centaur
 	name = "centaur costume"
 	desc = "The prototypes required two or more participants to pilot the suit, but this advanced version only requires one."
-	icon = 'fulp_modules/halloween_event/costumes_2019/centaur_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/centaur_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/centaur_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/centaur_worn.dmi'
 	icon_state = "centaur"
 
 /obj/item/storage/box/halloween/edition_19/centaur

fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dm

@@ -2,14 +2,14 @@
 /obj/item/clothing/suit/hotdog
 	name = "Hotdog"
 	desc = "Hot Dawg."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "hotdog"
 
 /obj/item/clothing/head/hot_head
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
 	desc = "Hot Dawg."
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "hotdog_top"
 	dynamic_hair_suffix = ""
 	flags_inv = HIDEHAIR|HIDEEARS
@@ -25,14 +25,14 @@
 /obj/item/clothing/suit/ketchup
 	name = "Ketchup"
 	desc = "A soft plush ketchup bottle."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "ketchup"
 
 /obj/item/clothing/head/ketchup_head
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
 	desc = "A soft plush ketchup bottle."
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "ketchup_top"
 	dynamic_hair_suffix = ""
 	flags_inv = HIDEHAIR|HIDEEARS
@@ -48,14 +48,14 @@
 /obj/item/clothing/suit/mustard
 	name = "Mustard"
 	desc = "A soft plush mustard bottle."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "mustard"
 
 /obj/item/clothing/head/mustard_head
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
 	desc = "A soft plush mustard bottle."
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "mustard_top"
 	dynamic_hair_suffix = ""
 	flags_inv = HIDEHAIR|HIDEEARS
@@ -71,14 +71,14 @@
 /obj/item/clothing/suit/angel
 	name = "angel"
 	desc = "Heavenly Dress."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "angel"
 
 /obj/item/clothing/head/angel_halo
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
 	desc = "Heavenly Halo."
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "angel_halo"
 
 /obj/item/storage/box/halloween/edition_19/angel
@@ -92,14 +92,14 @@
 /obj/item/clothing/suit/devil
 	name = "Devil"
 	desc = "The one the only Devil."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "devil"
 
 /obj/item/clothing/head/devil_horns
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
 	desc = "The one the only Devil."
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "devil_horns"
 	dynamic_hair_suffix = ""
 
@@ -114,14 +114,14 @@
 /obj/item/clothing/suit/cat
 	name = "Cat suit"
 	desc = "You feel like you can slink everywhere now."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "cat"
 
 /obj/item/clothing/head/cat_head
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
 	desc = "You feel like you can slink everywhere now."
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "cat_ears"
 
 /obj/item/storage/box/halloween/edition_19/cat
@@ -135,16 +135,16 @@
 /obj/item/clothing/suit/space/hardsuit/toy/pumpkin
 	name = "Pumpkin"
 	desc = "The insides of a pumpkin a awkwardly warm and slimy."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "pumpkin"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/toy/pumpkin_top
 
 /obj/item/clothing/head/helmet/space/hardsuit/toy/pumpkin_top
 	name = "Pumpkin top"
 	desc = "The top of a pumpkin on the top of your head."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "pumpkin_top"
 
 /obj/item/storage/box/halloween/edition_19/pumpkin
@@ -157,15 +157,15 @@
 /obj/item/clothing/suit/skeleton
 	name = "Skeleton"
 	desc = "You are now Mr.Bones."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "skeleton"
 
 /obj/item/clothing/head/skull
 	name = "Skull"
 	desc = "A skull on your face."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "skull"
 	dynamic_hair_suffix = ""
 	flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR
@@ -182,8 +182,8 @@
 /obj/item/clothing/suit/spider
 	name = "Spider"
 	desc = "An unwieldy set of 8 limbs"
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "spider"
 
 /obj/item/storage/box/halloween/edition_19/spider
@@ -197,15 +197,15 @@
 /obj/item/clothing/suit/witch
 	name = "witch"
 	desc = "You've become the Wicked Witch of the West."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "witch"
 
 /obj/item/clothing/head/witch_hat
 	name = "Witch Head"
 	desc = "A green face and a pointy hat."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "witch_hat"
 	dynamic_hair_suffix = ""
 	flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR
@@ -222,15 +222,15 @@
 /obj/item/clothing/suit/sailor_moon
 	name = "Sailor moon leotard"
 	desc = "A magical girl leotard."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "sailormoon_suit"
 
 /obj/item/clothing/head/hat/moon_wig
 	name = "Sailor moon wig"
 	desc = "Hair that looks like a pair of meatballs and spaghetti."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "sailormoon_hair"
 	dynamic_hair_suffix = ""
 	flags_inv = HIDEHAIR|HIDEEARS
@@ -238,15 +238,15 @@
 /obj/item/clothing/gloves/moon_gloves
 	name = "Sailor moon golves"
 	desc = "In the name I will Punish you!"
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "sailormoon_gloves"
 
 /obj/item/clothing/shoes/moon_boots
 	name = "Sailor moon boots"
 	desc = "Boots for fighting evil by moonlight."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "sailormoon_boots"
 
 /obj/item/storage/box/halloween/edition_19/sailor_moon
@@ -262,36 +262,36 @@
 /obj/item/clothing/suit/tuxedo
 	name = "Tuxedo"
 	desc = "A dapper tux."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "tuxedomask_suit"
 
 /obj/item/clothing/head/hat/tuxedo_hat
 	name = "Top hat"
 	desc = "A dapper top hat."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "tuxedomask_hat"
 
 /obj/item/clothing/gloves/tuxedo_gloves
 	name = "Tuxedo gloves"
 	desc = "Don't prick your finger on that rose"
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "tuxedomask_gloves"
 
 /obj/item/clothing/shoes/tuxedo_shoes
 	name = "Dress shoes"
 	desc = "Dress shoes for a dapper tux."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "tuxedomask_shoes"
 
 /obj/item/clothing/mask/tuxedo_mask
 	name = "Dress shoes"
 	desc = "Dress shoes for a dapper tux."
-	icon = 'fulp_modules/halloween_event/costumes_2019/jo_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/jo_costumes.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/jo_costumes.dmi'
 	icon_state = "tuxedomask_mask"
 
 /obj/item/storage/box/halloween/edition_19/tuxedo

fulp_modules/features/halloween_event/costumes_2019/joseph_joestar.dm

@@ -1,8 +1,8 @@
 /obj/item/clothing/under/costume/tricksters_outfit
 	name = "trickster's vest and jeans"
 	desc = "Someone's ruined this vest by cutting slots in it."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "joseph_outfit"
 	body_parts_covered = CHEST|GROIN|LEGS
 	fitted = NO_FEMALE_UNIFORM
@@ -11,30 +11,30 @@
 /obj/item/clothing/head/tricksters_headband
 	name = "trickster's headband"
 	desc = "Smells like expired ceasar dressing."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "joseph_headband"
 	dynamic_hair_suffix = ""
 
 /obj/item/clothing/neck/scarf/tricksters_scarf
 	name = "trickster's scarf"
 	desc = "The real trick is that it's held in place with a stiff wire."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "joseph_scarf"
 
 /obj/item/clothing/shoes/tricksters_boots
 	name = "trickster's boots"
 	desc = "These help you Stand."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "joseph_boots"
 
 /obj/item/clothing/gloves/tricksters_gloves
 	name = "trickster's gloves"
 	desc = "Fingerless, to let you better pull tricks out of nowhere."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "joseph_gloves"
 
 /obj/item/storage/box/halloween/edition_19/tricksters

fulp_modules/features/halloween_event/costumes_2019/next_adventure.dm

@@ -1,8 +1,8 @@
 /obj/item/clothing/under/costume/nextadventure_uniform
 	name = "next adventure dress"
 	desc = "A dress perfectly designed to withstand oncoming magic projectile. Too bad the magic it can withstand is not the same as here."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "nextadventure_uniform"
 	fitted = NO_FEMALE_UNIFORM
 	body_parts_covered = CHEST|GROIN
@@ -10,15 +10,15 @@
 /obj/item/clothing/head/nextadventure_ears
 	name = "next adventure bunny ears"
 	desc = "A pair of bunny ears to fully attest how much you love bunnies (or perhaps that you are one?)."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "nextadventure_ears"
 
 /obj/item/clothing/shoes/nextadventure_boots
 	name = "next adventure boots"
 	desc = "A pair of long boots that are quite to keep your feets and legs in good condition after dodging magical bullets all day."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "nextadventure_boots"
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
 
@@ -26,8 +26,8 @@
 /obj/item/storage/belt/nextadventure_belt
 	name = "next adventure belt"
 	desc = "A nice double belt with some pockets, mainly used to carry your bunnylicious meal."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "nextadventure_belt"
 
 /obj/item/storage/belt/nextadventure_belt/ComponentInitialize()
@@ -47,14 +47,14 @@
 /obj/item/storage/backpack/nextadventure_fairy
 	name = "Ribbon"
 	desc = "A little fairy that can shoot ranged magic bolts. Too bad space is too far away from home, so she can only store items with magic."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
 	icon_state = "nextadventure_fairy"
 */
 
 /obj/item/reagent_containers/spray/hairdye_purple
 	name = "purple hair dye"
 	desc = "A spray can that contain a small amount of Polypyrylium Oligomers, usually used to heal lungs and bruises, but it also double as a nice purple hair dye."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
 	icon_state = "hairdye_purple"
 	inhand_icon_state = "hairdye_purple"
 	volume = 3

fulp_modules/features/halloween_event/costumes_2019/phantom_maid.dm

@@ -1,8 +1,8 @@
 /obj/item/clothing/under/costume/phantommaid_uniform
 	name = "phantom maid uniform"
 	desc = "A maid uniform once worn by a maid seeking the anwsers to what happened to her home. Come supplied with stockings."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "phantommaid_uniform"
 	fitted = NO_FEMALE_UNIFORM
 	body_parts_covered = CHEST|GROIN|LEGS
@@ -10,54 +10,54 @@
 /obj/item/clothing/head/phantommaid_headband
 	name = "phantom maid headband"
 	desc = "A headgear that clearly help establish the maid or how to assert your dominance as a maid."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "phantommaid_headband"
 
 
 /obj/item/clothing/neck/scarf/phantommaid_scarfshoulder
 	name = "phantom maid scarf and shoulder neckpiece"
 	desc = "A badly designed piece of a maid uniform that the maid wore as part of her uniform. The red (blood ?) stained scarf and the shoulders are stuck together."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "phantommaid_scarfshoulder"
 
 /obj/item/clothing/gloves/phantommaid_gloves
 	name = "phantom maid gloves"
 	desc = "A pair of silky white gloves to keep your hands free of the dirty work."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "phantommaid_gloves"
 
 /obj/item/clothing/glasses/phantommaid_eyes
 	name = "phantom maid eyes"
 	desc = "Some red contact lens that mimic the looks of the maid eyes. Red eyes (or blood shot eyes, your pick) are cool and make you look powerful or out for blood."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "phantommaid_eyes"
 
 /obj/item/clothing/suit/phantommaid_apron
 	name = "phantom maid apron"
 	desc = "An apron that helped the maid to protect herself."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "phantommaid_apron"
 
 /obj/item/clothing/shoes/phantommaid_shoes
 	name = "phantom maid stilettos"
 	desc = "A pair of red stilettos that surely keeped the maid's feets clean. Too bad the pointy part is only for show and doesnt actually make you taller."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "phantommaid_shoes"
 
 /obj/item/toy/phantommaid_knife
 	name = "toy red knife"
 	desc = "A red (bloodstained?) knife that as seen better days. Quite similar to the one the maid used to find what happened to her home."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
 	icon_state = "phantommaid_knife"
 	inhand_icon_state = "phantommaid_knife"
-	lefthand_file = 'fulp_modules/halloween_event/costumes_2019/phantomknife_l.dmi'
-	righthand_file = 'fulp_modules/halloween_event/costumes_2019/phantomknife_r.dmi'
+	lefthand_file = 'fulp_modules/features/halloween_event/costumes_2019/phantomknife_l.dmi'
+	righthand_file = 'fulp_modules/features/halloween_event/costumes_2019/phantomknife_r.dmi'
 	w_class = WEIGHT_CLASS_SMALL
 
 

fulp_modules/features/halloween_event/costumes_2019/sans.dm

@@ -1,8 +1,8 @@
 /obj/item/clothing/under/costume/sans
 	name = "a skeleton\'s hoodie"
 	desc = "A baggy, comfortable combination of a hoodie, tee and shorts. You can tell if you wear this you're gonna have a good time."
-	icon = 'fulp_modules/halloween_event/costumes_2019/sans_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/sans_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/sans_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/sans_worn.dmi'
 	icon_state = "sans"
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
@@ -10,8 +10,8 @@
 /obj/item/clothing/head/hardhat/sans
 	name = "massive foam skull"
 	desc = "What's this guy's name again? Sand? Sailsbury?"
-	icon = 'fulp_modules/halloween_event/costumes_2019/sans_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/sans_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/sans_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/sans_worn.dmi'
 	icon_state = "hardhat0_sans"
 	on = FALSE
 	hat_type = "sans"

fulp_modules/features/halloween_event/costumes_2019/solid_snake.dm

@@ -1,8 +1,8 @@
 /obj/item/clothing/under/costume/sneaking_suit
 	name = "sneaking suit"
 	desc = "The bleeding edge in military textile tech, with woven nanof- Oh wait no, it's a cheap costume."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "sneaking_jumpsuit"
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
@@ -10,16 +10,16 @@
 /obj/item/clothing/head/sneaking_bandanna
 	name = "sneaking bandanna"
 	desc = "Tactical, stylish, does not provide infinite ammo."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "sneaking_bandanna"
 
 /*
 /obj/item/clothing/accessory/sneaking_rig
 	name = "sneaking suit rig"
 	desc = "Do you think ergonomical storage solutions can bloom? Even on the battlefield? Notice: This item is a toy and not capable of ergonomic storage."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "sneaking_rig"
 	minimize_when_attached = FALSE
 */
@@ -27,23 +27,23 @@
 /obj/item/clothing/suit/sneaking_jacket
 	name = "sneaking suit tactical flak jacket"
 	desc = "Seems comfortable enough to wear for maybe one mission."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "sneaking_jacket"
 
 /obj/item/clothing/shoes/sneaking_boots
 	name = "sneaking boots"
 	desc = "Tactical espionage footwear."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "sneaking_boots"
 
 /*
 /obj/item/storage/belt/sneaking_belt
 	name = "sneaking belt"
 	desc = "Probably intended for tactically sneaking drinks and snacks into movie theatres."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "sneaking_belt"
 */
 

fulp_modules/features/halloween_event/costumes_2019/starship_troopers.dm

@@ -1,8 +1,8 @@
 /obj/item/clothing/under/costume/trooper_jumpsuit
 	name = "trooper jumpsuit"
 	desc = "Another snazzy number courtesy of fashionistas Heinlein & Verhoeven."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "starship_jumpsuit"
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
@@ -10,38 +10,38 @@
 /obj/item/clothing/head/trooper_helmet
 	name = "starship helmet"
 	desc = "Protects your precious brains from bugs, but more importantly from critical thinking."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "starship_helmet"
 
 /*
 /obj/item/storage/belt/trooper_belt
 	name = "mobile infantry belt"
 	desc = "Mostly useful for carrying propaganda leaflets."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "starship_belt"
 */
 
 /obj/item/clothing/shoes/trooper_shoes
 	name = "bug stomping boots"
 	desc = "Perfect for licking."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "starship_boots"
 
 /obj/item/clothing/gloves/trooper_gloves
 	name = "roughneck gloves"
 	desc = "Keep your hands clean even when you're elbow-deep in bug guts and fascism."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "starship_gloves"
 
 /obj/item/clothing/suit/trooper_armor
 	name = "terran body armor"
 	desc = "Designed to ensure your heart doesn't falter. Your liver, lungs and intestines, too."
-	icon = 'fulp_modules/halloween_event/costumes_2019/costumes_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/costumes_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/costumes_worn.dmi'
 	icon_state = "starship_suit"
 
 /obj/item/storage/box/halloween/edition_19/trooper

fulp_modules/features/halloween_event/costumes_2019/zero_suit.dm

@@ -2,8 +2,8 @@
 	name = "plastic bounty hunter's plugsuit"
 	desc = "A cheap plastic suit with zero practical use."
 	icon_state = "zerosuit"
-	icon = 'fulp_modules/halloween_event/costumes_2019/zerosuit_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/zerosuit_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/zerosuit_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/zerosuit_worn.dmi'
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	fitted = NO_FEMALE_UNIFORM
 	alternate_worn_layer = GLOVES_LAYER //copied blindly from mech jumpsuit lmao
@@ -26,8 +26,8 @@
 	name = "plastic bounty hunter's hardsuit"
 	desc = "It's variapparent that this is injection-moulded."
 	icon_state = "varia_suit"
-	icon = 'fulp_modules/halloween_event/costumes_2019/zerosuit_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/zerosuit_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/zerosuit_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/zerosuit_worn.dmi'
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/toy/varia
 
 
@@ -47,8 +47,8 @@
 	name = "plastic bounty hunter's helmet"
 	desc = "A cheap plastic helmet spring-loaded into the suit."
 	icon_state = "hardsuit0-varia" //hardsuit helmet code is weird - has to follow this format: 'hardsuit0-[hardsuit_type]' and have 'hardsuit1-[hardsuit_type]'' as the icon for the light-on ver
-	icon = 'fulp_modules/halloween_event/costumes_2019/zerosuit_icon.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/zerosuit_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/zerosuit_icon.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/zerosuit_worn.dmi'
 	hardsuit_type = "varia"
 
 //--Cannon
@@ -56,11 +56,11 @@
 	name = "foam force arm cannon"
 	desc = "The chozo manufacturing industry exports thousands of these things a year. Ages 8+"
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/arm_ball
-	icon = 'fulp_modules/halloween_event/costumes_2019/zerosuit_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/zerosuit_icon.dmi'
 	icon_state = "arm_cannon"
 	inhand_icon_state = "arm_cannon"
-	lefthand_file = 'fulp_modules/halloween_event/costumes_2019/zerosuit_lefthand.dmi'
-	righthand_file = 'fulp_modules/halloween_event/costumes_2019/zerosuit_righthand.dmi'
+	lefthand_file = 'fulp_modules/features/halloween_event/costumes_2019/zerosuit_lefthand.dmi'
+	righthand_file = 'fulp_modules/features/halloween_event/costumes_2019/zerosuit_righthand.dmi'
 	inhand_x_dimension = 32
 	inhand_y_dimension = 32
 	slot_flags = null
@@ -68,7 +68,7 @@
 /obj/item/ammo_casing/caseless/foam_dart/arm_ball
 	name = "small foam ball"
 	desc = "Eat this, space pirates!"
-	icon = 'fulp_modules/halloween_event/costumes_2019/zerosuit_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/zerosuit_icon.dmi'
 	projectile_type = /obj/projectile/bullet/reusable/foam_dart/arm_ball
 	icon_state = "ball"
 	caliber = "arm_ball"
@@ -80,7 +80,7 @@
 /obj/projectile/bullet/reusable/foam_dart/arm_ball
 	name = "small foam ball"
 	desc = "Eat this, space pirates!"
-	icon = 'fulp_modules/halloween_event/costumes_2019/zerosuit_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/zerosuit_icon.dmi'
 	icon_state = "ball"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/arm_ball
 

fulp_modules/features/halloween_event/costumes_2019/zombie_rider.dm

@@ -1,11 +1,11 @@
 /obj/item/clothing/suit/zombie_rider //Spookz
 	name = "Zombie Rider"
 	desc = "Tired of walking? Have your friendly slave zombie waddle you around!"
-	icon = 'fulp_modules/halloween_event/costumes_2019/zrider_icon.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2019/zrider_icon.dmi'
 	icon_state = "zombie_rider"
-	worn_icon = 'fulp_modules/halloween_event/costumes_2019/zrider_worn.dmi'
-	lefthand_file = 'fulp_modules/halloween_event/costumes_2019/zrheld_l.dmi'
-	righthand_file = 'fulp_modules/halloween_event/costumes_2019/zrheld_r.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2019/zrider_worn.dmi'
+	lefthand_file = 'fulp_modules/features/halloween_event/costumes_2019/zrheld_l.dmi'
+	righthand_file = 'fulp_modules/features/halloween_event/costumes_2019/zrheld_r.dmi'
 
 /obj/item/storage/box/halloween/edition_19/zombie
 	theme_name = "2019's Zombie"

fulp_modules/features/halloween_event/costumes_2020/2020_event.dm

@@ -24,7 +24,7 @@
 /obj/item/halloween_gift
 	name = "halloween package"
 	desc = "It looks like a box wrapped in some spooky paper"
-	icon = 'fulp_modules/halloween_event/costumes_2020/box.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/box.dmi'
 	icon_state = "halloween_gift"
 	inhand_icon_state = "gift"
 	resistance_flags = FLAMMABLE
@@ -102,7 +102,7 @@
 /obj/item/storage/box/halloween
 	name = "halloween box"
 	desc = "Costumes in a box."
-	icon = 'fulp_modules/halloween_event/costumes_2020/box.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/box.dmi'
 	icon_state = "halloween_box"
 	illustration = "pumpkin"
 	var/theme_name

fulp_modules/features/halloween_event/costumes_2020/asshole_costume.dm

@@ -2,8 +2,8 @@
 /obj/item/clothing/under/asshole_jumpsuit
 	name = "space asshole suit"
 	desc = "A faint smell sulphur, mars dust and free space terrorism."
-	icon = 'fulp_modules/halloween_event/costumes_2020/asshole_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/asshole_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/asshole_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/asshole_worn.dmi'
 	icon_state = "asshole_jumpsuit"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	fitted = FEMALE_UNIFORM_FULL
@@ -13,22 +13,22 @@
 /obj/item/clothing/suit/asshole_coat
 	name = "space asshole coat"
 	desc = "Covered in dust and blood. Allows for easy sledgehammer storage."
-	icon = 'fulp_modules/halloween_event/costumes_2020/asshole_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/asshole_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/asshole_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/asshole_worn.dmi'
 	icon_state = "asshole_coat"
 
 /obj/item/clothing/neck/asshole_scarf
 	name = "space asshole scarf"
 	desc = "Keep your neck warm on your martian guerrilla incursions."
-	icon = 'fulp_modules/halloween_event/costumes_2020/asshole_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/asshole_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/asshole_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/asshole_worn.dmi'
 	icon_state = "asshole_scarf"
 
 /obj/item/clothing/shoes/asshole_boots
 	name = "space asshole boots"
 	desc = "Stylish boots for stylish assholes."
-	icon = 'fulp_modules/halloween_event/costumes_2020/asshole_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/asshole_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/asshole_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/asshole_worn.dmi'
 	icon_state = "asshole_boots"
 
 /obj/item/storage/box/halloween/edition_20/space_asshole

fulp_modules/features/halloween_event/costumes_2020/chaosmage.dm

@@ -1,8 +1,8 @@
 /obj/item/clothing/under/chaosmage
 	name = "chaos mage tabard"
 	desc = "An old outfit which has lost its magical power. It is said that this belonged to a powerful mage."
-	icon = 'fulp_modules/halloween_event/costumes_2020/chaosmage_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/chaosmage_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/chaosmage_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/chaosmage_worn.dmi'
 	icon_state = "tabard"
 	fitted = FEMALE_UNIFORM_TOP
 	has_sensor = HAS_SENSORS
@@ -12,23 +12,23 @@
 /obj/item/clothing/suit/hooded/wintercoat/chaosmage
 	name = "chaos mage cloak"
 	desc = "A fancy purplish cloak with golden finitions. It keeps a bit warm for cold travels."
-	icon = 'fulp_modules/halloween_event/costumes_2020/chaosmage_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/chaosmage_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/chaosmage_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/chaosmage_worn.dmi'
 	icon_state = "cloak"
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/chaosmage
 
 /obj/item/clothing/head/hooded/winterhood/chaosmage
 	name = "chaos mage hood"
 	desc = "A comfy purplish hood with golden trim. Wear it to be more mysterious."
-	icon = 'fulp_modules/halloween_event/costumes_2020/chaosmage_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/chaosmage_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/chaosmage_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/chaosmage_worn.dmi'
 	icon_state = "hood"
 
 /obj/item/clothing/shoes/chaosmage
 	name = "chaos mage boots"
 	desc = "A pair of warm boots made of synthetic wool. Sadly, dashes are not included."
-	icon = 'fulp_modules/halloween_event/costumes_2020/chaosmage_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/chaosmage_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/chaosmage_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/chaosmage_worn.dmi'
 	icon_state = "boots"
 
 /obj/item/storage/box/halloween/edition_20/chaosmage

fulp_modules/features/halloween_event/costumes_2020/columbia.dm

@@ -2,8 +2,8 @@
 /obj/item/clothing/under/columbia
 	name = "Columbia's suit"
 	desc = "With a bit of a mind flip..."
-	icon = 'fulp_modules/halloween_event/costumes_2020/columbia_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/columbia_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/columbia_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/columbia_worn.dmi'
 	icon_state = "columbia"
 	body_parts_covered = CHEST|GROIN
 	fitted = NO_FEMALE_UNIFORM
@@ -14,29 +14,29 @@
 /obj/item/clothing/head/columbia
 	name = "Columbia's hat"
 	desc = "You're into a time slip..."
-	icon = 'fulp_modules/halloween_event/costumes_2020/columbia_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/columbia_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/columbia_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/columbia_worn.dmi'
 	icon_state = "columbia_hat"
 
 /obj/item/clothing/suit/columbia
 	name = "Columbia's jacket"
 	desc = "And nothing can ever be the same."
-	icon = 'fulp_modules/halloween_event/costumes_2020/columbia_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/columbia_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/columbia_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/columbia_worn.dmi'
 	icon_state = "columbia_jacket"
 
 /obj/item/clothing/neck/columbia
 	name = "Columbia's bow"
 	desc = "Let's do the time warp again!"
-	icon = 'fulp_modules/halloween_event/costumes_2020/columbia_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/columbia_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/columbia_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/columbia_worn.dmi'
 	icon_state = "columbia_bow"
 
 /obj/item/clothing/shoes/columbia
 	name = "Columbia's shoes"
 	desc = "It's just a jump to the left..."
-	icon = 'fulp_modules/halloween_event/costumes_2020/columbia_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/columbia_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/columbia_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/columbia_worn.dmi'
 	icon_state = "columbia_shoes"
 
 //--Box that contains the costumes

fulp_modules/features/halloween_event/costumes_2020/daft_frank.dm

@@ -2,8 +2,8 @@
 /obj/item/clothing/head/hardhat/golden_punk
 	name = "Guy-Manuel Helmet"
 	desc = "Give life back to music!"
-	icon = 'fulp_modules/halloween_event/costumes_2020/daft_frank_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/daft_frank_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/daft_frank_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/daft_frank_worn.dmi'
 	icon_state = "hardhat0_guy"
 	on = FALSE
 	hat_type = "guy"
@@ -16,8 +16,8 @@
 /obj/item/clothing/head/hardhat/silver_punk
 	name = "Thomas Helmet"
 	desc = "Reminds you of touch..."
-	icon = 'fulp_modules/halloween_event/costumes_2020/daft_frank_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/daft_frank_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/daft_frank_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/daft_frank_worn.dmi'
 	icon_state = "hardhat0_thomas"
 	on = FALSE
 	hat_type = "thomas"
@@ -29,8 +29,8 @@
 /obj/item/clothing/under/sparky
 	name = "The suit"
 	desc = "Harder, Better, Faster, Stronger!"
-	icon = 'fulp_modules/halloween_event/costumes_2020/daft_frank_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/daft_frank_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/daft_frank_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/daft_frank_worn.dmi'
 	icon_state = "the_suit"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	fitted = FEMALE_UNIFORM_FULL
@@ -41,15 +41,15 @@
 /obj/item/clothing/gloves/daft_golden
 	name = "insert name here"
 	desc = "A pair of sparky golden gloves."
-	icon = 'fulp_modules/halloween_event/costumes_2020/daft_frank_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/daft_frank_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/daft_frank_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/daft_frank_worn.dmi'
 	icon_state = "golden_gloves"
 
 /obj/item/clothing/gloves/daft_silver
 	name = "insert name here"
 	desc = "A pair of sparky silver gloves."
-	icon = 'fulp_modules/halloween_event/costumes_2020/daft_frank_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/daft_frank_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/daft_frank_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/daft_frank_worn.dmi'
 	icon_state = "silver_gloves"
 
 /obj/item/storage/box/halloween/edition_20/daft_box

fulp_modules/features/halloween_event/costumes_2020/devilfan.dm

@@ -1,8 +1,8 @@
 /obj/item/clothing/under/devilfan
 	name = "devil's body"
 	desc = "This is just red paint all over your body. And somehow it sticks well even after washing!"
-	icon = 'fulp_modules/halloween_event/costumes_2020/devilfan_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/devilfan_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/devilfan_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/devilfan_worn.dmi'
 	icon_state = "body"
 	fitted = FEMALE_UNIFORM_FULL
 	has_sensor = HAS_SENSORS
@@ -12,8 +12,8 @@
 /obj/item/clothing/head/devilfan
 	name = "devil's mask"
 	desc = "Are you finally revealing your true evil?"
-	icon = 'fulp_modules/halloween_event/costumes_2020/devilfan_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/devilfan_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/devilfan_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/devilfan_worn.dmi'
 	icon_state = "mask"
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
 	dynamic_hair_suffix = "+generic"
@@ -21,15 +21,15 @@
 /obj/item/clothing/shoes/devilfan
 	name = "devil's hooves"
 	desc = "It never skipped leg day! Look at those sturdy legs!"
-	icon = 'fulp_modules/halloween_event/costumes_2020/devilfan_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/devilfan_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/devilfan_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/devilfan_worn.dmi'
 	icon_state = "hooves"
 
 /obj/item/clothing/gloves/devilfan
 	name = "devil's hands"
 	desc = "Red paint to go with your hands. Why it isn't part of the suit is a mystery."
-	icon = 'fulp_modules/halloween_event/costumes_2020/devilfan_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/devilfan_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/devilfan_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/devilfan_worn.dmi'
 	icon_state = "hands"
 
 /obj/item/storage/box/halloween/edition_20/devilfan

fulp_modules/features/halloween_event/costumes_2020/forbidden_cowboy.dm

@@ -2,8 +2,8 @@
 /obj/item/clothing/under/forbidden_cowboy
 	name = "forbidden cowboy suit"
 	desc = "Just looking at this suit makes you hear a quiet bwoink at the back of you mind."
-	icon = 'fulp_modules/halloween_event/costumes_2020/forbiddencowboy_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/forbiddencowboy_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/forbiddencowboy_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/forbiddencowboy_worn.dmi'
 	icon_state = "forbiddencowboy_suit"
 	fitted = FEMALE_UNIFORM_FULL
 	has_sensor = HAS_SENSORS
@@ -13,8 +13,8 @@
 /obj/item/clothing/head/forbidden_cowboy
 	name = "forbidden cowboy hat"
 	desc = "Just looking at this hat makes you hear a quiet bwoink at the back of you mind."
-	icon = 'fulp_modules/halloween_event/costumes_2020/forbiddencowboy_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/forbiddencowboy_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/forbiddencowboy_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/forbiddencowboy_worn.dmi'
 	icon_state = "forbiddencowboy_hat"
 
 /obj/item/storage/box/halloween/edition_20/forbidden_cowboy

fulp_modules/features/halloween_event/costumes_2020/frog.dm

@@ -2,8 +2,8 @@
 /obj/item/clothing/under/frog_suit
 	name = "frog onesie"
 	desc = "A comfortable and snuggly animal onesie."
-	icon = 'fulp_modules/halloween_event/costumes_2020/frog_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/frog_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/frog_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/frog_worn.dmi'
 	icon_state = "frog_suit"
 	fitted = FEMALE_UNIFORM_FULL
 	has_sensor = HAS_SENSORS
@@ -13,22 +13,22 @@
 /obj/item/clothing/head/frog_head
 	name = "frog hood"
 	desc = "A comfortable and snuggly animal hoodie"
-	icon = 'fulp_modules/halloween_event/costumes_2020/frog_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/frog_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/frog_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/frog_worn.dmi'
 	icon_state = "frog_head"
 
 /obj/item/clothing/gloves/frog_gloves
 	name = "frog gloves"
 	desc = "A tight yet comfortable pair of gloves."
-	icon = 'fulp_modules/halloween_event/costumes_2020/frog_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/frog_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/frog_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/frog_worn.dmi'
 	icon_state = "frog_gloves"
 
 /obj/item/clothing/shoes/frog_shoe
 	name = "frog shoes"
 	desc = "A pair of comfortable shoes recolored green."
-	icon = 'fulp_modules/halloween_event/costumes_2020/frog_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/frog_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/frog_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/frog_worn.dmi'
 	icon_state = "frog_shoes"
 
 //--Box that contains the costumes

fulp_modules/features/halloween_event/costumes_2020/gnome.dm

@@ -2,8 +2,8 @@
 /obj/item/clothing/under/gnome
 	name = "Gnome's jumpsuit"
 	desc = "A gnome suit for gnoming."
-	icon = 'fulp_modules/halloween_event/costumes_2020/gnome_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/gnome_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/gnome_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/gnome_worn.dmi'
 	icon_state = "gnome_jumpsuit"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	fitted = FEMALE_UNIFORM_FULL
@@ -14,8 +14,8 @@
 /obj/item/clothing/head/gnome
 	name = "Gnome's hat"
 	desc = "This is gnot a gnelf hat."
-	icon = 'fulp_modules/halloween_event/costumes_2020/gnome_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/gnome_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/gnome_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/gnome_worn.dmi'
 	icon_state = "gnome_hat"
 	var/armed = FALSE
 
@@ -26,7 +26,7 @@
 		var/mob/living/carbon/human/H = target
 		H.Knockdown(30)
 		SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gnomed", /datum/mood_event/gnomed)
-	playsound(src, 'fulp_modules/halloween_event/gnomed.ogg', 50, TRUE)
+	playsound(src, 'fulp_modules/features/halloween_event/sounds/gnomed.ogg', 50, TRUE)
 	armed = FALSE
 	update_icon()
 
@@ -55,16 +55,16 @@
 /obj/item/clothing/suit/gnome
 	name = "Gnome's suit"
 	desc = "I'm a gnome, and you will be gnomed."
-	icon = 'fulp_modules/halloween_event/costumes_2020/gnome_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/gnome_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/gnome_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/gnome_worn.dmi'
 	icon_state = "gnome_suit"
 	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
 
 /obj/item/clothing/shoes/gnome
 	name = "Gnome's shoes"
 	desc = "These are gnot gnoblin boots."
-	icon = 'fulp_modules/halloween_event/costumes_2020/gnome_item.dmi'
-	worn_icon = 'fulp_modules/halloween_event/costumes_2020/gnome_worn.dmi'
+	icon = 'fulp_modules/features/halloween_event/costumes_2020/gnome_item.dmi'
+	worn_icon = 'fulp_modules/features/halloween_event/costumes_2020/gnome_worn.dmi'
 	icon_state = "gnome_shoes"
 
 //--Box that contains the costumes