cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bubblegum's blood from being hit now has a different visual (#20626)

Browse Source 
* Bubblegum's blood from being hit now has a different visual

* joan lung confirmed wild shitcoder
This commit is contained in:
Joan Lung
2016-09-24 03:51:42 -04:00
committed by oranges
parent 9241ce5775
commit 60e6ebaef1
4 changed files with 57 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/effects/decals/Cleanable/aliens.dm
View File

@@ -42,6 +42,7 @@
desc = "Gnarly..."
icon = 'icons/effects/blood.dmi'
icon_state = "xgib1"
layer = LOW_OBJ_LAYER
random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6")
/obj/effect/decal/cleanable/xenoblood/xgibs/ex_act()

1
code/game/objects/effects/decals/Cleanable/humans.dm
View File

@@ -46,6 +46,7 @@
desc = "They look bloody and gruesome."
icon = 'icons/effects/blood.dmi'
icon_state = "gibbl5"
layer = LOW_OBJ_LAYER
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
/obj/effect/decal/cleanable/blood/gibs/New()

1
code/game/objects/effects/decals/Cleanable/robots.dm
View File

@@ -5,6 +5,7 @@
desc = "It's a useless heap of junk... <i>or is it?</i>"
icon = 'icons/mob/robots.dmi'
icon_state = "gib1"
layer = LOW_OBJ_LAYER
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
blood_state = BLOOD_STATE_OIL
bloodiness = MAX_SHOE_BLOODINESS

77
code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
View File

@@ -60,10 +60,22 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/adjustBruteLoss(amount)
if(amount > 0 && prob(33))
var/obj/effect/decal/cleanable/blood/B = new /obj/effect/decal/cleanable/blood(loc)
B.bloodiness = 20
var/obj/effect/decal/cleanable/blood/gibs/bubblegum/B = new /obj/effect/decal/cleanable/blood/gibs/bubblegum(loc)
if(prob(33))
step(B, pick(cardinal))
else
B.setDir(pick(cardinal))
. = ..()
/obj/effect/decal/cleanable/blood/gibs/bubblegum
name = "thick blood"
desc = "Thick, splattered blood."
random_icon_states = list("gib3", "gib5", "gib6")
bloodiness = 20
/obj/effect/decal/cleanable/blood/gibs/bubblegum/can_bloodcrawl_in()
return TRUE
/mob/living/simple_animal/hostile/megafauna/bubblegum/Life()
..()
move_to_delay = Clamp(round((health/maxHealth) * 10), 5, 10)
@@ -184,18 +196,18 @@ Difficulty: Hard
. = list()
for(var/mob/living/L in targets)
var/list/bloodpool = get_pools(get_turf(L), 0)
if(bloodpool.len && !faction_check(L))
if(bloodpool.len && (!faction_check(L) || L.stat == DEAD))
. += L
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/try_bloodattack()
var/list/targets = get_mobs_on_blood()
if(targets.len)
addtimer(src, "bloodattack", 0, FALSE, targets)
addtimer(src, "bloodattack", 0, FALSE, targets, prob(50))
return TRUE
return FALSE
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodattack(list/targets)
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodattack(list/targets, handedness)
var/mob/living/target_one = pick_n_take(targets)
var/turf/target_one_turf = get_turf(target_one)
var/mob/living/target_two
@@ -203,37 +215,34 @@ Difficulty: Hard
target_two = pick_n_take(targets)
var/turf/target_two_turf = get_turf(target_two)
if(target_two.stat != CONSCIOUS || prob(10))
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightpaw, target_two_turf)
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightthumb, target_two_turf)
bloodgrab(target_two_turf)
bloodgrab(target_two_turf, handedness)
else
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightsmack, target_two_turf)
bloodsmack(target_two_turf)
bloodsmack(target_two_turf, handedness)
var/list/pools = get_pools(get_turf(target_one), 0)
if(pools.len)
target_one_turf = get_turf(target_one)
if(target_one_turf)
if(target_one.stat != CONSCIOUS || prob(10))
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftpaw, target_one_turf)
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftthumb, target_one_turf)
bloodgrab(target_one_turf)
bloodgrab(target_one_turf, !handedness)
else
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftsmack, target_one_turf)
bloodsmack(target_one_turf)
bloodsmack(target_one_turf, !handedness)
if(!target_two && target_one)
pools = get_pools(get_turf(target_one), 0)
if(pools.len)
var/list/poolstwo = get_pools(get_turf(target_one), 0)
if(poolstwo.len)
target_one_turf = get_turf(target_one)
if(target_one_turf)
if(target_one.stat != CONSCIOUS || prob(10))
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightpaw, target_one_turf)
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightthumb, target_one_turf)
bloodgrab(target_one_turf)
bloodgrab(target_one_turf, handedness)
else
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightsmack, target_one_turf)
bloodsmack(target_one_turf)
bloodsmack(target_one_turf, handedness)
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodsmack(turf/T)
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodsmack(turf/T, handedness)
if(handedness)
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightsmack, T)
else
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftsmack, T)
sleep(2.5)
for(var/mob/living/L in T)
if(!faction_check(L))
@@ -243,7 +252,13 @@ Difficulty: Hard
L.apply_damage(25, BRUTE, limb_to_hit, L.run_armor_check(limb_to_hit, "melee", null, null, armour_penetration))
sleep(3)
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodgrab(turf/T)
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodgrab(turf/T, handedness)
if(handedness)
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightpaw, T)
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightthumb, T)
else
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftpaw, T)
PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftthumb, T)
sleep(6)
for(var/mob/living/L in T)
if(!faction_check(L))
@@ -319,7 +334,8 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/get_pools(turf/T, range)
. = list()
for(var/obj/effect/decal/cleanable/blood/nearby in view(T, range))
for(var/obj/effect/decal/cleanable/nearby in view(T, range))
if(nearby.can_bloodcrawl_in())
. += nearby
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/blood_spray()
@@ -331,18 +347,23 @@ Difficulty: Hard
if(target.loc == loc)
targetdir = dir
face_atom(target)
new /obj/effect/decal/cleanable/blood(J)
new /obj/effect/decal/cleanable/blood/bubblegum(J)
for(var/i in 1 to range)
J = get_step(previousturf, targetdir)
PoolOrNew(/obj/effect/overlay/temp/dir_setting/bloodsplatter, list(previousturf, get_dir(previousturf, J)))
playsound(previousturf,'sound/effects/splat.ogg', 100, 1, -1)
if(!J || !previousturf.CanAtmosPass(J))
break
var/obj/effect/decal/cleanable/blood/B = new /obj/effect/decal/cleanable/blood(J)
B.bloodiness = 0
new /obj/effect/decal/cleanable/blood/bubblegum(J)
previousturf = J
sleep(1)
/obj/effect/decal/cleanable/blood/bubblegum
bloodiness = 0
/obj/effect/decal/cleanable/blood/bubblegum/can_bloodcrawl_in()
return TRUE
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/slaughterlings()
visible_message("<span class='danger'>[src] summons a shoal of slaughterlings!</span>")
var/max_amount = 6