Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makes Some Abnormalities Not Bleed[DONE] #2336

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Makes Some Abnormalities Not Bleed[DONE] #2336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/modules/mob/living/simple_animal/abnormality/_abnormality.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,11 @@
if(5)
C.icon = 'ModularTegustation/Teguicons/abno_cores/aleph.dmi'

/mob/living/simple_animal/hostile/abnormality/spawn_gibs()
if(blood_volume <= 0)
return
return new /obj/effect/gibspawner/generic(drop_location(), src, get_static_viruses())

// Actions
/datum/action/innate/abnormality_attack
name = "Abnormality Attack"
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/simple_animal/abnormality/he/ardor_blossom_moth.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
portrait = "blossom_moth"
maxHealth = 1200
health = 1200
blood_volume = 0
ranged = TRUE
attack_verb_continuous = "sears"
attack_verb_simple = "sear"
Expand Down Expand Up @@ -87,6 +88,8 @@
qdel(floor_fire)
new /obj/structure/turf_fire(T)

/mob/living/simple_animal/hostile/abnormality/ardor_moth/spawn_gibs()
return new /obj/effect/decal/cleanable/ash(drop_location(), src)

// Turf Fire
/obj/structure/turf_fire
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/abnormality/he/funeral.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
del_on_death = FALSE
maxHealth = 1350 //I am a menace to society.
health = 1350
blood_volume = 0

ranged = TRUE
minimum_distance = 2
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/abnormality/he/helper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
portrait = "helper"
maxHealth = 1000
health = 1000
blood_volume = 0
rapid_melee = 4
ranged = TRUE
attack_verb_continuous = "slashes"
Expand Down
7 changes: 7 additions & 0 deletions code/modules/mob/living/simple_animal/abnormality/he/snow_queen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
mob_biotypes = MOB_MINERAL
maxHealth = 1500
health = 1500
blood_volume = 0
move_to_delay = 5
damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1.1, WHITE_DAMAGE = 0.8, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 0.8) //ASK SOMEONE GOOD AT BALANCING ABOUT THIS -IP
base_pixel_x = -16
Expand Down Expand Up @@ -240,6 +241,12 @@
QDEL_IN(src, 10 SECONDS)
return ..()

//Prevents gibbing during the duel.
/mob/living/simple_animal/hostile/abnormality/snow_queen/gib()
if(arena_attacks)
return FALSE
return ..()

//This is here so that people can see the death animation before snow queen is defeated.
/mob/living/simple_animal/hostile/abnormality/snow_queen/Destroy()
if(!storybook_hero && snow_prison)
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/abnormality/he/steam_transport_machine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
del_on_death = FALSE
maxHealth = 1600
health = 1600
blood_volume = 0
ranged = TRUE
attack_sound = 'sound/abnormalities/steam/attack.ogg'
friendly_verb_continuous = "bonks"
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/abnormality/teth/MHz.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
base_pixel_y = -32
maxHealth = 400
health = 400
blood_volume = 0
start_qliphoth = 4
threat_level = TETH_LEVEL
work_chances = list(
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/simple_animal/abnormality/teth/book.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
portrait = "book"
maxHealth = 600
health = 600
blood_volume = 0
start_qliphoth = 2
threat_level = TETH_LEVEL
work_chances = list(
Expand Down Expand Up @@ -133,6 +134,7 @@
spawnedmob.health = spawnedmob.maxHealth
spawnedmob.death_message = "collapses into a bunch of writing material."
spawnedmob.filters += filter(type="drop_shadow", x=0, y=0, size=1, offset=0, color=rgb(0, 0, 0))
spawnedmob.blood_volume = 0
src.visible_message(span_warning("Pages of [src] fold into [spawnedmob]!"))
playsound(get_turf(src), 'sound/items/handling/paper_pickup.ogg', 90, 1, FALSE)

Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/abnormality/teth/faelantern.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
portrait = "faelantern"
maxHealth = 1200
health = 1200
blood_volume = 0
base_pixel_x = -16
pixel_x = -16
threat_level = TETH_LEVEL
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/abnormality/waw/dimension_refraction.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

maxHealth = 1200
health = 1200
blood_volume = 0
density = FALSE
damage_coeff = list(RED_DAMAGE = 0, WHITE_DAMAGE = 1.5, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 1)
stat_attack = HARD_CRIT
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/abnormality/waw/ebony_queen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
health = 2000
pixel_x = -16
base_pixel_x = -16
blood_volume = 0
melee_damage_type = BLACK_DAMAGE
melee_damage_lower = 35
melee_damage_upper = 45
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/abnormality/waw/screenwriter.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Defeating the murderer also surpresses the abnormality.
faction = list("hostile")
threat_level = WAW_LEVEL
start_qliphoth = 2
blood_volume = 0
work_chances = list(
"Nutrition" = 35,
"Cleanliness" = 35,
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/abnormality/waw/snow_whites_apple.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
portrait = "snow_whites_apple"
maxHealth = 1600
health = 1600
blood_volume = 0
obj_damage = 0
damage_coeff = list(RED_DAMAGE = 0.5, WHITE_DAMAGE = 1.0, BLACK_DAMAGE = 0, PALE_DAMAGE = 1.5)
ranged = TRUE
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/abnormality/zayin/quiet_day.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
core_icon = "quiet_day"
maxHealth = 451
health = 451
blood_volume = 0
threat_level = ZAYIN_LEVEL
faction = list("hostile", "neutral")
//Bad for stat gain, but the damage is negligable and there's a nice bonus at the end
Expand Down
Loading