New ego dump (#2349)

balancing

finishes dark carnival

adds hex nail lol

fixes an icon state

adds holiday

swings

more cleanup

code/datums/abnormality/_ego_datum/aleph.dm

@@ -143,7 +143,7 @@
 	item_path = /obj/item/ego_weapon/spicebush/fan
 	cost = 100//appears in wishing well
 
-//Til the Last Shot - Flesh Is Willing
+// Til the Last Shot - Flesh Is Willing
 /datum/ego_datum/armor/willing
 	item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/willing
 	cost = 100
@@ -152,7 +152,7 @@
 	item_path = /obj/item/ego_weapon/willing
 	cost = 100
 
-//Army In Black - Pink
+// Army In Black - Pink
 /datum/ego_datum/armor/pink
 	item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/pink
 	cost = 100
@@ -161,12 +161,12 @@
 	item_path = /obj/item/gun/ego_gun/pink
 	cost = 100
 
-//We Can Change Anything - Iron maiden
+// We Can Change Anything - Iron maiden
 /datum/ego_datum/weapon/iron_maiden
 	item_path = /obj/item/ego_weapon/iron_maiden
 	cost = 1000
 
-//Nobody Is - Mockery
+// Nobody Is - Mockery
 /datum/ego_datum/armor/mockery
 	item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/mockery
 	cost = 100
@@ -175,7 +175,7 @@
 	item_path = /obj/item/ego_weapon/mockery
 	cost = 100
 
-//Waxing of the Black Sun - Et in Arcadia ego and Judge
+// Waxing of the Black Sun - Et in Arcadia ego and Judge
 /datum/ego_datum/armor/arcadia
 	item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/arcadia
 	cost = 100
@@ -188,7 +188,7 @@
 	item_path = /obj/item/gun/ego_gun/arcadia/judge
 	cost = 100
 
-//Ahab Personal E.G.O - Gasharpoon
+// Ahab Personal E.G.O - Gasharpoon
 /datum/ego_datum/weapon/gasharpoon
 	item_path = /obj/item/ego_weapon/shield/gasharpoon
 	cost = 100//appears in wishing well
@@ -197,3 +197,8 @@
 /datum/ego_datum/armor/giant
 	item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/giant
 	cost = 100
+
+// Clown Smiling at Me - Dark Carnival
+/datum/ego_datum/weapon/darkcarnival
+	item_path = /obj/item/ego_weapon/wield/darkcarnival
+	cost = 100 //This weapon is normally a result of fusion but is treated as ALEPH for certain purposes

code/datums/abnormality/_ego_datum/he.dm

@@ -482,3 +482,12 @@
 /datum/ego_datum/weapon/telepole
 	item_path = /obj/item/ego_weapon/telepole
 	cost = 35
+
+// Teddy in Pain - Hex Nail
+/datum/ego_datum/weapon/hexnail
+	item_path = /obj/item/ego_weapon/hexnail
+	cost = 35
+
+/datum/ego_datum/armor/hexnail
+	item_path = /obj/item/clothing/suit/armor/ego_gear/he/hexnail
+	cost = 35

code/datums/abnormality/_ego_datum/teth.dm

@@ -81,7 +81,7 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/noise
 	cost = 20
 
-//Bloodbath - Wrist Cutter
+// Bloodbath - Wrist Cutter
 /datum/ego_datum/weapon/wrist
 	item_path = /obj/item/ego_weapon/mini/wrist
 	cost = 20
@@ -126,7 +126,7 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/shy
 	cost = 20
 
-//Grave of Cherry Blossoms - Blossom
+// Grave of Cherry Blossoms - Blossom
 /datum/ego_datum/weapon/blossom
 	item_path = /obj/item/ego_weapon/mini/blossom
 	cost = 20
@@ -135,7 +135,7 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/blossoms
 	cost = 20
 
-//Gone with a Simple Smile - Hat Trick
+// Gone with a Simple Smile - Hat Trick
 /datum/ego_datum/weapon/trick
 	item_path = /obj/item/ego_weapon/mini/trick
 	cost = 20
@@ -144,7 +144,7 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/trick
 	cost = 20
 
-//Penitent Girl - Sorrow
+// Penitent Girl - Sorrow
 /datum/ego_datum/weapon/sorrow
 	item_path = /obj/item/ego_weapon/sorrow
 	cost = 20
@@ -153,7 +153,7 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/sorrow
 	cost = 20
 
-//Drowned Sisters - Sorority
+// Drowned Sisters - Sorority
 /datum/ego_datum/weapon/sorority
 	item_path = /obj/item/ego_weapon/sorority
 	cost = 20
@@ -162,7 +162,7 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/sorority
 	cost = 20
 
-//Void Dream - Engulfing Dream
+// Void Dream - Engulfing Dream
 /datum/ego_datum/weapon/dream
 	item_path = /obj/item/gun/ego_gun/dream
 	cost = 20
@@ -171,7 +171,7 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/dream
 	cost = 20
 
-//Beanstalk without Jack - Magic Bean
+// Beanstalk without Jack - Magic Bean
 /datum/ego_datum/armor/bean
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/bean
 	cost = 20
@@ -181,7 +181,7 @@
 	item_path = /obj/item/ego_weapon/mini/bean
 	cost = 20
 
-//Pale Horse - Revelation
+// Pale Horse - Revelation
 /datum/ego_datum/armor/revelation
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/revelation
 	cost = 20
@@ -195,7 +195,7 @@
 	item_path = /obj/item/ego_weapon/hearth
 	cost = 20
 
-//Meat Lantern - Lantern
+// Meat Lantern - Lantern
 /datum/ego_datum/armor/lantern
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/lantern
 	cost = 20
@@ -204,7 +204,7 @@
 	item_path = /obj/item/ego_weapon/lantern
 	cost = 20
 
-//Cinderella's pumpkin - carriage
+// Cinderella's pumpkin - carriage
 /datum/ego_datum/armor/curfew
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/curfew
 	cost = 20
@@ -213,12 +213,12 @@
 	item_path = /obj/item/ego_weapon/lance/curfew
 	cost = 20
 
-//Lady facing the Wall - Wedge
+// Lady facing the Wall - Wedge
 /datum/ego_datum/armor/wedge
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/wedge
 	cost = 20
 
-//Book Without Pictures or Dialogue - Page
+// Book Without Pictures or Dialogue - Page
 /datum/ego_datum/armor/page
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/page
 	cost = 20
@@ -227,7 +227,7 @@
 	item_path = /obj/item/gun/ego_gun/page
 	cost = 20
 
-//Tangle - Rapunzel
+// Tangle - Rapunzel
 /* /datum/ego_datum/armor/rapunzel
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/rapunzel
 	cost = 20
@@ -236,7 +236,7 @@
 	item_path = /obj/item/gun/ego_gun/rapunzel
 	cost = 20 */
 
-//Someone's Portrait - Snapshot
+// Someone's Portrait - Snapshot
 /datum/ego_datum/armor/snapshot
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/snapshot
 	cost = 20
@@ -245,7 +245,7 @@
 	item_path = /obj/item/gun/ego_gun/snapshot
 	cost = 20
 
-//Pagoda Veneration - Wishing Cairn
+// Pagoda Veneration - Wishing Cairn
 /datum/ego_datum/armor/wishing_cairn
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/wishing_cairn
 	cost = 20
@@ -254,7 +254,7 @@
 	item_path = /obj/item/gun/ego_gun/wishing_cairn
 	cost = 20
 
-//Fairy Gentleman - Sloshing
+// Fairy Gentleman - Sloshing
 /datum/ego_datum/armor/sloshing
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/sloshing
 	cost = 20
@@ -263,7 +263,7 @@
 	item_path = /obj/item/ego_weapon/sloshing
 	cost = 20
 
-//So That No One Will Cry - Red Sheet
+// So That No One Will Cry - Red Sheet
 /datum/ego_datum/armor/red_sheet
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/red_sheet
 	cost = 20
@@ -272,7 +272,7 @@
 	item_path = /obj/item/ego_weapon/red_sheet
 	cost = 20
 
-//Brazen Bull - Capote
+// Brazen Bull - Capote
 /datum/ego_datum/armor/capote
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/capote
 	cost = 20
@@ -281,7 +281,7 @@
 	item_path = /obj/item/ego_weapon/shield/capote
 	cost = 20
 
-//Fairy-Long-Legs - Four-Leaf Clover
+// Fairy-Long-Legs - Four-Leaf Clover
 /datum/ego_datum/armor/fourleaf_clover
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/fourleaf_clover
 	cost = 20
@@ -290,7 +290,7 @@
 	item_path = /obj/item/ego_weapon/mini/fourleaf_clover
 	cost = 20
 
-//Red Blooded American - Patriot
+// Red Blooded American - Patriot
 /datum/ego_datum/armor/patriot
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/patriot
 	cost = 20
@@ -299,7 +299,7 @@
 	item_path = /obj/item/gun/ego_gun/patriot
 	cost = 20
 
-//Spirit of Falada - Zauberhorn
+// Spirit of Falada - Zauberhorn
 /datum/ego_datum/armor/zauberhorn
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/zauberhorn
 	cost = 20
@@ -308,7 +308,7 @@
 	item_path = /obj/item/ego_weapon/zauberhorn
 	cost = 20
 
-//Skin Prophecy - Visions of Future Past
+// Skin Prophecy - Visions of Future Past
 /datum/ego_datum/armor/visions
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/visions
 	cost = 20
@@ -317,7 +317,7 @@
 	item_path = /obj/item/ego_weapon/lance/visions
 	cost = 20
 
-//All-Around Cleaner - Sanitizer
+// All-Around Cleaner - Sanitizer
 /datum/ego_datum/armor/sanitizer
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/sanitizer
 	cost = 20
@@ -326,7 +326,7 @@
 	item_path = /obj/item/ego_weapon/sanitizer
 	cost = 20
 
-//Faelantern - Midwinter Nightmare
+// Faelantern - Midwinter Nightmare
 /datum/ego_datum/armor/faelantern
 	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/faelantern
 	cost = 20

code/datums/abnormality/_ego_datum/tools.dm

@@ -11,7 +11,7 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/tools/bucket
 	cost = 12
 
-//Don't touch me! - Prohibited
+// Don't touch me! - Prohibited
 /datum/ego_datum/weapon/prohibited
 	item_path = /obj/item/ego_weapon/prohibited
 	cost = 12
@@ -20,7 +20,7 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/tools/prohibited
 	cost = 12
 
-//You must be happy - Plastic Smile
+// You must be happy - Plastic Smile
 /datum/ego_datum/weapon/plastic
 	item_path = /obj/item/ego_weapon/plastic
 	cost = 12
@@ -33,7 +33,7 @@
 //  TETH  //
 ////////////
 
-//Heart of Aspiration - Aspiration
+// Heart of Aspiration - Aspiration
 /datum/ego_datum/armor/aspiration
 	item_path = /obj/item/clothing/suit/armor/ego_gear/tools/aspiration
 	cost = 20
@@ -46,7 +46,7 @@
 //  HE  //
 //////////
 
-//All-Natural Snake Oil - Swindle
+// All-Natural Snake Oil - Swindle
 /datum/ego_datum/armor/swindle
 	item_path = /obj/item/clothing/suit/armor/ego_gear/tools/swindle
 	cost = 35
@@ -55,7 +55,7 @@
 	item_path = /obj/item/gun/ego_gun/pistol/swindle
 	cost = 35
 
-//Viva Voce - Ringing
+// Viva Voce - Ringing
 /datum/ego_datum/armor/ringing
 	item_path = /obj/item/clothing/suit/armor/ego_gear/tools/ringing
 	cost = 35
@@ -64,7 +64,7 @@
 	item_path = /obj/item/gun/ego_gun/ringing
 	cost = 35
 
-//Theonite Slab - Divinity
+// Theonite Slab - Divinity
 /datum/ego_datum/armor/divinity
 	item_path = /obj/item/clothing/suit/armor/ego_gear/tools/divinity
 	cost = 35
@@ -73,7 +73,7 @@
 	item_path = /obj/item/ego_weapon/divinity
 	cost = 35
 
-//Third Fate's Loom - Destiny
+// Third Fate's Loom - Destiny
 /datum/ego_datum/armor/destiny
 	item_path = /obj/item/clothing/suit/armor/ego_gear/tools/destiny
 	cost = 35
@@ -82,7 +82,7 @@
 	item_path = /obj/item/ego_weapon/destiny
 	cost = 35
 
-//Tree Sap - Giant tree branch
+// Tree Sap - Giant tree branch
 /datum/ego_datum/weapon/giant_tree_branch
 	item_path = /obj/item/ego_weapon/giant_tree_branch
 	cost = 35
@@ -91,7 +91,7 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/tools/giant_tree_branch
 	cost = 35
 
-//Shelter from the 27th of March - Isolation
+// Shelter from the 27th of March - Isolation
 /datum/ego_datum/weapon/isolation
 	item_path = /obj/item/ego_weapon/shield/isolation
 	cost = 35
@@ -104,7 +104,7 @@
 //  WAW  //
 ///////////
 
-//Dr.Jekyll's Formula - Hyde
+// Dr.Jekyll's Formula - Hyde
 /datum/ego_datum/armor/hyde
 	item_path = /obj/item/clothing/suit/armor/ego_gear/tools/hyde
 	cost = 50
@@ -113,7 +113,7 @@
 	item_path = /obj/item/ego_weapon/hyde
 	cost = 50
 
-//Backwards Clock - Wind-up
+// Backwards Clock - Wind-up
 /datum/ego_datum/weapon/windup
 	item_path = /obj/item/ego_weapon/windup
 	cost = 50