Skip to content

Commit

Permalink
New Community E.G.O.
Browse files Browse the repository at this point in the history
armor

adds some sprites

rank bumps some ego

adds some stuff

finished 2/5 weapon code

gonna commit this real quick

code update

finishes the last two ego

adds sprites

should fix linters

removes unused code
  • Loading branch information
Coxswain-Navigator committed Oct 20, 2024
1 parent 0bc9343 commit 34919c7
Show file tree
Hide file tree
Showing 19 changed files with 664 additions and 19 deletions.
2 changes: 1 addition & 1 deletion code/datums/status_effects/debuffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@
if(!can_have_status())
qdel(src)
to_chat(owner, "<span class='warning'>The flame consumes you!!</span>")
owner.playsound_local(owner, 'sound/effects/book_burn.ogg', 50, TRUE)
owner.playsound_local(owner, 'sound/effects/burn.ogg', 50, TRUE)
Check_Resist(owner)
if(ishuman(owner))
owner.adjustBruteLoss(max(0, stacks - burn_res))
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/ego_weapons/subtype/charge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
/obj/item/ego_weapon/Initialize(mapload)
. = ..()
if(charge_cap < charge_cost)
charge_cap = charge_cost * 2 // lets not ruin the players expirience, shall we fellow coders?
charge_cap = charge_cost * 2 // lets not ruin the players experience, shall we fellow coders?
CRASH("[src] charge ability has an ability that costs more than its default charge cap!")

/obj/item/ego_weapon/attack_self(mob/living/user)
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/ego_weapons/waw.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1459,6 +1459,8 @@
force = 13
attack_speed = 0.3
damtype = WHITE_DAMAGE
attack_verb_continuous = list("stabs", "attacks", "slashes")
attack_verb_simple = list("stab", "attack", "slash")
hitsound = 'sound/weapons/fixer/generic/knife4.ogg'
var/dodgelanding

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,12 +1,68 @@
//Zayin
///////////
// Zayin //
///////////

//Teth
//////////
// Teth //
//////////

//He
// Sirocco - Desert Wind
/datum/ego_datum/weapon/desert // rank-bumped
item_path = /obj/item/ego_weapon/desert
cost = 35

//Waw
/datum/ego_datum/armor/desert
item_path = /obj/item/clothing/suit/armor/ego_gear/teth/desert
cost = 20

////////
// He //
////////

// Eternity Roller - Sunspit
/datum/ego_datum/weapon/sunspit // rank-bumped
item_path = /obj/item/ego_weapon/sunspit
cost = 50

/datum/ego_datum/armor/sunspit
item_path = /obj/item/clothing/suit/armor/ego_gear/he/sunspit
cost = 35

/////////
// Waw //
/////////

// So That None Shall Pass - Ochre Sheet
/datum/ego_datum/weapon/ochre // rank-bumped
item_path = /obj/item/ego_weapon/wield/ochre
cost = 100

/datum/ego_datum/armor/ochre
item_path = /obj/item/clothing/suit/armor/ego_gear/waw/ochre
cost = 50

// Half A Hydra - Miasma Skin
/datum/ego_datum/weapon/miasma // rank-bumped
item_path = /obj/item/ego_weapon/lance/miasma
cost = 100

/datum/ego_datum/armor/miasma
item_path = /obj/item/clothing/suit/armor/ego_gear/waw/miasma
cost = 50

///////////
// Aleph //
///////////

// Old Mother Hunger - Limos
/datum/ego_datum/weapon/limos
item_path = /obj/item/ego_weapon/mini/limos
cost = 100

/datum/ego_datum/armor/limos
item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/limos
cost = 100

//Aleph
// The Crying Children - Waxen Pinion
/datum/ego_datum/weapon/shield/waxen
item_path = /obj/item/ego_weapon/shield/waxen
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,53 @@
//Zayin
// Zayin

//Teth
// Teth
/obj/item/clothing/suit/armor/ego_gear/teth/desert
name = "desert wind"
desc = "Dirty rag armor, better than nothing. It's light as a feather, and increases your movement speed by 10%."
icon_state = "desert"
icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
flags_inv = NONE
armor = list(RED_DAMAGE = -10, WHITE_DAMAGE = 10, BLACK_DAMAGE = -20, PALE_DAMAGE = 0) // -20
slowdown = -0.1

// He
/obj/item/clothing/suit/armor/ego_gear/he/sunspit
name = "sunspit"
desc = "Praise the sun!"
icon_state = "sunspit"
icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
flags_inv = NONE
armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = -30, BLACK_DAMAGE = -10, PALE_DAMAGE = 20) // 70
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 40
)

//He
// Waw
/obj/item/clothing/suit/armor/ego_gear/waw/ochre
name = "ochre sheet"
desc = "You shall not pass!"
icon_state = "ochre"
icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
armor = list(RED_DAMAGE = 60, WHITE_DAMAGE = 30, BLACK_DAMAGE = 40, PALE_DAMAGE = 10) // 140
attribute_requirements = list(
JUSTICE_ATTRIBUTE = 80
)

//Waw
/obj/item/clothing/suit/armor/ego_gear/waw/miasma
name = "miasma skin"
desc = "A heavy robe made of interlinked scales."
icon_state = "miasma"
icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = 30, BLACK_DAMAGE = 40, PALE_DAMAGE = 20) // 140
attribute_requirements = list(
PRUDENCE_ATTRIBUTE = 80
)

//Aleph
// Aleph
/obj/item/clothing/suit/armor/ego_gear/aleph/waxen
name = "Waxen Pinion"
desc = "However, that alone won’t purge all evil from the world."
Expand All @@ -21,3 +62,17 @@
TEMPERANCE_ATTRIBUTE = 80,
JUSTICE_ATTRIBUTE = 80
)

/obj/item/clothing/suit/armor/ego_gear/aleph/limos
name = "limos"
desc = "Feed me! Feed me! Feed me more!"
icon_state = "limos"
icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
armor = list(RED_DAMAGE = 60, WHITE_DAMAGE = 50, BLACK_DAMAGE = 80, PALE_DAMAGE = 50) // 240
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 100,
PRUDENCE_ATTRIBUTE = 80,
TEMPERANCE_ATTRIBUTE = 100,
JUSTICE_ATTRIBUTE = 80
)
Loading

0 comments on commit 34919c7

Please sign in to comment.