Skip to content

Commit

Permalink
abno month E.G.O PR (#2361)
Browse files Browse the repository at this point in the history
adds new E.G.O
  • Loading branch information
vampirebat74 authored Aug 6, 2024
1 parent 2bec5cd commit db73ddf
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 1 deletion.
5 changes: 5 additions & 0 deletions code/datums/abnormality/_ego_datum/aleph.dm
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,8 @@
/datum/ego_datum/weapon/gasharpoon
item_path = /obj/item/ego_weapon/shield/gasharpoon
cost = 100//appears in wishing well

//The Giant Atop the Beanstalk - Giant
/datum/ego_datum/armor/giant
item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/giant
cost = 100
9 changes: 9 additions & 0 deletions code/datums/abnormality/_ego_datum/he.dm
Original file line number Diff line number Diff line change
Expand Up @@ -473,3 +473,12 @@
/datum/ego_datum/weapon/ardor_star
item_path = /obj/item/gun/ego_gun/ardor_star
cost = 35

//Alleyway Watchdog - Telepole
/datum/ego_datum/armor/telepole
item_path = /obj/item/clothing/suit/armor/ego_gear/he/telepole
cost = 35

/datum/ego_datum/weapon/telepole
item_path = /obj/item/ego_weapon/telepole
cost = 35
20 changes: 20 additions & 0 deletions code/game/objects/items/ego_weapons/he.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2014,3 +2014,23 @@
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 40
)

/obj/item/ego_weapon/telepole//FIXME: actually make it do stuff
name = "telepole"
desc = "A hairy wooden longsword that's covered in barbed wire. It crackles with arcs of electricity."
special = "Activating the weapon in your hand allows you to dash, grazing nearby targets with BLACK damage."
icon_state = "telepole"
lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
force = 25
damtype = BLACK_DAMAGE
attack_verb_continuous = list("slashes", "stabs")
attack_verb_simple = list("slash", "stab")
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 40
)
charge = TRUE

/obj/item/ego_weapon/telepole/ChargeAttack(mob/living/target, mob/living/user)
..()
//do the thing
12 changes: 12 additions & 0 deletions code/modules/clothing/suits/ego_gear/aleph.dm
Original file line number Diff line number Diff line change
Expand Up @@ -442,3 +442,15 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
TEMPERANCE_ATTRIBUTE = 80,
JUSTICE_ATTRIBUTE = 100
)

/obj/item/clothing/suit/armor/ego_gear/aleph/giant
name = "giant"
desc = "You are a Giant."
icon_state = "giant"
armor = list(RED_DAMAGE = 80, WHITE_DAMAGE = 30, BLACK_DAMAGE = 80, PALE_DAMAGE = 50) // 240
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 100,
PRUDENCE_ATTRIBUTE = 80,
TEMPERANCE_ATTRIBUTE = 80,
JUSTICE_ATTRIBUTE = 80
)
9 changes: 8 additions & 1 deletion code/modules/clothing/suits/ego_gear/he.dm
Original file line number Diff line number Diff line change
Expand Up @@ -473,4 +473,11 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
PRUDENCE_ATTRIBUTE = 40
)


/obj/item/clothing/suit/armor/ego_gear/he/telepole
name = "telepole"
desc = "Alright, I'll sear you down to your guts!"
icon_state = "telepole"
armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = -10, BLACK_DAMAGE = 40, PALE_DAMAGE = 10) // 70
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 40
)
Binary file modified icons/mob/clothing/ego_gear/abnormality/aleph.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/ego_gear/abnormality/he.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/ego_gear/abnormality/aleph.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/ego_gear/abnormality/he.dmi
Binary file not shown.
Binary file modified icons/obj/ego_weapons.dmi
Binary file not shown.

0 comments on commit db73ddf

Please sign in to comment.