Black Sun Aux PR (#2356)

Black Sun shit that's not the abno

black sun now has a fight

updates Black Sun

black sun expansion

better work rates for the higher the sun is,

Update black_sun.dm

Update aleph.dm

waxxing update

sun update

updates comments

Update black_sun.dm

code/datums/abnormality/_ego_datum/aleph.dm

@@ -175,6 +175,19 @@
 	item_path = /obj/item/ego_weapon/mockery
 	cost = 100
 
+//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
+
+/datum/ego_datum/weapon/arcadia
+	item_path = /obj/item/gun/ego_gun/arcadia
+	cost = 100
+
+/datum/ego_datum/weapon/judge
+	item_path = /obj/item/gun/ego_gun/arcadia/judge
+	cost = 100
+
 //Ahab Personal E.G.O - Gasharpoon
 /datum/ego_datum/weapon/gasharpoon
 	item_path = /obj/item/ego_weapon/shield/gasharpoon

code/game/objects/items/ego_weapons/_lists.dm

@@ -10,6 +10,7 @@ GLOBAL_LIST_INIT(small_ego, list (
 	/obj/item/gun/ego_gun/intentions,
 	/obj/item/gun/ego_gun/beak,
 	/obj/item/ego_weapon/lance/visions,
+	/obj/item/gun/ego_gun/arcadia/judge,
 
 	//Non-EGO weapons
 	/obj/item/ego_weapon/city/ncorp_mark,

code/modules/clothing/suits/ego_gear/aleph.dm

@@ -430,3 +430,15 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
 							TEMPERANCE_ATTRIBUTE = 100,
 							JUSTICE_ATTRIBUTE = 80
 							)
+
+/obj/item/clothing/suit/armor/ego_gear/aleph/arcadia
+	name = "Et in Arcadia Ego"
+	desc = "An old, dusty brown suit."
+	icon_state = "arcadia"
+	armor = list(RED_DAMAGE = 70, WHITE_DAMAGE = 50, BLACK_DAMAGE = 60, PALE_DAMAGE = 60) // 240
+	attribute_requirements = list(
+							FORTITUDE_ATTRIBUTE = 80,
+							PRUDENCE_ATTRIBUTE = 80,
+							TEMPERANCE_ATTRIBUTE = 80,
+							JUSTICE_ATTRIBUTE = 100
+							)

code/modules/projectiles/ammunition/ego_ammunition/aleph.dm

@@ -51,3 +51,9 @@
 	projectile_type = /obj/projectile/ego_bullet/pink
 	pellets = 1
 	variance = 0
+
+/obj/item/ammo_casing/caseless/arcadia
+	name = "arcadia bullet"
+	desc = "An arcadia bullet."
+	projectile_type = /obj/projectile/ego_bullet/arcadia
+	variance = 0

code/modules/projectiles/guns/ego_gun/aleph.dm

@@ -222,3 +222,53 @@
 		UnregisterSignal(current_holder, COMSIG_MOVABLE_MOVED)
 		UnregisterSignal(current_holder, COMSIG_ATOM_DIR_CHANGE)
 		current_holder = null
+
+/obj/item/gun/ego_gun/arcadia
+	name = "Et in Arcadia Ego"
+	desc = "With the waxing of the sun, humanity wanes."
+	icon_state = "arcadia"
+	inhand_icon_state = "arcadia"
+	special = "Use in hand to load bullets."
+	ammo_type = /obj/item/ammo_casing/caseless/arcadia
+	weapon_weight = WEAPON_HEAVY
+	spread = 5
+	recoil = 1.5
+	fire_sound = 'sound/weapons/gun/rifle/shot_atelier.ogg'
+	vary_fire_sound = TRUE
+	fire_sound_volume = 30
+	fire_delay = 7
+
+	attribute_requirements = list(
+							FORTITUDE_ATTRIBUTE = 80,
+							PRUDENCE_ATTRIBUTE = 80,
+							TEMPERANCE_ATTRIBUTE = 80,
+							JUSTICE_ATTRIBUTE = 100
+							)
+
+
+	shotsleft = 16	//Based off a henry .44
+	reloadtime = 0.5 SECONDS
+
+/obj/item/gun/ego_gun/arcadia/reload_ego(mob/user)
+	if(shotsleft == initial(shotsleft))
+		return
+	is_reloading = TRUE
+	to_chat(user,"<span class='notice'>You start loading a bullet.</span>")
+	if(do_after(user, reloadtime, src)) //gotta reload
+		playsound(src, 'sound/weapons/gun/general/slide_lock_1.ogg', 50, TRUE)
+		shotsleft +=1
+	is_reloading = FALSE
+
+/obj/item/gun/ego_gun/arcadia/judge
+	name = "Judge"
+	desc = "You will be judged; as I have."
+	icon_state = "judge"
+	inhand_icon_state = "judge"
+	weapon_weight = WEAPON_MEDIUM	//Cannot be dual wielded
+	recoil = 2
+	fire_sound_volume = 30
+	fire_delay = 12
+
+
+	shotsleft = 6	//Based off a colt Single Action Navy
+	reloadtime = 0.8 SECONDS

code/modules/projectiles/projectile/ego_bullets/aleph.dm

@@ -110,3 +110,8 @@
 /obj/projectile/ego_bullet/pink/on_hit(atom/target, blocked = FALSE, pierce_hit)
 	..()
 	new /obj/effect/temp_visual/friend_hearts(get_turf(target))//looks better than impact_effect_type and works
+
+/obj/projectile/ego_bullet/arcadia
+	name = "arcadia"
+	damage = 120 // VERY high damage
+	damage_type = RED_DAMAGE