Merge branch 'master' into day_1_rework_dlc

code/_compile_options.dm

@@ -147,3 +147,11 @@
 // #define HEALTH_DEBUG
 // For debugging pain
 // #define PAIN_DEBUG
+
+/// Uncomment to compile content related to the story or characters of Maplestation.
+// #define MAPLESTATION_STORY_CONTENT
+
+// Always compile story content for unit tests. Todo : Just have a single unit test dedicated to story content.
+#ifdef UNIT_TESTS
+#define MAPLESTATION_STORY_CONTENT
+#endif

maplestation.dme

@@ -6337,6 +6337,13 @@
 #include "maplestation_modules\code\modules\clothing\digi_clothing.dm"
 #include "maplestation_modules\code\modules\clothing\accessories\accessories.dm"
 #include "maplestation_modules\code\modules\clothing\accessories\loadout_accessories.dm"
+#include "maplestation_modules\code\modules\clothing\equipment_sets\bartender_equipment\code\barmanvintage.dm"
+#include "maplestation_modules\code\modules\clothing\equipment_sets\captain_equipment\code\captainclothing.dm"
+#include "maplestation_modules\code\modules\clothing\equipment_sets\casual_clothing\code\casualclothing.dm"
+#include "maplestation_modules\code\modules\clothing\equipment_sets\chaplain_equipment\code\chaplainclothing.dm"
+#include "maplestation_modules\code\modules\clothing\equipment_sets\kimono\code\kimonoclothing.dm"
+#include "maplestation_modules\code\modules\clothing\equipment_sets\noble_equipment\code\beacon.dm"
+#include "maplestation_modules\code\modules\clothing\equipment_sets\noble_equipment\code\nobleclothing.dm"
 #include "maplestation_modules\code\modules\clothing\glasses\beer_eyepatch.dm"
 #include "maplestation_modules\code\modules\clothing\glasses\hud_eyepatches.dm"
 #include "maplestation_modules\code\modules\clothing\glasses\loadout_glasses.dm"
@@ -6568,26 +6575,20 @@
 #include "maplestation_modules\code\modules\vending\clothesmate.dm"
 #include "maplestation_modules\code\modules\vending\wardrobes.dm"
 #include "maplestation_modules\code\modules\wiremod\shells.dm"
+#ifdef MAPLESTATION_STORY_CONTENT
 #include "maplestation_modules\story_content\albert_equipment\code\albertclothing.dm"
 #include "maplestation_modules\story_content\albert_equipment\code\albertitem.dm"
 #include "maplestation_modules\story_content\armored_corps\code\clothing\aylie_cloak.dm"
 #include "maplestation_modules\story_content\armored_corps\code\mecha_weapons\gauss_override.dm"
 #include "maplestation_modules\story_content\armored_corps\code\mecha_weapons\laser_override.dm"
 #include "maplestation_modules\story_content\armored_corps\code\mecha_weapons\ppc_override.dm"
 #include "maplestation_modules\story_content\armored_corps\code\melee\void_blade.dm"
-#include "maplestation_modules\story_content\bartender_equipment\code\barmanvintage.dm"
 #include "maplestation_modules\story_content\bell_equipment\code\bellclothing.dm"
-#include "maplestation_modules\story_content\captain_equipment\code\captainclothing.dm"
-#include "maplestation_modules\story_content\casual_clothing\code\casualclothing.dm"
-#include "maplestation_modules\story_content\chaplain_equipment\code\chaplainclothing.dm"
 #include "maplestation_modules\story_content\grey_equipment\code\greyclothing.dm"
 #include "maplestation_modules\story_content\jessie_equipment\code\jessie_clothing.dm"
-#include "maplestation_modules\story_content\kimono\code\kimonoclothing.dm"
 #include "maplestation_modules\story_content\laurence_equipment\code\laurence_clothing.dm"
 #include "maplestation_modules\story_content\lini_equipment\code\liniclothing.dm"
 #include "maplestation_modules\story_content\localnode_equipment\localnode_core.dm"
-#include "maplestation_modules\story_content\noble_equipment\code\beacon.dm"
-#include "maplestation_modules\story_content\noble_equipment\code\nobleclothing.dm"
 #include "maplestation_modules\story_content\noname_equipment\code\nonameclothing.dm"
 #include "maplestation_modules\story_content\noname_equipment\code\nonameitems.dm"
 #include "maplestation_modules\story_content\nurse_equipment\code\vinceclothing.dm"
@@ -6605,4 +6606,5 @@
 #include "maplestation_modules\story_content\volkan_equipment\code\volkanpets.dm"
 #include "maplestation_modules\story_content\volkan_equipment\code\volkanpets_ai.dm"
 #include "maplestation_modules\story_content\wollys_items\code\wollysitems.dm"
+#endif // MAPLESTATION_STORY_CONTENT
 // END_INCLUDE

maplestation_modules/story_content/bartender_equipment/code/barmanvintage.dm → maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/code/barmanvintage.dm

@@ -1,8 +1,8 @@
 /obj/item/clothing/under/rank/civilian/bartender/vintageskirt
 	desc = "This is probably more than enough flair for one."
 	name = "vintage bartender's skirt"
-	icon = 'maplestation_modules/story_content/bartender_equipment/icons/barmanvintage_icon.dmi'
-	worn_icon = 'maplestation_modules/story_content/bartender_equipment/icons/barmanvintage_worn.dmi'
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/icons/barmanvintage_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/bartender_equipment/icons/barmanvintage_worn.dmi'
 	inhand_icon_state = "bar_suit"
 	icon_state = "barman_vintage"
 	alt_covers_chest = TRUE

maplestation_modules/story_content/captain_equipment/code/captainclothing.dm → maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/code/captainclothing.dm

@@ -1,10 +1,10 @@
 /obj/item/clothing/under/rank/captain/formal
 	name = "captain's turtleneck"
 	desc = "Clothing designed for the commander of the station, the turtleneck is soft to the touch."
-	icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
-	worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
-	lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
-	righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_rhand.dmi'
 	// Item: "capturtleneck"
 	// Sleeves adjusted: "capturtleneck_r"
 	// Adjusted: "capturtleneck_r"
@@ -21,10 +21,10 @@
 /obj/item/clothing/under/rank/captain/formal/skirt
 	name = "captain's skirtleneck"
 	desc = "A uniform designed for the commander of the station, the skirt is just long enough to clear the length standard."
-	icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
-	worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
-	lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
-	righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_rhand.dmi'
 	// Item: "capskirtleneck"
 	// Sleeves adjusted: "capskirtleneck_r"
 	// Adjusted: "capskirtleneck_d"
@@ -41,10 +41,10 @@
 /obj/item/clothing/shoes/jackboots/captain
 	name = "captain's boots"
 	desc = "Hard leather boots meant for the commander of the station, these boots look combat ready."
-	icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
-	worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
-	lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
-	righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_rhand.dmi'
 	// Item: "capboots"
 	// Inhand: "capboots"
 	// Worn: "capboots"
@@ -59,10 +59,10 @@
 /obj/item/clothing/gloves/captain/formal
 	name = "captain's black gloves"
 	desc = "Black gloves commanding officer gloves with a sleek appearance to them."
-	icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
-	worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
-	lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
-	righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_rhand.dmi'
 	// Item: "capgloves"
 	// Inhand: "capgloves"
 	// Worn: "capgloves"
@@ -78,10 +78,10 @@
 /obj/item/clothing/suit/armor/vest/capformalcarapace
 	name = "captain's quality carapace"
 	desc = "A high quality carapace fitted with sturdy painted metal plating. This one is meant for the stations commander."
-	icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
-	worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
-	lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
-	righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_rhand.dmi'
 	// Item: "caparmorvest"
 	// Inhand: "caparmorvest"
 	// Worn: "noblejacket"
@@ -95,10 +95,10 @@
 /obj/item/clothing/suit/armor/vest/capvestformal
 	name = "captain's vest"
 	desc = "An elegant heavy duty vest. It appears that this vest was modified from a bullet proof vest."
-	icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
-	worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
-	lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
-	righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_rhand.dmi'
 	// Item: "capvest"
 	// Inhand: "capvest"
 	// Worn: "capvest"
@@ -112,10 +112,10 @@
 /obj/item/clothing/neck/cloak/capformal
 	name = "captain's half cape"
 	desc = "Worn by the commander of the station, this cape only covers half of the body."
-	icon = 'maplestation_modules/story_content/captain_equipment/captain_icon.dmi'
-	worn_icon = 'maplestation_modules/story_content/captain_equipment/captain_worn.dmi'
-	lefthand_file = 'maplestation_modules/story_content/captain_equipment/captain_lhand.dmi'
-	righthand_file = 'maplestation_modules/story_content/captain_equipment/captain_rhand.dmi'
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/captain_equipment/captain_rhand.dmi'
 	icon_state = "caphalfcape"
 	inhand_icon_state = "caphalfcape"
 	w_class = WEIGHT_CLASS_SMALL

maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/code/casualclothing.dm

@@ -0,0 +1,87 @@
+/obj/item/clothing/under/jumpsuit/casualhoodie
+	name = "workout hoodie"
+	desc = "A hoodie for when you want to feel fit without doing any of the work."
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_rhand.dmi'
+	icon_state = "hoodie"
+	inhand_icon_state = "hoodie"
+	supports_variations_flags = CLOTHING_NO_VARIATION
+
+/datum/loadout_item/under/jumpsuit/hoodie
+	name = "Workout Hoodie"
+	item_path = /obj/item/clothing/under/jumpsuit/casualhoodie
+
+/obj/item/clothing/under/jumpsuit/blueskirt
+	name = "soft blue dress"
+	desc = "A knee length dress that is soft to the touch."
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_rhand.dmi'
+	icon_state = "skirt"
+	inhand_icon_state = "skirt"
+	supports_variations_flags = CLOTHING_NO_VARIATION
+	can_adjust = FALSE
+
+/datum/loadout_item/under/jumpsuit/casualdress
+	name = "Casual Dress"
+	item_path = /obj/item/clothing/under/jumpsuit/blueskirt
+
+/obj/item/clothing/shoes/trainers
+	name = "workout trainers"
+	desc = "Shoes designed for constant workout activities."
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_rhand.dmi'
+	icon_state = "trainers"
+	inhand_icon_state = "trainers"
+
+/datum/loadout_item/shoes/trainers
+	name = "Workout Trainers"
+	item_path = /obj/item/clothing/shoes/trainers
+
+/obj/item/clothing/shoes/trainers/casual
+	name = "casual sneakers"
+	desc = "Sneakers fit for any occassion. This pair appears to be brand new."
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_rhand.dmi'
+	icon_state = "casualsneakers"
+	inhand_icon_state = "casualsneakers"
+
+/datum/loadout_item/shoes/sneaker
+	name = "Casual Sneakers"
+	item_path = /obj/item/clothing/shoes/trainers/casual
+
+/obj/item/clothing/neck/cloak/casual
+	name = "fuzzy cloak"
+	desc = "A delicate soft cloak. The inner lining has fleece to keep the wearer warm."
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_rhand.dmi'
+	icon_state = "cloak"
+
+/datum/loadout_item/neck/casual_cloak
+	name = "Fuzzy Cloak"
+	item_path = /obj/item/clothing/neck/cloak/casual
+	additional_displayed_text = list("Character Item")
+
+/obj/item/clothing/glasses/sunglasses/casual
+	name = "casual sunglasses"
+	desc = "Stylish sunglasses intended to be purely cosmetic. Makes you look cool at a fraction of the cost."
+	icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_icon.dmi'
+	worn_icon = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_worn.dmi'
+	lefthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_lhand.dmi'
+	righthand_file = 'maplestation_modules/code/modules/clothing/equipment_sets/casual_clothing/icons/casual_rhand.dmi'
+	icon_state = "sunglasses"
+	inhand_icon_state = "sunglasses"
+	flash_protect = FLASH_PROTECTION_NONE
+
+/datum/loadout_item/glasses/casualsunglasses
+	name = "Casual Sunglasses"
+	item_path = /obj/item/clothing/glasses/sunglasses/casual