Abno Dump 2023 (#1224)

* Abno Dump 2023 asd asd Adds skin prophet and sunset traveller adds EGO finishes eris asd asd eris beginning Update 64x64.dmi Update cleaner.dm Adds all-around cleaner Update zayin.dmi Update will_you_play.dm asd asd finishes weapons armor asd asd Update will_you_play.dm Update highway_devotee.dm highway EGO updates Update zayin.dm Update zayin.dm Update zayin.dmi Update zayin.dmi Multiple fixes Update will_you_play.dm Update he.dm Update teth.dm code can compile Update will_you_play.dm Update will_you_play.dm * final commit * Update zayin.dm * Update he.dm * Update code/modules/clothing/suits/ego_gear/teth.dm Co-authored-by: [̸R̵e̵d̴a̴c̶t̸e̸d̴]̵ <[email protected]> * Update zayin.dm * Update zayin.dm * Update code/modules/mob/living/simple_animal/abnormality/teth/skin_prophet.dm Co-authored-by: [̸R̵e̵d̴a̴c̶t̸e̸d̴]̵ <[email protected]> * Update eris.dm * Update code/modules/mob/living/simple_animal/abnormality/teth/skin_prophet.dm Co-authored-by: [̸R̵e̵d̴a̴c̶t̸e̸d̴]̵ <[email protected]> * Update he.dm * Update code/modules/mob/living/simple_animal/abnormality/he/eris.dm Co-authored-by: [̸R̵e̵d̴a̴c̶t̸e̸d̴]̵ <[email protected]> * Update he.dm --------- Co-authored-by: [̸R̵e̵d̴a̴c̶t̸e̸d̴]̵ <[email protected]>
vlggms · Oct 17, 2023 · 92b3032 · 92b3032
1 parent 7162cb5
commit 92b3032
Show file tree

Hide file tree

Showing 38 changed files with 1,102 additions and 0 deletions.
diff --git a/ModularTegustation/Teguicons/32x32.dmi b/ModularTegustation/Teguicons/32x32.dmi
diff --git a/ModularTegustation/Teguicons/32x48.dmi b/ModularTegustation/Teguicons/32x48.dmi
diff --git a/ModularTegustation/Teguicons/48x48.dmi b/ModularTegustation/Teguicons/48x48.dmi
diff --git a/ModularTegustation/Teguicons/64x64.dmi b/ModularTegustation/Teguicons/64x64.dmi
diff --git a/ModularTegustation/Teguicons/tegumobs.dmi b/ModularTegustation/Teguicons/tegumobs.dmi
diff --git a/code/datums/abnormality/_ego_datum/he.dm b/code/datums/abnormality/_ego_datum/he.dm
@@ -405,3 +405,33 @@
 /datum/ego_datum/weapon/faelantern
 	item_path = /obj/item/ego_weapon/faelantern
 	cost = 35
+
+//Will You Play - Voodoo doll
+/datum/ego_datum/armor/voodoo
+	item_path = /obj/item/clothing/suit/armor/ego_gear/he/voodoo
+	cost = 35
+
+/datum/ego_datum/weapon/voodoo
+	item_path = /obj/item/ego_weapon/voodoo
+	cost = 35
+
+//Eris - Coiling
+/datum/ego_datum/armor/coiling
+	item_path = /obj/item/clothing/suit/armor/ego_gear/he/coiling
+	cost = 35
+
+/datum/ego_datum/weapon/coiling
+	item_path = /obj/item/ego_weapon/coiling
+	cost = 35
+
+//Highway Devotee - Uturn
+/datum/ego_datum/armor/uturn
+	item_path = /obj/item/clothing/suit/armor/ego_gear/he/uturn
+	cost = 35
+
+/*
+/datum/ego_datum/weapon/uturn
+	item_path = /obj/item/ego_weapon/uturn
+	cost = 35*/
+
+
diff --git a/code/datums/abnormality/_ego_datum/teth.dm b/code/datums/abnormality/_ego_datum/teth.dm
@@ -303,3 +303,22 @@
 /datum/ego_datum/weapon/zauberhorn
 	item_path = /obj/item/ego_weapon/zauberhorn
 	cost = 20
+
+//Skin Prophecy - Visions of Future Past
+/datum/ego_datum/armor/visions
+	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/visions
+	cost = 20
+
+/*/datum/ego_datum/weapon/visions
+	item_path = /obj/item/ego_weapon/mini/visions
+	cost = 20*/
+
+//All-Around Cleaner - Sanitizer
+/datum/ego_datum/armor/sanitizer
+	item_path = /obj/item/clothing/suit/armor/ego_gear/teth/sanitizer
+	cost = 20
+
+/datum/ego_datum/weapon/sanitizer
+	item_path = /obj/item/ego_weapon/sanitizer
+	cost = 20
+
diff --git a/code/datums/abnormality/_ego_datum/zayin.dm b/code/datums/abnormality/_ego_datum/zayin.dm
@@ -106,3 +106,20 @@
 	item_path = /obj/item/clothing/suit/armor/ego_gear/zayin/letter_opener
 	cost = 12
 
+// Sunset Traveller - Eclipse of Scarlet Moths
+/datum/ego_datum/weapon/eclipse
+	item_path = /obj/item/ego_weapon/eclipse
+	cost = 12
+
+/datum/ego_datum/armor/eclipse
+	item_path = /obj/item/clothing/suit/armor/ego_gear/zayin/eclipse
+	cost = 12
+
+// Vending Machine and Oceanic Breeze - A Taste of the Ocean
+/datum/ego_datum/weapon/oceanic
+	item_path = /obj/item/gun/ego_gun/pistol/oceanic
+	cost = 12
+
+/datum/ego_datum/armor/oceanic
+	item_path = /obj/item/clothing/suit/armor/ego_gear/zayin/oceanic
+	cost = 12
diff --git a/code/datums/attributes/_attribute.dm b/code/datums/attributes/_attribute.dm
@@ -177,6 +177,14 @@ GLOBAL_LIST_INIT(attribute_types, list(
 		atr.level_limit = attribute_set
 	return TRUE
 
+/mob/living/carbon/human/proc/adjust_attribute_limit(attribute_set)
+	for(var/atr_type in attributes)
+		var/datum/attribute/atr = attributes[atr_type]
+		if(!istype(atr))
+			continue
+		atr.level_limit += attribute_set
+	return TRUE
+
 // Returns a combination of attributes, giving a "level" from 1 to 5
 /proc/get_user_level(mob/living/carbon/human/user)
 	if(!istype(user))

diff --git a/code/game/objects/items/ego_weapons/he.dm b/code/game/objects/items/ego_weapons/he.dm
@@ -1728,3 +1728,39 @@
 		if(faction_check(H.faction, faction))
 			continue
 		H.apply_status_effect(/datum/status_effect/brown_bricks)
+
+/obj/item/ego_weapon/coiling
+	name = "coiling"
+	desc = "The snake leather used in this whip is hardened by the sun"
+	icon_state = "coiling"
+	force = 30
+	reach = 4		//Has 4 Square Reach.
+	attack_speed = 1.8
+	damtype = BLACK_DAMAGE
+	armortype = BLACK_DAMAGE
+	attack_verb_continuous = list("whips", "lashes", "tears")
+	attack_verb_simple = list("whip", "lash", "tear")
+	hitsound = 'sound/weapons/whip.ogg'
+	attribute_requirements = list(
+							FORTITUDE_ATTRIBUTE = 40
+							)
+
+/obj/item/ego_weapon/voodoo
+	name = "voodoo"
+	desc = "What seems to be a giant half of a scissors pair."
+	icon_state = "voodoo"
+	special = "This weapon deals both red and white damage."
+	force = 20
+	damtype = WHITE_DAMAGE
+	armortype = WHITE_DAMAGE
+	attack_verb_continuous = list("stabs", "slashes", "attacks")
+	attack_verb_simple = list("stab", "slash", "attack")
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	attribute_requirements = list(
+							FORTITUDE_ATTRIBUTE = 40
+							)
+
+/obj/item/ego_weapon/voodoo/attack(mob/living/target, mob/living/user)
+	..()
+	target.apply_damage(force, RED_DAMAGE, null, target.run_armor_check(null, RED_DAMAGE), spread_damage = TRUE)
+
diff --git a/code/game/objects/items/ego_weapons/teth.dm b/code/game/objects/items/ego_weapons/teth.dm
@@ -516,3 +516,27 @@
 	damage = 20
 	damage_type = BLACK_DAMAGE
 	flag = BLACK_DAMAGE
+
+
+/obj/item/ego_weapon/sanitizer
+	name = "sanitizer"
+	desc = "It's very shocking."
+	special = "Knocks certain enemies backwards."
+	icon_state = "sanitizer"
+	force = 35					//Still less DPS, replaces baseball bat
+	attack_speed = 1.6
+	damtype = BLACK_DAMAGE
+	armortype = BLACK_DAMAGE
+	attack_verb_continuous = list("beats", "smacks")
+	attack_verb_simple = list("beat", "smack")
+	hitsound = 'sound/weapons/fixer/generic/gen1.ogg'
+
+/obj/item/ego_weapon/sanitizer/attack(mob/living/target, mob/living/user)
+	if(!CanUseEgo(user))
+		return
+	. = ..()
+	var/atom/throw_target = get_edge_target_turf(target, user.dir)
+	if(!target.anchored)
+		var/whack_speed = (prob(60) ? 1 : 4)
+		target.throw_at(throw_target, rand(1, 2), whack_speed, user)
+
diff --git a/code/game/objects/items/ego_weapons/zayin.dm b/code/game/objects/items/ego_weapons/zayin.dm
@@ -312,3 +312,15 @@
 		. += H
 	sortList(.)
 	return
+
+/obj/item/ego_weapon/eclipse
+	name = "eclipse of scarlet moths"
+	desc = "It's beautiful."
+	icon_state = "eclipse"
+	force = 14
+	damtype = WHITE_DAMAGE
+	armortype = WHITE_DAMAGE
+	attack_verb_continuous = list("smacks", "strikes", "beats")
+	attack_verb_simple = list("smack", "strike", "beat")
+
+
diff --git a/code/modules/clothing/suits/ego_gear/he.dm b/code/modules/clothing/suits/ego_gear/he.dm
@@ -418,3 +418,31 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
 	attribute_requirements = list(
 							FORTITUDE_ATTRIBUTE = 40
 							)
+
+
+/obj/item/clothing/suit/armor/ego_gear/he/coiling
+	name = "coiling"
+	desc = "It's beautiful snake leather."
+	icon_state = "coiling"
+	armor = list(RED_DAMAGE = 10, WHITE_DAMAGE = -10, BLACK_DAMAGE = 50, PALE_DAMAGE = 20) // 70
+	attribute_requirements = list(
+							PRUDENCE_ATTRIBUTE = 40
+							)
+
+/obj/item/clothing/suit/armor/ego_gear/he/voodoo
+	name = "voodoo doll"
+	desc = "You look like a little doll."
+	icon_state = "voodoo"
+	armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 30, BLACK_DAMAGE = -10, PALE_DAMAGE = 20) // 70
+	attribute_requirements = list(
+							FORTITUDE_ATTRIBUTE = 40
+							)
+
+/obj/item/clothing/suit/armor/ego_gear/he/uturn
+	name = "u-turn"
+	desc = "It's simple black, just like all the roads out there."
+	icon_state = "uturn"
+	armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 10, BLACK_DAMAGE = 0, PALE_DAMAGE = 20) // 70
+	attribute_requirements = list(
+							FORTITUDE_ATTRIBUTE = 40
+							)
diff --git a/code/modules/clothing/suits/ego_gear/teth.dm b/code/modules/clothing/suits/ego_gear/teth.dm
@@ -226,3 +226,15 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
 	She threatens to kill the princess if she doesn't swear never to say a word about this reversal of roles to any living being. Sadly, the princess takes the oath."
 	icon_state = "zauberhorn"
 	armor = list(RED_DAMAGE = -30, WHITE_DAMAGE = 20, BLACK_DAMAGE = 30, PALE_DAMAGE = 0) // 20
+
+/obj/item/clothing/suit/armor/ego_gear/teth/visions
+	name = "visions of future past"
+	desc = "It's looking right at you."
+	icon_state = "visions"
+	armor = list(RED_DAMAGE = -10, WHITE_DAMAGE = 40, BLACK_DAMAGE = -30, PALE_DAMAGE = 0) // 0
+
+/obj/item/clothing/suit/armor/ego_gear/teth/sanitizer
+	name = "sanitizer"
+	desc = "It's very clean, freshly washed."
+	icon_state = "sanitizer"	//Just like a bobot
+	armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 0, BLACK_DAMAGE = -40, PALE_DAMAGE = 0) // 0
diff --git a/code/modules/clothing/suits/ego_gear/zayin.dm b/code/modules/clothing/suits/ego_gear/zayin.dm
@@ -95,3 +95,18 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
 	desc = "Liberty. Reason. Justice. Civility. Edification. Perfection. MAIL!"
 	icon_state = "letter_opener"
 	armor = list(RED_DAMAGE = 10, WHITE_DAMAGE = 0, BLACK_DAMAGE = 0, PALE_DAMAGE = 0)
+
+/obj/item/clothing/suit/armor/ego_gear/zayin/eclipse
+	name = "eclipse of scarlet moths"
+	desc = "A bright suit that brings you warmth."
+	icon_state = "eclipse"
+	armor = list(RED_DAMAGE = 0, WHITE_DAMAGE = 10, BLACK_DAMAGE = 0, PALE_DAMAGE = 0)
+
+/obj/item/clothing/suit/armor/ego_gear/zayin/oceanic
+	name = "taste of the sea"
+	desc = "A suit that's old and dyed crimson, and made of thin plastic."
+	icon_state = "oceanic"
+	armor = list(RED_DAMAGE = 10, WHITE_DAMAGE = 0, BLACK_DAMAGE = 0, PALE_DAMAGE = 0)
+
+
+