Skip to content

Commit

Permalink
Teth updates (Basic stuff) (vlggms#1630)
Browse files Browse the repository at this point in the history
* basic teth updates

* Update code/modules/mob/living/simple_animal/abnormality/teth/MHz.dm

Co-authored-by: [̸R̵e̵d̴a̴c̶t̸e̸d̴]̵ <[email protected]>

---------

Co-authored-by: [̸R̵e̵d̴a̴c̶t̸e̸d̴]̵ <[email protected]>
  • Loading branch information
Kitsunemitsu and LanceSmites328 authored Dec 1, 2023
1 parent 192fdc4 commit 131d537
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
4 changes: 2 additions & 2 deletions code/game/objects/items/ego_weapons/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@
name = "hat trick"
desc = "Imagination is the only weapon in the war with reality."
icon_state = "trick"
force = 17
throwforce = 25 //You can only hold 4 so go nuts.
force = 16
throwforce = 35 //You can only hold 4 so go nuts.
throw_speed = 5
throw_range = 7
damtype = BLACK_DAMAGE
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/simple_animal/abnormality/teth/MHz.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
var/reset_time = 4 MINUTES //Qliphoth resets after this time. To prevent bugs

/mob/living/simple_animal/hostile/abnormality/mhz/WorkChance(mob/living/carbon/human/user, chance)
if(get_attribute_level(user, FORTITUDE_ATTRIBUTE) >= 40)
return chance * 0.75
if(get_attribute_level(user, FORTITUDE_ATTRIBUTE) < 40)
return chance * 1.25
return chance

/mob/living/simple_animal/hostile/abnormality/mhz/SuccessEffect(mob/living/carbon/human/user, work_type, pe)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
gift_type = /datum/ego_gifts/sanitizer
gift_message = "Contamination scan complete. Initiating cleaning protocol."
abnormality_origin = ABNORMALITY_ORIGIN_LIMBUS
var/bumpdamage = 10

/mob/living/simple_animal/hostile/abnormality/cleaner/Move()
..()
Expand All @@ -46,7 +47,7 @@
if(H.stat >= SOFT_CRIT)
continue
visible_message("[src] tosses [H] out of the way!")
H.apply_damage(30, RED_DAMAGE, null, H.run_armor_check(null, RED_DAMAGE), spread_damage = TRUE)
H.apply_damage(bumpdamage, RED_DAMAGE, null, H.run_armor_check(null, RED_DAMAGE), spread_damage = TRUE)

var/rand_dir = pick(NORTH, SOUTH, EAST, WEST)
var/atom/throw_target = get_edge_target_turf(H, rand_dir)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
/* Originally was 270. Fragment health is 800 with a original game health of 230 so techically forsaken
murderer has more health than fragment? Ill round the numbers to 600 since 270 can be rounded to 300 and doubled.
I was later told to make it 1100. We really dont have a Lobotomy Corp to LC13 health conversion calculator.*/
maxHealth = 1100
health = 1100
// Turns out that 1100 is not enough. - Kirie/Kitsunemitsu
maxHealth = 1300
health = 1300
//Attack speed modifier. 2 is twice the normal.
rapid_melee = 1
//If target is close enough start preparing to hit them if we have rapid_melee enabled. Originally was 4.
melee_queue_distance = 2
//How fast a creature is, lower is faster. Client controlled monsters instead use speed and are MUCH faster.
move_to_delay = 5
move_to_delay = 3
/* //Red damage is applied to health. White damage is applied to sanity with only a few abnormalities using
that to instantly kill the victem. Black damage is applied to both health and sanity "10 black damage
would do 10 health damage and 10 sanity damage. Pale damage is a % of health. Weird i know. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
ABNORMALITY_WORK_ATTACHMENT = list(50, 50, 55, 55, 55),
ABNORMALITY_WORK_REPRESSION = list(40, 40, 45, 45, 45)
)
success_boxes = 99 //Should be impossible
pixel_x = -8
base_pixel_x = -8

Expand All @@ -36,4 +37,5 @@
casing.density = FALSE
SLEEP_CHECK_DEATH(50)
icon_state = "spider_closed"
datum_reference.max_boxes+=2
return
4 changes: 3 additions & 1 deletion code/modules/paperwork/records/info/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
abno_code = "T-02-43"
abno_info = list(
"Employees with Prudence Level 1 squashed the spiderlings. Spider Bud turned those who harmed its children into cocoons.",
"When cleaning the unit as a part of Insight Work, the employee was quickly turned into a cocoon by Spider Bud.")
"When cleaning the unit as a part of Insight Work, the employee was quickly turned into a cocoon by Spider Bud.",
"For each person encased in a cocoon, Spider Bud's max PE available from work was increased by 2.",
"Employees were entirely unable to get a good work result from spider bud.",)

//Scorched girl
/obj/item/paper/fluff/info/teth/match
Expand Down

0 comments on commit 131d537

Please sign in to comment.