Skip to content

Commit

Permalink
Adds Generic Brand Modelling Clay (Abnormality) (#2564)
Browse files Browse the repository at this point in the history
* funny lil clay man

Update clayman.dm

Update lobotomy-corp13.dme

Update lobotomy-corp13.dme

funny lil clay man

Update clayman.dm

Update teth.dm

added records

* Revert "funny lil clay man"

This reverts commit 34aad7d.

---------

Co-authored-by: Kirie Saito <[email protected]>
  • Loading branch information
Blimwe0 and Kitsunemitsu authored Dec 4, 2024
1 parent 2a17118 commit 6debfdf
Show file tree
Hide file tree
Showing 10 changed files with 118 additions and 1 deletion.
Binary file modified ModularTegustation/Teguicons/32x32.dmi
Binary file not shown.
22 changes: 21 additions & 1 deletion ModularTegustation/ego_weapons/melee/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -592,9 +592,29 @@
desc = "Scissors long since lost to time. Packs a punch while being unwieldy."
icon_state = "rapunzel"
force = 32
stuntime = 5 //Mucho damage, bit more stun
stuntime = 5 //Mucho damage, bit of stun in exchange
damtype = BLACK_DAMAGE
attack_verb_continuous = list("pokes", "jabs", "tears", "lacerates", "gores")
attack_verb_simple = list("poke", "jab", "tear", "lacerate", "gore")
hitsound = 'sound/weapons/fixer/generic/knife2.ogg'

/obj/item/ego_weapon/mini/clayman
name = "Creative Freedom"
desc = "Clay and flesh are both mediums for expression."
icon_state = "creativefreedom"
special = "This weapon slows after hit on windup."
force = 14
damtype = PALE_DAMAGE
hitsound = 'sound/weapons/bladeslice.ogg'

/obj/item/ego_weapon/mini/clayman/attack(mob/living/target, mob/living/user)
if(!CanUseEgo(user))
return
..()
if(do_after(user, 7, src))
target.apply_status_effect(/datum/status_effect/qliphothoverload)
else
to_chat(user, "<span class= 'spider'><b>Your attack was interrupted!</b></span>")
return


8 changes: 8 additions & 0 deletions code/datums/abnormality/_ego_datum/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -348,3 +348,11 @@
/datum/ego_datum/armor/denial
item_path = /obj/item/clothing/suit/armor/ego_gear/teth/denial
cost = 20

/datum/ego_datum/weapon/clayman
item_path = /obj/item/ego_weapon/mini/clayman
cost = 20

/datum/ego_datum/armor/clayman
item_path = /obj/item/clothing/suit/armor/ego_gear/teth/clayman
cost = 20
6 changes: 6 additions & 0 deletions code/modules/clothing/suits/ego_gear/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,9 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
desc = "When you have no means of escape, you must forge your own path."
icon_state = "tangle"
armor = list(RED_DAMAGE = 0, WHITE_DAMAGE = 20, BLACK_DAMAGE = 0, PALE_DAMAGE = 0)

/obj/item/clothing/suit/armor/ego_gear/teth/clayman
name = "Creative Freedom"
desc = "Make yourself a canvas and your creativity can't be limited."
icon_state = "creativefreedom"
armor = list(RED_DAMAGE = 10, WHITE_DAMAGE = 10, BLACK_DAMAGE = -10, PALE_DAMAGE = 10)
71 changes: 71 additions & 0 deletions code/modules/mob/living/simple_animal/abnormality/teth/clayman.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/mob/living/simple_animal/hostile/abnormality/clayman
name = "Generic Brand Modelling Clay"
desc = "A small, rough humanoid figure made of clay."
icon = 'ModularTegustation/Teguicons/32x32.dmi'
icon_state = "bluro"
icon_living = "bluro"
icon_dead = "bluro"
portrait = "bluro"
del_on_death = TRUE
maxHealth = 1000
health = 1000
ranged = TRUE
rapid_melee = 1
melee_queue_distance = 2
move_to_delay = 3
damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1, WHITE_DAMAGE = 1, BLACK_DAMAGE = 1, PALE_DAMAGE = 1)
melee_damage_lower = 10
melee_damage_upper = 12
melee_damage_type = RED_DAMAGE
attack_sound = 'sound/effects/hit_kick.ogg'
attack_verb_continuous = "smashes"
attack_verb_simple = "smash"
friendly_verb_continuous = "bonks"
friendly_verb_simple = "bonk"
can_breach = TRUE
threat_level = TETH_LEVEL
start_qliphoth = 1
work_chances = list(
ABNORMALITY_WORK_INSTINCT = list(50, 50, 50, 50, 50),
ABNORMALITY_WORK_INSIGHT = list(50, 50, 50, 50, 50),
ABNORMALITY_WORK_ATTACHMENT = list(50, 50, 50, 50, 50),
ABNORMALITY_WORK_REPRESSION = list(50, 50, 50, 50, 50),
)
work_damage_amount = 0
work_damage_type = RED_DAMAGE
death_message = "loses form."
ego_list = list(
/datum/ego_datum/weapon/clayman,
/datum/ego_datum/armor/clayman,
)
var/dashready = TRUE
abnormality_origin = ABNORMALITY_ORIGIN_ORIGINAL

/mob/living/simple_animal/hostile/abnormality/clayman/WorktickFailure(mob/living/carbon/human/user)
var/list/damtypes = list(RED_DAMAGE, WHITE_DAMAGE, BLACK_DAMAGE, PALE_DAMAGE)
var/damage = pick(damtypes)
work_damage_type = damage
user.deal_damage(6, damage)
WorkDamageEffect()

/mob/living/simple_animal/hostile/abnormality/clayman/CanAttack(atom/the_target)
melee_damage_type = pick(RED_DAMAGE, WHITE_DAMAGE, BLACK_DAMAGE, PALE_DAMAGE)
return ..()

/mob/living/simple_animal/hostile/abnormality/clayman/FailureEffect(mob/living/carbon/human/user, work_type, pe)
. = ..()
datum_reference.qliphoth_change(-1)

/mob/living/simple_animal/hostile/abnormality/clayman/proc/Skitter()
visible_message(span_warning("[src] Skitters faster!"), span_notice("you hear the patter of hundreds of clay feet"))
var/duration = 3 SECONDS
TemporarySpeedChange(-2, duration)
dashready = FALSE
addtimer(CALLBACK(src, PROC_REF(dashreset)), 15 SECONDS)

/mob/living/simple_animal/hostile/abnormality/clayman/OpenFire(atom/A)
if(get_dist(src, target) >= 3 && dashready)
Skitter()

/mob/living/simple_animal/hostile/abnormality/clayman/proc/dashreset()
dashready = TRUE
11 changes: 11 additions & 0 deletions code/modules/paperwork/records/info/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -398,3 +398,14 @@
abno_info = list(
"Tangle had a bad reaction when working on a random EMPLOYEE, and their Qliphoth Counter lowered.",
"Working large amounts of instinct works on tangle ended in it's Qliphoth Counter being lowered.",)

//Generic Brand Modelling Clay
/obj/item/paper/fluff/info/teth/clayman
abno_type = /mob/living/simple_animal/hostile/abnormality/clayman
abno_code = "O-04-204"
abno_info = list(
"Employees who worked on O-04-204 reported no meaningful difference between work types.",
"During work and breaches, the damage type dealt seemed to vary from hit to hit.",
"When the work result was Bad, the Qliphoth Counter lowered."
)

Binary file modified icons/mob/clothing/ego_gear/abnormality/teth.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/ego_gear/abnormality/teth.dmi
Binary file not shown.
Binary file modified icons/obj/ego_weapons.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions lobotomy-corp13.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2867,6 +2867,7 @@
#include "code\modules\mob\living\simple_animal\abnormality\teth\book.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\cherry_blossoms.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\cinderella.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\clayman.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\cleaner.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\crumbling_armor.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\dealerdamned.dm"
Expand Down

0 comments on commit 6debfdf

Please sign in to comment.