[MIRROR] Spans out and Alphabetizes the Lists in _globalvars/lists [MDB IGNORE] (#10752)

* Spans out and Alphabetizes the Lists in _globalvars/lists

* Spans out and Alphabetizes the Lists in _globalvars/lists

Co-authored-by: san7890 <34697715+san7890@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

code/_globalvars/lists/ambience.dm

@@ -1,104 +1,177 @@
 /* SKYRAT EDIT REMOVAL BEGIN
 GLOBAL_LIST_INIT(generic_ambience,list(
-	'sound/ambience/ambigen1.ogg', 'sound/ambience/ambigen3.ogg',
-	'sound/ambience/ambigen4.ogg', 'sound/ambience/ambigen5.ogg',
-	'sound/ambience/ambigen6.ogg', 'sound/ambience/ambigen7.ogg',
-	'sound/ambience/ambigen8.ogg', 'sound/ambience/ambigen9.ogg',
-	'sound/ambience/ambigen10.ogg', 'sound/ambience/ambigen11.ogg',
-	'sound/ambience/ambigen12.ogg', 'sound/ambience/ambigen14.ogg',
-	'sound/ambience/ambigen15.ogg'))
+	'sound/ambience/ambigen1.ogg',
+	'sound/ambience/ambigen3.ogg',
+	'sound/ambience/ambigen4.ogg',
+	'sound/ambience/ambigen5.ogg',
+	'sound/ambience/ambigen6.ogg',
+	'sound/ambience/ambigen7.ogg',
+	'sound/ambience/ambigen8.ogg',
+	'sound/ambience/ambigen9.ogg',
+	'sound/ambience/ambigen10.ogg',
+	'sound/ambience/ambigen11.ogg',
+	'sound/ambience/ambigen12.ogg',
+	'sound/ambience/ambigen14.ogg',
+	'sound/ambience/ambigen15.ogg',
+))
 */ //SKYRAT EDIT REMOVAL END
 
 GLOBAL_LIST_INIT(holy_ambience,list(
-	'sound/ambience/ambicha1.ogg', 'sound/ambience/ambicha2.ogg',
-	'sound/ambience/ambicha3.ogg', 'sound/ambience/ambicha4.ogg',
-	'sound/ambience/ambiholy.ogg', 'sound/ambience/ambiholy2.ogg',
-	'sound/ambience/ambiholy3.ogg'))
+	'sound/ambience/ambicha1.ogg',
+	'sound/ambience/ambicha2.ogg',
+	'sound/ambience/ambicha3.ogg',
+	'sound/ambience/ambicha4.ogg',
+	'sound/ambience/ambiholy.ogg',
+	'sound/ambience/ambiholy2.ogg',
+	'sound/ambience/ambiholy3.ogg',
+))
 
 GLOBAL_LIST_INIT(danger_ambience,list(
-	'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg'))
+	'sound/ambience/ambidanger.ogg',
+	'sound/ambience/ambidanger2.ogg',
+))
 
 GLOBAL_LIST_INIT(ruins_ambience,list(
-	'sound/ambience/ambimine.ogg', 'sound/ambience/ambicave.ogg',
-	'sound/ambience/ambiruin.ogg', 'sound/ambience/ambiruin2.ogg',
-	'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',
-	'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg',
-	'sound/ambience/ambiruin7.ogg', 'sound/ambience/ambidanger.ogg',
-	'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambitech3.ogg',
-	'sound/ambience/ambimystery.ogg', 'sound/ambience/ambimaint1.ogg'))
+	'sound/ambience/ambicave.ogg',
+	'sound/ambience/ambidanger.ogg',
+	'sound/ambience/ambidanger2.ogg',
+	'sound/ambience/ambimaint1.ogg',
+	'sound/ambience/ambimine.ogg',
+	'sound/ambience/ambimystery.ogg',
+	'sound/ambience/ambiruin.ogg',
+	'sound/ambience/ambiruin2.ogg',
+	'sound/ambience/ambiruin3.ogg',
+	'sound/ambience/ambiruin4.ogg',
+	'sound/ambience/ambiruin5.ogg',
+	'sound/ambience/ambiruin6.ogg',
+	'sound/ambience/ambiruin7.ogg',
+	'sound/ambience/ambitech3.ogg',
+))
 
 GLOBAL_LIST_INIT(engi_ambience,list(
-	'sound/ambience/ambisin1.ogg', 'sound/ambience/ambisin2.ogg',
-	'sound/ambience/ambisin3.ogg', 'sound/ambience/ambisin4.ogg',
-	'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg',
-	'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg',
-	'sound/ambience/ambitech3.ogg'))
+	'sound/ambience/ambiatmos.ogg',
+	'sound/ambience/ambiatmos2.ogg',
+	'sound/ambience/ambisin1.ogg',
+	'sound/ambience/ambisin2.ogg',
+	'sound/ambience/ambisin3.ogg',
+	'sound/ambience/ambisin4.ogg',
+	'sound/ambience/ambitech.ogg',
+	'sound/ambience/ambitech2.ogg',
+	'sound/ambience/ambitech3.ogg',
+))
 
 GLOBAL_LIST_INIT(mining_ambience,list(
-	'sound/ambience/ambimine.ogg', 'sound/ambience/ambicave.ogg',
-	'sound/ambience/ambiruin.ogg', 'sound/ambience/ambiruin2.ogg',
-	'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',
-	'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg',
-	'sound/ambience/ambiruin7.ogg', 'sound/ambience/ambidanger.ogg',
-	'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint1.ogg',
-	'sound/ambience/ambilava1.ogg', 'sound/ambience/ambilava2.ogg',
-	'sound/ambience/ambilava3.ogg'))
+	'sound/ambience/ambicave.ogg',
+	'sound/ambience/ambidanger.ogg',
+	'sound/ambience/ambidanger2.ogg',
+	'sound/ambience/ambilava1.ogg',
+	'sound/ambience/ambilava2.ogg',
+	'sound/ambience/ambilava3.ogg',
+	'sound/ambience/ambimaint1.ogg',
+	'sound/ambience/ambimine.ogg',
+	'sound/ambience/ambiruin.ogg',
+	'sound/ambience/ambiruin2.ogg',
+	'sound/ambience/ambiruin3.ogg',
+	'sound/ambience/ambiruin4.ogg',
+	'sound/ambience/ambiruin5.ogg',
+	'sound/ambience/ambiruin6.ogg',
+	'sound/ambience/ambiruin7.ogg',
+))
 
 GLOBAL_LIST_INIT(medical_ambience,list('sound/ambience/ambinice.ogg'))
 
 GLOBAL_LIST_INIT(spooky_ambience,list(
-	'sound/ambience/ambimo1.ogg', 'sound/ambience/ambimo2.ogg',
-	'sound/ambience/ambiruin7.ogg', 'sound/ambience/ambiruin6.ogg',
-	'sound/ambience/ambiodd.ogg', 'sound/ambience/ambimystery.ogg'))
+	'sound/ambience/ambimo1.ogg',
+	'sound/ambience/ambimo2.ogg',
+	'sound/ambience/ambimystery.ogg',
+	'sound/ambience/ambiodd.ogg',
+	'sound/ambience/ambiruin6.ogg',
+	'sound/ambience/ambiruin7.ogg',
+))
 
 GLOBAL_LIST_INIT(space_ambience,list(
-	'sound/ambience/ambispace.ogg', 'sound/ambience/ambispace2.ogg', 'sound/ambience/title2.ogg',
-	'sound/ambience/ambispace3.ogg', 'sound/ambience/ambiatmos.ogg', 'modular_skyrat/master_files/sound/ambience/starlight.ogg')) //SKYRAT EDIT ADDITION
+	'modular_skyrat/master_files/sound/ambience/starlight.ogg', //SKYRAT EDIT ADDITION
+	'sound/ambience/ambiatmos.ogg',
+	'sound/ambience/ambispace.ogg',
+	'sound/ambience/ambispace2.ogg',
+	'sound/ambience/ambispace3.ogg',
+	'sound/ambience/title2.ogg',
+))
 
 GLOBAL_LIST_INIT(maint_ambience,list(
-	'sound/ambience/ambimaint1.ogg', 'sound/ambience/ambimaint2.ogg',
-	'sound/ambience/ambimaint3.ogg', 'sound/ambience/ambimaint4.ogg',
-	'sound/ambience/ambimaint5.ogg', 'sound/voice/lowHiss2.ogg',
-	'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg',
-	'sound/ambience/ambitech2.ogg'))
+	'sound/ambience/ambimaint1.ogg',
+	'sound/ambience/ambimaint2.ogg',
+	'sound/ambience/ambimaint3.ogg',
+	'sound/ambience/ambimaint4.ogg',
+	'sound/ambience/ambimaint5.ogg',
+	'sound/ambience/ambitech2.ogg',
+	'sound/voice/lowHiss2.ogg',
+	'sound/voice/lowHiss3.ogg',
+	'sound/voice/lowHiss4.ogg',
+))
 
 GLOBAL_LIST_INIT(away_ambience,list(
-	'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg',
-	'sound/ambience/ambiruin.ogg', 'sound/ambience/ambiruin2.ogg',
-	'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',
-	'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg',
-	'sound/ambience/ambiruin7.ogg', 'sound/ambience/ambidanger.ogg',
-	'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint.ogg',
-	'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg',
-	'sound/ambience/ambiodd.ogg'))
+	'sound/ambience/ambiatmos.ogg',
+	'sound/ambience/ambiatmos2.ogg',
+	'sound/ambience/ambidanger.ogg',
+	'sound/ambience/ambidanger2.ogg',
+	'sound/ambience/ambimaint.ogg',
+	'sound/ambience/ambiodd.ogg',
+	'sound/ambience/ambiruin.ogg',
+	'sound/ambience/ambiruin2.ogg',
+	'sound/ambience/ambiruin3.ogg',
+	'sound/ambience/ambiruin4.ogg',
+	'sound/ambience/ambiruin5.ogg',
+	'sound/ambience/ambiruin6.ogg',
+	'sound/ambience/ambiruin7.ogg',
+	'sound/ambience/ambitech.ogg',
+	'sound/ambience/ambitech2.ogg',
+))
 
-GLOBAL_LIST_INIT(reebe_ambience,list('sound/ambience/ambireebe1.ogg', 'sound/ambience/ambireebe2.ogg', 'sound/ambience/ambireebe3.ogg'))
+GLOBAL_LIST_INIT(reebe_ambience,list(
+	'sound/ambience/ambireebe1.ogg',
+	'sound/ambience/ambireebe2.ogg',
+	'sound/ambience/ambireebe3.ogg',
+))
 
 GLOBAL_LIST_INIT(creepy_ambience,list(
-	'sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg',
-	'sound/effects/heart_beat.ogg', 'sound/effects/screech.ogg',
-	'sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg',
-	'sound/hallucinations/far_noise.ogg', 'sound/hallucinations/growl1.ogg',
-	'sound/hallucinations/growl2.ogg', 'sound/hallucinations/growl3.ogg',
-	'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg',
-	'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',
-	'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg',
-	'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg',
-	'sound/hallucinations/over_here3.ogg', 'sound/hallucinations/turn_around1.ogg',
-	'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg',
-	'sound/hallucinations/wail.ogg'))
+	'sound/effects/ghost.ogg',
+	'sound/effects/ghost2.ogg',
+	'sound/effects/heart_beat.ogg',
+	'sound/effects/screech.ogg',
+	'sound/hallucinations/behind_you1.ogg',
+	'sound/hallucinations/behind_you2.ogg',
+	'sound/hallucinations/far_noise.ogg',
+	'sound/hallucinations/growl1.ogg',
+	'sound/hallucinations/growl2.ogg',
+	'sound/hallucinations/growl3.ogg',
+	'sound/hallucinations/i_see_you1.ogg',
+	'sound/hallucinations/i_see_you2.ogg',
+	'sound/hallucinations/im_here1.ogg',
+	'sound/hallucinations/im_here2.ogg',
+	'sound/hallucinations/look_up1.ogg',
+	'sound/hallucinations/look_up2.ogg',
+	'sound/hallucinations/over_here1.ogg',
+	'sound/hallucinations/over_here2.ogg',
+	'sound/hallucinations/over_here3.ogg',
+	'sound/hallucinations/turn_around1.ogg',
+	'sound/hallucinations/turn_around2.ogg',
+	'sound/hallucinations/veryfar_noise.ogg',
+	'sound/hallucinations/wail.ogg',
+))
 
 GLOBAL_LIST_INIT(ambience_assoc,list(
+	AMBIENCE_AWAY = GLOB.away_ambience,
+	AMBIENCE_CREEPY = GLOB.creepy_ambience,
+	AMBIENCE_DANGER = GLOB.danger_ambience,
+	AMBIENCE_ENGI = GLOB.engi_ambience,
 	AMBIENCE_GENERIC = GLOB.generic_ambience,
 	AMBIENCE_HOLY = GLOB.holy_ambience,
-	AMBIENCE_DANGER = GLOB.danger_ambience,
-	AMBIENCE_RUINS = GLOB.ruins_ambience,
-	AMBIENCE_ENGI = GLOB.engi_ambience,
-	AMBIENCE_MINING = GLOB.mining_ambience,
-	AMBIENCE_MEDICAL = GLOB.medical_ambience,
-	AMBIENCE_SPOOKY = GLOB.spooky_ambience,
-	AMBIENCE_SPACE = GLOB.space_ambience,
 	AMBIENCE_MAINT = GLOB.maint_ambience,
-	AMBIENCE_AWAY = GLOB.away_ambience,
+	AMBIENCE_MEDICAL = GLOB.medical_ambience,
+	AMBIENCE_MINING = GLOB.mining_ambience,
 	AMBIENCE_REEBE = GLOB.reebe_ambience,
-	AMBIENCE_CREEPY = GLOB.creepy_ambience))
+	AMBIENCE_RUINS = GLOB.ruins_ambience,
+	AMBIENCE_SPACE = GLOB.space_ambience,
+	AMBIENCE_SPOOKY = GLOB.spooky_ambience,
+))

code/_globalvars/lists/color.dm

@@ -1 +1,7 @@
-GLOBAL_LIST_INIT(contrast_colors, list(COLOR_RED, COLOR_VIOLET, COLOR_DARK_CYAN, COLOR_TAN_ORANGE, COLOR_BLACK))
+GLOBAL_LIST_INIT(contrast_colors, list(
+	COLOR_BLACK,
+	COLOR_DARK_CYAN,
+	COLOR_RED,
+	COLOR_TAN_ORANGE,
+	COLOR_VIOLET,
+))

code/_globalvars/lists/flavor_misc.dm

@@ -46,82 +46,86 @@ GLOBAL_LIST_EMPTY(tails_list_monkey)
 //SKYRAT EDIT REMOVAL END
 
 GLOBAL_LIST_INIT(color_list_ethereal, list(
-	"Red" = "#ff4d4d",
-	"Faint Red" = "#ffb3b3",
-	"Dark Red" = "#9c3030",
-	"Orange" = "#ffa64d",
-	"Burnt Orange" = "#cc4400",
-	"Bright Yellow" = "#ffff99",
-	"Dull Yellow" = "#fbdf56",
-	"Faint Green" = "#ddff99",
-	"Green" = "#97ee63",
-	"Seafoam Green" = "#00fa9a",
-	"Dark Green" = "#37835b",
-	"Cyan Blue" = "#00ffff",
-	"Faint Blue" = "#b3d9ff",
 	"Blue" = "#3399ff",
+	"Bright Yellow" = "#ffff99",
+	"Burnt Orange" = "#cc4400",
+	"Cyan Blue" = "#00ffff",
 	"Dark Blue" = "#6666ff",
-	"Purple" = "#ee82ee",
 	"Dark Fuschia" = "#cc0066",
+	"Dark Green" = "#37835b",
+	"Dark Red" = "#9c3030",
+	"Dull Yellow" = "#fbdf56",
+	"Faint Blue" = "#b3d9ff",
+	"Faint Green" = "#ddff99",
+	"Faint Red" = "#ffb3b3",
+	"Green" = "#97ee63",
+	"Orange" = "#ffa64d",
 	"Pink" = "#ff99cc",
-	"White" = "#f2f2f2",))
+	"Purple" = "#ee82ee",
+	"Red" = "#ff4d4d",
+	"Seafoam Green" = "#00fa9a",
+	"White" = "#f2f2f2",
+))
 
 GLOBAL_LIST_INIT(ghost_forms_with_directions_list, list(
+	"catghost",
+	"ghost_black",
+	"ghost_blazeit",
+	"ghost_blue",
+	"ghost_camo",
+	"ghost_cyan",
+	"ghost_dblue",
+	"ghost_dcyan",
+	"ghost_dgreen",
+	"ghost_dpink",
+	"ghost_dred",
+	"ghost_dyellow",
+	"ghost_fire",
+	"ghost_funkypurp",
+	"ghost_green",
+	"ghost_grey",
+	"ghost_mellow",
+	"ghost_pink",
+	"ghost_pinksherbert",
+	"ghost_purpleswirl",
+	"ghost_rainbow",
+	"ghost_red",
+	"ghost_yellow",
 	"ghost",
 	"ghostian",
 	"ghostian2",
 	"ghostking",
-	"ghost_red",
-	"ghost_black",
-	"ghost_blue",
-	"ghost_yellow",
-	"ghost_green",
-	"ghost_pink",
-	"ghost_cyan",
-	"ghost_dblue",
-	"ghost_dred",
-	"ghost_dgreen",
-	"ghost_dcyan",
-	"ghost_grey",
-	"ghost_dyellow",
-	"ghost_dpink",
 	"skeleghost",
-	"ghost_purpleswirl",
-	"ghost_rainbow",
-	"ghost_fire",
-	"ghost_funkypurp",
-	"ghost_pinksherbert",
-	"ghost_blazeit",
-	"ghost_mellow",
-	"ghost_camo",
-	"catghost")) //stores the ghost forms that support directional sprites
+))
+//stores the ghost forms that support directional sprites
 
 GLOBAL_LIST_INIT(ghost_forms_with_accessories_list, list(
-	"ghost",
-	"ghost_red",
 	"ghost_black",
+	"ghost_blazeit",
 	"ghost_blue",
-	"ghost_yellow",
-	"ghost_green",
-	"ghost_pink",
+	"ghost_camo",
 	"ghost_cyan",
 	"ghost_dblue",
-	"ghost_dred",
-	"ghost_dgreen",
 	"ghost_dcyan",
-	"ghost_grey",
-	"ghost_dyellow",
+	"ghost_dgreen",
 	"ghost_dpink",
-	"skeleghost",
-	"ghost_purpleswirl",
-	"ghost_rainbow",
+	"ghost_dred",
+	"ghost_dyellow",
 	"ghost_fire",
 	"ghost_funkypurp",
-	"ghost_pinksherbert",
-	"ghost_blazeit",
+	"ghost_green",
+	"ghost_grey",
 	"ghost_mellow",
-	"ghost_camo",))
-	//stores the ghost forms that support hair and other such things
+	"ghost_pink",
+	"ghost_pinksherbert",
+	"ghost_purpleswirl",
+	"ghost_rainbow",
+	"ghost_red",
+	"ghost_yellow",
+	"ghost",
+	"skeleghost",
+))
+//stores the ghost forms that support hair and other such things
 
 GLOBAL_LIST_INIT(ai_core_display_screens, sort_list(list(
 	":thinking:",
@@ -152,17 +156,18 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sort_list(list(
 	"Not Malf",
 	"Portrait",
 	"President",
-	"Random",
 	"Rainbow",
-	"Red",
+	"Random",
 	"Red October",
+	"Red",
 	"Static",
 	"Syndicat Meow",
 	"Text",
 	"Too Deep",
-	"Triumvirate",
 	"Triumvirate-M",
-	"Weird")))
+	"Triumvirate",
+	"Weird",
+)))
 
 /// A form of resolve_ai_icon that is guaranteed to never sleep.
 /// Not always accurate, but always synchronous.
@@ -185,22 +190,30 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sort_list(list(
 	return resolve_ai_icon_sync(input)
 
 GLOBAL_LIST_INIT(security_depts_prefs, sort_list(list(
-	SEC_DEPT_NONE,
 	SEC_DEPT_ENGINEERING,
 	SEC_DEPT_MEDICAL,
+	SEC_DEPT_NONE,
 	SEC_DEPT_SCIENCE,
 	SEC_DEPT_SUPPLY,
 )))
 
 	//Backpacks
-#define GBACKPACK "Grey Backpack"
-#define GSATCHEL "Grey Satchel"
-#define GDUFFELBAG "Grey Duffel Bag"
-#define LSATCHEL "Leather Satchel"
 #define DBACKPACK "Department Backpack"
-#define DSATCHEL "Department Satchel"
 #define DDUFFELBAG "Department Duffel Bag"
-GLOBAL_LIST_INIT(backpacklist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, GBACKPACK, GSATCHEL, GDUFFELBAG, LSATCHEL))
+#define DSATCHEL "Department Satchel"
+#define GBACKPACK "Grey Backpack"
+#define GDUFFELBAG "Grey Duffel Bag"
+#define GSATCHEL "Grey Satchel"
+#define LSATCHEL "Leather Satchel"
+GLOBAL_LIST_INIT(backpacklist, list(
+	DBACKPACK,
+	DDUFFELBAG,
+	DSATCHEL,
+	GBACKPACK,
+	GDUFFELBAG,
+	GSATCHEL,
+	LSATCHEL,
+))
 
 	//Suit/Skirt
 #define PREF_SUIT "Jumpsuit"
@@ -215,7 +228,25 @@ GLOBAL_LIST_INIT(backpacklist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, GBACKPACK,
 	//Female Uniforms
 GLOBAL_LIST_EMPTY(female_clothing_icons)
 
-GLOBAL_LIST_INIT(scarySounds, list('sound/weapons/thudswoosh.ogg','sound/weapons/taser.ogg','sound/weapons/armbomb.ogg','sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg','sound/voice/hiss5.ogg','sound/voice/hiss6.ogg','sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg','sound/items/welder.ogg','sound/items/welder2.ogg','sound/machines/airlock.ogg','sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg'))
+GLOBAL_LIST_INIT(scarySounds, list(
+	'sound/effects/clownstep1.ogg',
+	'sound/effects/clownstep2.ogg',
+	'sound/effects/glassbr1.ogg',
+	'sound/effects/glassbr2.ogg',
+	'sound/effects/glassbr3.ogg',
+	'sound/items/welder.ogg',
+	'sound/items/welder2.ogg',
+	'sound/machines/airlock.ogg',
+	'sound/voice/hiss1.ogg',
+	'sound/voice/hiss2.ogg',
+	'sound/voice/hiss3.ogg',
+	'sound/voice/hiss4.ogg',
+	'sound/voice/hiss5.ogg',
+	'sound/voice/hiss6.ogg',
+	'sound/weapons/armbomb.ogg',
+	'sound/weapons/taser.ogg',
+	'sound/weapons/thudswoosh.ogg',
+))
 
 
 // Reference list for disposal sort junctions. Set the sortType variable on disposal sort junctions to
@@ -262,14 +293,38 @@ GLOBAL_LIST_INIT(scarySounds, list('sound/weapons/thudswoosh.ogg','sound/weapons
 //If you don't want to fuck up disposals, add to this list, and don't change the order.
 //If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete
 
-GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals",
-	"Cargo Bay", "QM Office", "Engineering", "CE Office",
-	"Atmospherics", "Security", "HoS Office", "Medbay",
-	"CMO Office", "Chemistry", "Research", "RD Office",
-	"Robotics", "HoP Office", "Library", "Chapel", "Theatre",
-	"Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics",
-	"Experimentor Lab", "Ordnance", "Dormitories", "Virology",
-	"Xenobiology", "Law Office","Detective's Office"))
+GLOBAL_LIST_INIT(TAGGERLOCATIONS, list(
+	"Atmospherics",
+	"Bar",
+	"Cargo Bay",
+	"CE Office",
+	"Chapel",
+	"Chemistry",
+	"CMO Office",
+	"Detective's Office",
+	"Disposals",
+	"Dormitories",
+	"Engineering",
+	"Experimentor Lab",
+	"Genetics",
+	"HoP Office",
+	"HoS Office",
+	"Hydroponics",
+	"Janitor Closet",
+	"Kitchen",
+	"Law Office",
+	"Library",
+	"Medbay",
+	"Ordnance",
+	"QM Office",
+	"RD Office",
+	"Research",
+	"Robotics",
+	"Security",
+	"Theatre",
+	"Virology",
+	"Xenobiology",
+))
 
 GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt"))
 
@@ -294,6 +349,18 @@ GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt"))
 
 GLOBAL_LIST_INIT(station_numerals, greek_letters + phonetic_alphabet + numbers_as_words + generate_number_strings())
 
-GLOBAL_LIST_INIT(admiral_messages, list("Do you know how expensive these stations are?","Stop wasting my time.","I was sleeping, thanks a lot.","Stand and fight you cowards!","You knew the risks coming in.","Stop being paranoid.","Whatever's broken just build a new one.","No.", "<i>null</i>","<i>Error: No comment given.</i>", "It's a good day to die!"))
+GLOBAL_LIST_INIT(admiral_messages, list(
+	"<i>Error: No comment given.</i>",
+	"<i>null</i>",
+	"Do you know how expensive these stations are?",
+	"I was sleeping, thanks a lot.",
+	"It's a good day to die!",
+	"No.",
+	"Stand and fight you cowards!",
+	"Stop being paranoid.",
+	"Stop wasting my time.",
+	"Whatever's broken just build a new one.",
+	"You knew the risks coming in.",
+))
 
 GLOBAL_LIST_INIT(junkmail_messages, world.file2list("strings/junkmail.txt"))

code/_globalvars/lists/maintenance_loot.dm

@@ -17,41 +17,41 @@
 GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto chemistry items
 	list(//trash
 		/obj/item/trash/can = 1,
-		/obj/item/trash/raisins = 1,
 		/obj/item/trash/candy = 1,
 		/obj/item/trash/cheesie = 1,
 		/obj/item/trash/chips = 1,
-		/obj/item/trash/popcorn = 1,
-		/obj/item/trash/sosjerky = 1,
 		/obj/item/trash/pistachios = 1,
+		/obj/item/trash/popcorn = 1,
+		/obj/item/trash/raisins = 1,
+		/obj/item/trash/sosjerky = 1,
 
-		/obj/item/poster/random_contraband = 1,
-		/obj/item/poster/random_official = 1,
+		/obj/item/c_tube = 1,
+		/obj/item/disk/data = 1,
 		/obj/item/folder/yellow = 1,
 		/obj/item/hand_labeler = 1,
-		/obj/item/pen = 1,
 		/obj/item/paper = 1,
 		/obj/item/paper/crumpled = 1,
+		/obj/item/pen = 1,
 		/obj/item/photo/old = 1,
-		/obj/item/disk/data = 1,
+		/obj/item/poster/random_contraband = 1,
+		/obj/item/poster/random_official = 1,
 		/obj/item/stack/sheet/cardboard = 1,
 		/obj/item/storage/box = 1,
-		/obj/item/c_tube = 1,
 
-		/obj/item/reagent_containers/food/drinks/drinkingglass = 1,
-		/obj/item/coin/silver = 1,
 		/obj/effect/decal/cleanable/ash = 1,
-		/obj/item/cigbutt = 1,
 		/obj/item/camera = 1,
 		/obj/item/camera_film = 1,
+		/obj/item/cigbutt = 1,
+		/obj/item/coin/silver = 1,
+		/obj/item/food/urinalcake = 1,
 		/obj/item/light/bulb = 1,
 		/obj/item/light/tube = 1,
-		/obj/item/food/urinalcake = 1,
+		/obj/item/reagent_containers/food/drinks/drinkingglass = 1,
 
 		/obj/item/airlock_painter = 1,
 		/obj/item/airlock_painter/decal = 1,
-		/obj/item/rack_parts = 1,
 		/obj/item/clothing/mask/breath = 1,
+		/obj/item/rack_parts = 1,
 		/obj/item/shard = 1,
 
 		/obj/item/reagent_containers/pill/maintenance/achievement = 1,
@@ -60,10 +60,10 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c
 
 	list(//tier 1 stock parts
 		/obj/item/stock_parts/capacitor = 1,
-		/obj/item/stock_parts/scanning_module = 1,
 		/obj/item/stock_parts/manipulator = 1,
-		/obj/item/stock_parts/micro_laser = 1,
 		/obj/item/stock_parts/matter_bin = 1,
+		/obj/item/stock_parts/micro_laser = 1,
+		/obj/item/stock_parts/scanning_module = 1,
 		) = 1,
 	))
 
@@ -71,69 +71,69 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c
 
 GLOBAL_LIST_INIT(common_loot, list( //common: basic items
 	list(//tools
-		/obj/item/screwdriver = 1,
-		/obj/item/wirecutters = 1,
-		/obj/item/wrench = 1,
-		/obj/item/crowbar = 1,
-		/obj/item/t_scanner = 1,
-		/obj/item/geiger_counter = 1,
 		/obj/item/analyzer = 1,
+		/obj/item/crowbar = 1,
+		/obj/item/geiger_counter = 1,
 		/obj/item/mop = 1,
 		/obj/item/pushbroom = 1,
 		/obj/item/reagent_containers/glass/bucket = 1,
+		/obj/item/screwdriver = 1,
+		/obj/item/t_scanner = 1,
 		/obj/item/toy/crayon/spraycan = 1,
 		/obj/item/weldingtool = 1,
+		/obj/item/wirecutters = 1,
+		/obj/item/wrench = 1,
 		) = 1,
 
 	list(//equipment
+		/obj/effect/spawner/random/clothing/gloves = 1,
+		/obj/item/clothing/glasses/meson = 1,
+		/obj/item/clothing/glasses/science = 1,
+		/obj/item/clothing/gloves/color/black = 1,
+		/obj/item/clothing/gloves/color/fyellow = 1,
 		/obj/item/clothing/mask/gas/alt = 1, //SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/clothing/mask/gas = 1,
-		/obj/item/radio/headset = 1,
-		/obj/item/storage/backpack = 1,
 		/obj/item/clothing/shoes/sneakers/black = 1,
 		/obj/item/clothing/suit/hazardvest = 1,
 		/obj/item/clothing/suit/toggle/labcoat = 1,
 		/obj/item/clothing/under/color/grey = 1,
-		/obj/item/clothing/gloves/color/fyellow = 1,
-		/obj/effect/spawner/random/clothing/gloves = 1,
-		/obj/item/storage/wallet/random = 1,
-		/obj/item/clothing/glasses/science = 1,
-		/obj/item/clothing/glasses/meson = 1,
+		/obj/item/radio/headset = 1,
+		/obj/item/storage/backpack = 1,
 		/obj/item/storage/belt/fannypack = 1,
-		/obj/item/clothing/gloves/color/black = 1,
+		/obj/item/storage/wallet/random = 1,
 		) = 1,
 
 	list(//construction and crafting
+		/obj/item/sign = 1,
 		/obj/item/stack/cable_coil = 1,
-		/obj/item/stock_parts/cell = 1,
-		/obj/item/stock_parts/cell/crank = 1, // SKYRAT EDIT: NEW_CELLS
 		/obj/item/stack/rods/twentyfive = 1,
 		/obj/item/stack/sheet/iron/twenty = 1,
 		/obj/item/stack/sheet/mineral/plasma = 1,
-		/obj/item/sign = 1,
+		/obj/item/stock_parts/cell = 1,
+		/obj/item/stock_parts/cell/crank = 1, // SKYRAT EDIT ADD - NEW_CELLS
 
 		//assemblies
+		/obj/item/assembly/health = 1,
+		/obj/item/assembly/igniter = 1,
 		/obj/item/assembly/infra = 1,
-		/obj/item/assembly/signaler = 1,
 		/obj/item/assembly/mousetrap = 1,
 		/obj/item/assembly/prox_sensor = 1,
+		/obj/item/assembly/signaler = 1,
 		/obj/item/assembly/timer = 1,
-		/obj/item/assembly/igniter = 1,
-		/obj/item/assembly/health = 1,
 		/obj/item/stack/package_wrap = 1,
 		/obj/item/stack/wrapping_paper = 1,
 		) = 1,
 
 	list(//medical and chemicals
-		/obj/item/stock_parts/cell/lead = 1,
-		/obj/item/storage/fancy/cigarettes/dromedaryco = 1,
 		/obj/item/grenade/chem_grenade/cleaner = 1,
-		/obj/item/storage/box/matches = 1,
-		/obj/item/reagent_containers/syringe = 1,
+		/obj/item/lead_pipe = 1,
 		/obj/item/reagent_containers/glass/beaker = 1,
+		/obj/item/reagent_containers/glass/bottle/random_buffer = 2,
 		/obj/item/reagent_containers/glass/rag = 1,
 		/obj/item/reagent_containers/hypospray/medipen/pumpup = 2,
-		/obj/item/reagent_containers/glass/bottle/random_buffer = 2,
-		/obj/item/lead_pipe = 1,
+		/obj/item/reagent_containers/syringe = 1,
+		/obj/item/stock_parts/cell/lead = 1,
+		/obj/item/storage/box/matches = 1,
+		/obj/item/storage/fancy/cigarettes/dromedaryco = 1,
 		) = 1,
 
 	list(//food
@@ -142,18 +142,18 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
 		) = 1,
 
 	list(//misc
-		/obj/item/radio/off = 1,
-		/obj/item/extinguisher = 1,
-		/obj/item/tank/internals/emergency_oxygen = 1,
 		/obj/item/bodybag = 1,
+		/obj/item/extinguisher = 1,
 		/obj/item/grenade/smokebomb = 1,
+		/obj/item/radio/off = 1,
 		/obj/item/stack/spacecash/c10 = 1,
 		/obj/item/stack/sticky_tape = 1,
+		/obj/item/tank/internals/emergency_oxygen = 1,
 
 		//light sources
-		/obj/item/flashlight = 1,
 		/obj/effect/spawner/random/decoration/glowstick = 1,
 		/obj/item/clothing/head/hardhat/red = 1,
+		/obj/item/flashlight = 1,
 		/obj/item/flashlight/flare = 1,
 		) = 1,
 	))
@@ -162,31 +162,31 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
 
 GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 	list(//tools
-		/obj/item/weldingtool/largetank = 1,
-		/obj/item/multitool = 1,
-		/obj/item/hatchet = 1,
-		/obj/item/roller = 1,
-		/obj/item/restraints/legcuffs/bola = 1,
-		/obj/item/restraints/handcuffs/cable = 1,
-		/obj/item/spear = 1,
 		/obj/item/grenade/iedcasing/spawned = 1,
+		/obj/item/hatchet = 1,
 		/obj/item/melee/baton/security/cattleprod = 1,
+		/obj/item/multitool = 1,
 		/obj/item/pen/fountain = 1,
+		/obj/item/restraints/handcuffs/cable = 1,
+		/obj/item/restraints/legcuffs/bola = 1,
+		/obj/item/roller = 1,
+		/obj/item/spear = 1,
+		/obj/item/weldingtool/largetank = 1,
 		) = 8,
 
 	list(//equipment
-		/obj/item/clothing/head/welding = 1,
-		/obj/item/clothing/glasses/welding = 1,
-		/obj/item/clothing/glasses/hud/health = 1,
-		/obj/item/clothing/glasses/hud/diagnostic = 1,
-		/obj/item/storage/belt/utility = 1,
-		/obj/item/storage/belt/medical = 1,
-		/obj/item/clothing/suit/armor/vest/old = 1,
-		/obj/item/clothing/head/helmet/old = 1,
-		/obj/item/clothing/mask/muzzle = 1,
 		/obj/item/clothing/ears/earmuffs = 1,
-		/obj/item/clothing/gloves/tackler/offbrand = 1,
+		/obj/item/clothing/glasses/hud/diagnostic = 1,
+		/obj/item/clothing/glasses/hud/health = 1,
 		/obj/item/clothing/glasses/salesman = 1,
+		/obj/item/clothing/glasses/welding = 1,
+		/obj/item/clothing/gloves/tackler/offbrand = 1,
+		/obj/item/clothing/head/helmet/old = 1,
+		/obj/item/clothing/head/welding = 1,
+		/obj/item/clothing/mask/muzzle = 1,
+		/obj/item/clothing/suit/armor/vest/old = 1,
+		/obj/item/storage/belt/medical = 1,
+		/obj/item/storage/belt/utility = 1,
 		) = 8,
 
 	list(//strange objects
@@ -194,32 +194,32 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 		) = 8,
 
 	list(//construction and crafting
-		/obj/item/stock_parts/cell/high = 1,
-		/obj/item/stack/sheet/mineral/wood/fifty = 1,
 		/obj/item/beacon = 1,
-		/obj/item/weaponcrafting/receiver = 1,
 		/obj/item/paper/fluff/stations/soap = 1, //recipes count as crafting.
 		/obj/item/plaque = 1,
-		/obj/item/storage/box/clown = 1,
 		/obj/item/seeds/kronkus = 1,
 		/obj/item/seeds/odious_puffball = 1,
+		/obj/item/stack/sheet/mineral/wood/fifty = 1,
+		/obj/item/stock_parts/cell/high = 1,
+		/obj/item/storage/box/clown = 1,
+		/obj/item/weaponcrafting/receiver = 1,
 		) = 8,
 
 	list(//medical and chemicals
 		list(//basic healing items
-			/obj/item/stack/medical/suture = 1,
-			/obj/item/stack/medical/mesh = 1,
 			/obj/item/stack/medical/gauze = 1,
+			/obj/item/stack/medical/mesh = 1,
+			/obj/item/stack/medical/suture = 1,
 			) = 1,
 		list(//medical chems
 			/obj/item/reagent_containers/glass/bottle/multiver = 1,
-			/obj/item/reagent_containers/syringe/convermol = 1,
 			/obj/item/reagent_containers/hypospray/medipen = 1,
+			/obj/item/reagent_containers/syringe/convermol = 1,
 			) = 1,
 		list(//drinks
 			/obj/item/reagent_containers/food/drinks/bottle/vodka = 1,
-			/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1,
 			/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1,
+			/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1,
 			) = 1,
 		list(//sprayers
 			/obj/item/reagent_containers/spray = 1,
@@ -230,48 +230,48 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 
 	list(//food
 		/obj/item/food/canned/peaches/maint = 1,
-		/obj/item/storage/box/gum/happiness = 1,
 		/obj/item/storage/box/donkpockets = 1,
+		/obj/item/storage/box/gum/happiness = 1,
 		list(//Donk Varieties
-			/obj/item/storage/box/donkpockets/donkpocketspicy = 1,
-			/obj/item/storage/box/donkpockets/donkpocketteriyaki = 1,
-			/obj/item/storage/box/donkpockets/donkpocketpizza = 1,
 			/obj/item/storage/box/donkpockets/donkpocketberry = 1,
 			/obj/item/storage/box/donkpockets/donkpockethonk = 1,
+			/obj/item/storage/box/donkpockets/donkpocketpizza = 1,
+			/obj/item/storage/box/donkpockets/donkpocketspicy = 1,
+			/obj/item/storage/box/donkpockets/donkpocketteriyaki = 1,
 			) = 1,
 		list(//Donk-dinner Varieties
 			/obj/item/food/ready_donk = 1,
-			/obj/item/food/ready_donk/mac_n_cheese = 1,
 			/obj/item/food/ready_donk/donkhiladas = 1,
+			/obj/item/food/ready_donk/mac_n_cheese = 1,
 			) = 1,
 		/obj/item/food/monkeycube = 1,
 		) = 8,
 
 	list(//modsuits
-		/obj/item/mod/construction/broken_core = 1,
 		/obj/effect/spawner/random/mod/maint = 3,
+		/obj/item/mod/construction/broken_core = 1,
 		) = 4,
 
 	list(//music
-		/obj/item/instrument/violin = 5,
+		/obj/item/instrument/accordion = 5,
 		/obj/item/instrument/banjo = 5,
-		/obj/item/instrument/guitar = 5,
+		/obj/item/instrument/bikehorn = 2,
 		/obj/item/instrument/eguitar = 5,
 		/obj/item/instrument/glockenspiel = 5,
-		/obj/item/instrument/accordion = 5,
-		/obj/item/instrument/trumpet = 5,
+		/obj/item/instrument/guitar = 5,
+		/obj/item/instrument/harmonica = 5,
+		/obj/item/instrument/musicalmoth = 1,
+		/obj/item/instrument/recorder = 5,
 		/obj/item/instrument/saxophone = 5,
 		/obj/item/instrument/trombone = 5,
-		/obj/item/instrument/recorder = 5,
-		/obj/item/instrument/harmonica = 5,
-		/obj/item/instrument/bikehorn = 2,
+		/obj/item/instrument/trumpet = 5,
+		/obj/item/instrument/violin = 5,
 		/obj/item/instrument/violin/golden = 2,
-		/obj/item/instrument/musicalmoth = 1,
 		) = 2,
 
 	list(//fakeout items, keep this list at low relative weight
-		/obj/item/dice/d20 = 1, //To balance out the stealth die of fates in oddities
 		/obj/item/clothing/shoes/jackboots = 1,
+		/obj/item/dice/d20 = 1, //To balance out the stealth die of fates in oddities
 		) = 1,
 ))
 
@@ -279,59 +279,59 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 
 GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
 	list(//tools
-		/obj/item/weldingtool/hugetank = 1,
+		/obj/item/assembly/flash/memorizer = 1,
+		/obj/item/flashlight/flashdark = 1,
 		/obj/item/knife/kitchen = 1,
+		/obj/item/melee/baton/security/cattleprod/teleprod = 1,
+		/obj/item/pen/survival = 1,
 		/obj/item/restraints/handcuffs = 1,
 		/obj/item/shield/riot/buckler = 1,
-		/obj/item/melee/baton/security/cattleprod/teleprod = 1,
 		/obj/item/throwing_star = 1,
-		/obj/item/pen/survival = 1,
-		/obj/item/flashlight/flashdark = 1,
-		/obj/item/assembly/flash/memorizer = 1,
+		/obj/item/weldingtool/hugetank = 1,
 		) = 1,
 
 	list(//equipment
 		/obj/item/clothing/glasses/hud/security = 1,
 		/obj/item/clothing/glasses/sunglasses = 1,
-		/obj/item/storage/belt/security = 1,
-		/obj/item/storage/belt/military/assault = 1,
-		/obj/item/clothing/gloves/color/yellow = 1,
 		/obj/item/clothing/gloves/color/black = 1,
+		/obj/item/clothing/gloves/color/yellow = 1,
 		/obj/item/clothing/gloves/tackler/combat = 1,
 		/obj/item/clothing/head/helmet/justice = 1,
+		/obj/item/storage/belt/military/assault = 1,
+		/obj/item/storage/belt/security = 1,
 		) = 1,
 
 	list(//paint
-		/obj/item/paint/red = 1,
-		/obj/item/paint/green = 1,
-		/obj/item/paint/blue = 1,
-		/obj/item/paint/yellow = 1,
-		/obj/item/paint/violet = 1,
-		/obj/item/paint/black = 1,
-		/obj/item/paint/white = 1,
 		/obj/item/paint/anycolor = 1,
+		/obj/item/paint/black = 1,
+		/obj/item/paint/blue = 1,
+		/obj/item/paint/green = 1,
 		/obj/item/paint/paint_remover = 1,
+		/obj/item/paint/red = 1,
+		/obj/item/paint/violet = 1,
+		/obj/item/paint/white = 1,
+		/obj/item/paint/yellow = 1,
 		) = 1,
 
 	list(//medical and chemicals
 		list(//medkits
 			/obj/item/storage/box/hug/medical = 1,
-			/obj/item/storage/firstaid/regular = 1,
 			/obj/item/storage/firstaid/emergency = 1,
+			/obj/item/storage/firstaid/regular = 1,
 			) = 1,
 		list(//medical chems
-			/obj/item/reagent_containers/hypospray/medipen/salacid = 1,
 			/obj/item/reagent_containers/hypospray/medipen/oxandrolone = 1,
+			/obj/item/reagent_containers/hypospray/medipen/salacid = 1,
 			/obj/item/reagent_containers/syringe/contraband/methamphetamine = 1,
 			) = 1,
 		) = 1,
 
 	list(//misc
-		/obj/item/disk/nuclear/fake = 1,
 		/obj/item/book/granter/crafting_recipe/pipegun_prime = 1,
 		/obj/item/book/granter/crafting_recipe/trash_cannon = 1,
-		/obj/item/tattoo_kit = 1,
+		/obj/item/disk/nuclear/fake = 1,
 		/obj/item/skillchip/brainwashing = 1,
+		/obj/item/tattoo_kit = 1,
 		) = 1,
 
 ))
@@ -340,18 +340,18 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
 
 GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items
 		/obj/effect/rune/teleport = 1,
-		/obj/item/spear/grey_tide = 1,
-		/obj/item/shadowcloak = 1,
 		/obj/item/clothing/head/helmet/abductor = 1,
-		/obj/item/dice/d20/fate/stealth/one_use = 1, //Looks like a d20, keep the d20 in the uncommon pool.
-		/obj/item/dice/d20/fate/stealth/cursed = 1, //Only rolls 1
 		/obj/item/clothing/shoes/jackboots/fast = 1,
 		/obj/item/clothing/suit/armor/reactive/table = 1,
+		/obj/item/dice/d20/fate/stealth/cursed = 1, //Only rolls 1
+		/obj/item/dice/d20/fate/stealth/one_use = 1, //Looks like a d20, keep the d20 in the uncommon pool.
+		/obj/item/shadowcloak = 1,
+		/obj/item/spear/grey_tide = 1,
 		/obj/item/storage/box/donkpockets/donkpocketgondola = 1,
 		list(//music
 			/obj/item/instrument/saxophone/spectral = 1,
-			/obj/item/instrument/trumpet/spectral = 1,
 			/obj/item/instrument/trombone/spectral = 1,
+			/obj/item/instrument/trumpet/spectral = 1,
 			) = 1,
 	))
 
@@ -374,20 +374,22 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 
 GLOBAL_LIST_INIT(ratking_trash, list(//Garbage: used by the regal rat mob when spawning garbage.
 			/obj/item/cigbutt,
-			/obj/item/trash/cheesie,
 			/obj/item/trash/candy,
+			/obj/item/trash/cheesie,
 			/obj/item/trash/chips,
 			/obj/item/trash/pistachios,
 			/obj/item/trash/popcorn,
 			/obj/item/trash/raisins,
 			/obj/item/trash/sosjerky,
-			/obj/item/trash/syndi_cakes))
+			/obj/item/trash/syndi_cakes,
+		))
 
 GLOBAL_LIST_INIT(ratking_coins, list(//Coins: Used by the regal rat mob when spawning coins.
 			/obj/item/coin/iron,
-			/obj/item/coin/silver,
 			/obj/item/coin/plastic,
-			/obj/item/coin/titanium))
+			/obj/item/coin/silver,
+			/obj/item/coin/titanium,
+		))
 
 // List of all maintenance loot spawners, for easy finding at roundstart.
 GLOBAL_LIST_EMPTY(maintenance_loot_spawners)

code/_globalvars/lists/mapping.dm

@@ -1,16 +1,97 @@
-GLOBAL_LIST_INIT(cardinals, list(NORTH, SOUTH, EAST, WEST))
-GLOBAL_LIST_INIT(cardinals_multiz, list(NORTH, SOUTH, EAST, WEST, UP, DOWN))
-GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
-GLOBAL_LIST_INIT(corners_multiz, list(UP|NORTHEAST, UP|NORTHWEST, UP|SOUTHEAST, UP|SOUTHWEST, DOWN|NORTHEAST, DOWN|NORTHWEST, DOWN|SOUTHEAST, DOWN|SOUTHWEST))
+GLOBAL_LIST_INIT(cardinals, list(
+	NORTH,
+	SOUTH,
+	EAST,
+	WEST,
+))
+GLOBAL_LIST_INIT(cardinals_multiz, list(
+	NORTH,
+	SOUTH,
+	EAST,
+	WEST,
+	UP,
+	DOWN,
+))
+GLOBAL_LIST_INIT(diagonals, list(
+	NORTHEAST,
+	NORTHWEST,
+	SOUTHEAST,
+	SOUTHWEST,
+))
+GLOBAL_LIST_INIT(corners_multiz, list(
+	UP|NORTHEAST,
+	UP|NORTHWEST,
+	UP|SOUTHEAST,
+	UP|SOUTHWEST,
+	DOWN|NORTHEAST,
+	DOWN|NORTHWEST,
+	DOWN|SOUTHEAST,
+	DOWN|SOUTHWEST,
+))
 GLOBAL_LIST_INIT(diagonals_multiz, list(
-	NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST,
-	UP|NORTH, UP|SOUTH, UP|EAST, UP|WEST, UP|NORTHEAST, UP|NORTHWEST, UP|SOUTHEAST, UP|SOUTHWEST,
-	DOWN|NORTH, DOWN|SOUTH, DOWN|EAST, DOWN|WEST, DOWN|NORTHEAST, DOWN|NORTHWEST, DOWN|SOUTHEAST, DOWN|SOUTHWEST))
+	NORTHEAST,
+	NORTHWEST,
+	SOUTHEAST,
+	SOUTHWEST,
+
+	UP|NORTH,
+	UP|SOUTH,
+	UP|EAST,
+	UP|WEST,
+	UP|NORTHEAST,
+	UP|NORTHWEST,
+	UP|SOUTHEAST,
+	UP|SOUTHWEST,
+
+	DOWN|NORTH,
+	DOWN|SOUTH,
+	DOWN|EAST,
+	DOWN|WEST,
+	DOWN|NORTHEAST,
+	DOWN|NORTHWEST,
+	DOWN|SOUTHEAST,
+	DOWN|SOUTHWEST,
+))
 GLOBAL_LIST_INIT(alldirs_multiz, list(
-	NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST,
-	UP, UP|NORTH, UP|SOUTH, UP|EAST, UP|WEST, UP|NORTHEAST, UP|NORTHWEST, UP|SOUTHEAST, UP|SOUTHWEST,
-	DOWN, DOWN|NORTH, DOWN|SOUTH, DOWN|EAST, DOWN|WEST, DOWN|NORTHEAST, DOWN|NORTHWEST, DOWN|SOUTHEAST, DOWN|SOUTHWEST))
-GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
+	NORTH,
+	SOUTH,
+	EAST,
+	WEST,
+	NORTHEAST,
+	NORTHWEST,
+	SOUTHEAST,
+	SOUTHWEST,
+
+	UP,
+	UP|NORTH,
+	UP|SOUTH,
+	UP|EAST,
+	UP|WEST,
+	UP|NORTHEAST,
+	UP|NORTHWEST,
+	UP|SOUTHEAST,
+	UP|SOUTHWEST,
+
+	DOWN,
+	DOWN|NORTH,
+	DOWN|SOUTH,
+	DOWN|EAST,
+	DOWN|WEST,
+	DOWN|NORTHEAST,
+	DOWN|NORTHWEST,
+	DOWN|SOUTHEAST,
+	DOWN|SOUTHWEST,
+))
+GLOBAL_LIST_INIT(alldirs, list(
+	NORTH,
+	SOUTH,
+	EAST,
+	WEST,
+	NORTHEAST,
+	NORTHWEST,
+	SOUTHEAST,
+	SOUTHWEST,
+))
 
 GLOBAL_LIST_EMPTY(landmarks_list) //list of all landmarks created
 GLOBAL_LIST_EMPTY(start_landmarks_list) //list of all spawn points created
@@ -48,4 +129,8 @@ GLOBAL_LIST_EMPTY_TYPED(areas_by_type, /area)
 GLOBAL_LIST_EMPTY(all_abstract_markers)
 
 /// Global list of megafauna spawns on cave gen
-GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/megafauna/dragon = 4, /mob/living/simple_animal/hostile/megafauna/colossus = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = 6))
+GLOBAL_LIST_INIT(megafauna_spawn_list, list(
+	/mob/living/simple_animal/hostile/megafauna/bubblegum = 6,
+	/mob/living/simple_animal/hostile/megafauna/colossus = 2,
+	/mob/living/simple_animal/hostile/megafauna/dragon = 4,
+))

code/_globalvars/lists/quirks.dm

@@ -1,4 +1,10 @@
 ///Lists related to quirk selection
 
 ///Types of glasses that can be selected at character selection with the Nearsighted quirk
-GLOBAL_LIST_INIT(nearsighted_glasses, list("Regular","Thin","Circle","Hipster", "Modern"))
+GLOBAL_LIST_INIT(nearsighted_glasses, list(
+	"Circle",
+	"Hipster",
+	"Modern", // SKYRAT EDIT ADD
+	"Regular",
+	"Thin",
+))

code/_globalvars/lists/typecache.dm

@@ -9,10 +9,19 @@ GLOBAL_LIST_INIT(typecache_living, typecacheof(/mob/living))
 
 GLOBAL_LIST_INIT(typecache_stack, typecacheof(/obj/item/stack))
 
-GLOBAL_LIST_INIT(typecache_machine_or_structure, typecacheof(list(/obj/machinery, /obj/structure)))
+GLOBAL_LIST_INIT(typecache_machine_or_structure, typecacheof(list(
+	/obj/machinery,
+	/obj/structure,
+)))
 
 /// A typecache listing structures that are considered to have surfaces that you can place items on that are higher than the floor. This, of course, should be restricted to /atom/movables. This is primarily used for food decomposition code.
-GLOBAL_LIST_INIT(typecache_elevated_structures, typecacheof(list(/obj/structure/table,/obj/structure/rack,/obj/machinery/conveyor,/obj/structure/closet,/obj/machinery/stasis)))
+GLOBAL_LIST_INIT(typecache_elevated_structures, typecacheof(list(
+	/obj/machinery/conveyor,
+	/obj/machinery/stasis,
+	/obj/structure/closet,
+	/obj/structure/rack,
+	/obj/structure/table,
+)))
 
 /// A typecache of objects that player controlled, easily accessible, hostile mobs should not be able to attack
 GLOBAL_LIST_INIT(typecache_general_bad_hostile_attack_targets, typecacheof(list(

code/_globalvars/lists/wiremod.dm

@@ -1,20 +1,20 @@
 /// The basic player-facing types that don't have any super special behaviour.
 GLOBAL_LIST_INIT(wiremod_basic_types, list(
 	PORT_TYPE_ANY,
-	PORT_TYPE_STRING,
+	PORT_TYPE_ATOM,
 	PORT_TYPE_NUMBER,
 	PORT_TYPE_SIGNAL,
+	PORT_TYPE_STRING,
 	PORT_TYPE_TABLE,
-	PORT_TYPE_ATOM,
 ))
 
 /// The fundamental datatypes of the byond game engine.
 GLOBAL_LIST_INIT(wiremod_fundamental_types, list(
 	PORT_TYPE_ANY,
-	PORT_TYPE_NUMBER,
+	PORT_TYPE_ASSOC_LIST(PORT_TYPE_ANY, PORT_TYPE_ANY),
 	PORT_TYPE_ATOM,
 	PORT_TYPE_DATUM,
 	PORT_TYPE_LIST(PORT_TYPE_ANY),
+	PORT_TYPE_NUMBER,
 	PORT_TYPE_STRING,
-	PORT_TYPE_ASSOC_LIST(PORT_TYPE_ANY, PORT_TYPE_ANY),
 ))

code/_globalvars/lists/xenobiology.dm

@@ -3,35 +3,39 @@
 ///Assoc list of cell line define | assoc list of datum | cell_line
 GLOBAL_LIST_INIT_TYPED(cell_line_tables, /list, list(
 	CELL_LINE_TABLE_SLUDGE = list(
-		/datum/micro_organism/cell_line/sholean_grapes = 2,
 		/datum/micro_organism/cell_line/blobbernaut = 1,
-		/datum/micro_organism/cell_line/slime = 2,
-		/datum/micro_organism/cell_line/cow = 1,
-		/datum/micro_organism/cell_line/mouse = 1,
 		/datum/micro_organism/cell_line/chicken = 1,
 		/datum/micro_organism/cell_line/cockroach = 2,
+		/datum/micro_organism/cell_line/cow = 1,
+		/datum/micro_organism/cell_line/mouse = 1,
+		/datum/micro_organism/cell_line/sholean_grapes = 2,
+		/datum/micro_organism/cell_line/slime = 2,
 	),
 
 	CELL_LINE_TABLE_MOIST = list(
+		/datum/micro_organism/cell_line/carp = 1,
+		/datum/micro_organism/cell_line/cockroach = 1,
 		/datum/micro_organism/cell_line/gelatinous_cube = 2,
 		/datum/micro_organism/cell_line/megacarp = 1,
 		/datum/micro_organism/cell_line/slime = 2,
 		/datum/micro_organism/cell_line/snake = 1,
-		/datum/micro_organism/cell_line/carp = 1,
-		/datum/micro_organism/cell_line/cockroach = 1),
+	),
 
-	CELL_LINE_TABLE_BLOB = list(/datum/micro_organism/cell_line/blobbernaut = 1,
-								/datum/micro_organism/cell_line/blob_spore = 1),
+	CELL_LINE_TABLE_BLOB = list(
+		/datum/micro_organism/cell_line/blob_spore = 1,
+		/datum/micro_organism/cell_line/blobbernaut = 1,
+	),
 
 	CELL_LINE_TABLE_MOLD = list(
-		/datum/micro_organism/cell_line/vat_beast = 2,
 		/datum/micro_organism/cell_line/bear = 1,
-		/datum/micro_organism/cell_line/slime = 1,
 		/datum/micro_organism/cell_line/blob_spore = 1,
-		/datum/micro_organism/cell_line/mouse = 2,
-		/datum/micro_organism/cell_line/corgi = 1,
+		/datum/micro_organism/cell_line/cat = 1,
 		/datum/micro_organism/cell_line/cockroach = 1,
-		/datum/micro_organism/cell_line/cat = 1),
+		/datum/micro_organism/cell_line/corgi = 1,
+		/datum/micro_organism/cell_line/mouse = 2,
+		/datum/micro_organism/cell_line/slime = 1,
+		/datum/micro_organism/cell_line/vat_beast = 2,
+	),
 
 	CELL_LINE_TABLE_BEAR = list(/datum/micro_organism/cell_line/bear = 1),
 	CELL_LINE_TABLE_BLOBBERNAUT = list(/datum/micro_organism/cell_line/blobbernaut = 1),
@@ -56,7 +60,8 @@ GLOBAL_LIST_INIT_TYPED(cell_line_tables, /list, list(
 	CELL_LINE_TABLE_CLOWN = list(
 		/datum/micro_organism/cell_line/clown/bananaclown = 1,
 		/datum/micro_organism/cell_line/clown/glutton = 1,
-		/datum/micro_organism/cell_line/clown/longclown = 1),
+		/datum/micro_organism/cell_line/clown/longclown = 1,
+	),
 
 	CELL_LINE_TABLE_GLUTTON = list(/datum/micro_organism/cell_line/clown/glutton = 1),
 	CELL_LINE_TABLE_FROG = list(/datum/micro_organism/cell_line/frog = 1),
@@ -66,12 +71,13 @@ GLOBAL_LIST_INIT_TYPED(cell_line_tables, /list, list(
 	CELL_LINE_TABLE_MEGA_ARACHNID = list(/datum/micro_organism/cell_line/mega_arachnid = 1),
 	CELL_LINE_TABLE_ALGAE = list(
 		/datum/micro_organism/cell_line/frog = 2,
-		/datum/micro_organism/cell_line/snake = 1,
-		/datum/micro_organism/cell_line/queen_bee = 1,
-		/datum/micro_organism/cell_line/walking_mushroom = 2,
 		/datum/micro_organism/cell_line/leaper = 2,
-		/datum/micro_organism/cell_line/mega_arachnid = 1)
-	))
+		/datum/micro_organism/cell_line/mega_arachnid = 1,
+		/datum/micro_organism/cell_line/queen_bee = 1,
+		/datum/micro_organism/cell_line/snake = 1,
+		/datum/micro_organism/cell_line/walking_mushroom = 2,
+	)
+))
 
 ///Assoc list of cell virus define | assoc list of datum | cell_virus
 GLOBAL_LIST_INIT(cell_virus_tables, list(
@@ -80,4 +86,10 @@ GLOBAL_LIST_INIT(cell_virus_tables, list(
 	))
 
 ///List of all possible sample colors
-GLOBAL_LIST_INIT(xeno_sample_colors, list(COLOR_SAMPLE_YELLOW, COLOR_SAMPLE_PURPLE, COLOR_SAMPLE_GREEN, COLOR_SAMPLE_BROWN, COLOR_SAMPLE_GRAY))
+GLOBAL_LIST_INIT(xeno_sample_colors, list(
+	COLOR_SAMPLE_BROWN,
+	COLOR_SAMPLE_GRAY,
+	COLOR_SAMPLE_GREEN,
+	COLOR_SAMPLE_PURPLE,
+	COLOR_SAMPLE_YELLOW,
+))