cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull

Browse Source
This commit is contained in:
Razgriz
2020-07-12 16:14:45 -07:00
parent a47b909aa9 4b9a2bb47c
commit 02421b075e
1029 changed files with 311473 additions and 232993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/blob2/blobs/base_blob.dm
View File

@@ -32,7 +32,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
/obj/structure/blob/Destroy()
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) //Expand() is no longer broken, no check necessary.
playsound(src, 'sound/effects/splat.ogg', 50, 1) //Expand() is no longer broken, no check necessary.
GLOB.all_blobs -= src
overmind = null
return ..()
@@ -149,7 +149,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
if(istype(T, /turf/space) && !(locate(/obj/structure/lattice) in T) && prob(80))
make_blob = FALSE
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) //Let's give some feedback that we DID try to spawn in space, since players are used to it
playsound(src, 'sound/effects/splat.ogg', 50, 1) //Let's give some feedback that we DID try to spawn in space, since players are used to it
consume_tile() //hit the tile we're in, making sure there are no border objects blocking us
@@ -223,7 +223,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
/obj/structure/blob/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
user.do_attack_animation(src)
if(overmind)
damage *= overmind.blob_type.brute_multiplier
@@ -307,7 +307,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
/obj/structure/blob/attackby(var/obj/item/weapon/W, var/mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
playsound(loc, 'sound/effects/attackblob.ogg', 50, 1)
playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
visible_message("<span class='danger'>\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]</span>")
var/damage = W.force
switch(W.damtype)
@@ -318,7 +318,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
damage *= 2
if(damage > 0)
playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
playsound(src, 'sound/items/welder.ogg', 100, 1)
else
playsound(src, 'sound/weapons/tap.ogg', 50, 1)
if(BRUTE, SEARING, TOX, CLONE)
@@ -328,7 +328,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
damage *= 2
if(damage > 0)
playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
else
playsound(src, 'sound/weapons/tap.ogg', 50, 1)
if(overmind)
@@ -369,7 +369,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
/obj/structure/blob/proc/adjust_integrity(amount)
integrity = between(0, integrity + amount, max_integrity)
if(integrity == 0)
playsound(loc, 'sound/effects/splat.ogg', 50, 1)
playsound(src, 'sound/effects/splat.ogg', 50, 1)
if(overmind)
overmind.blob_type.on_death(src)
qdel(src)

5
code/modules/blob2/core_chunk.dm
View File

@@ -61,12 +61,13 @@
/obj/item/weapon/blobcore_chunk/proc/get_carrier(var/atom/target)
var/atom/A = target ? target.loc : src
if(!istype(A, /mob/living))
A = get_carrier(A)
if(isturf(A) || isarea(A)) // Something has gone horribly wrong if the second is true.
return FALSE // No mob is carrying us.
if(!istype(A, /mob/living))
A = get_carrier(A)
return A
/obj/item/weapon/blobcore_chunk/blob_act(obj/structure/blob/B)

2
code/modules/blob2/overmind/types/ravenous_macrophage.dm
View File

@@ -23,7 +23,7 @@
/datum/blob_type/ravenous_macrophage/on_pulse(var/obj/structure/blob/B)
var/mob/living/L = locate() in range(world.view, B)
if(prob(1) && L.mind && !L.stat) // There's some active living thing nearby, produce offgas.
if(L && prob(1) && L.mind && !L.stat) // There's some active living thing nearby, produce offgas.
var/turf/T = get_turf(B)
var/datum/effect/effect/system/smoke_spread/noxious/BS = new /datum/effect/effect/system/smoke_spread/noxious
BS.attach(T)