cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 18:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

The 515 MegaPR early downport (#7783)

Browse Source 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
Cadyn
2024-02-27 11:17:32 -08:00
committed by GitHub
parent 96a43a09c1
commit b90f7ec922
254 changed files with 2135 additions and 1576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@
/obj/item/weapon/blobcore_chunk/attack_self(var/mob/user)
if(blob_type && world.time > active_ability_cooldown + last_active_use)
last_active_use = world.time
to_chat(user, "<span class='alien'>\icon [src] \The [src] gesticulates.</span>")
to_chat(user, "<span class='alien'>[icon2html(src, user.client)] \The [src] gesticulates.</span>")
blob_type.on_chunk_use(src, user)
else
to_chat(user, "<span class='notice'>\The [src] doesn't seem to respond.</span>")

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

@@ -94,7 +94,7 @@
break
if(!beamtarget_exists && GetAnomalySusceptibility(L) >= 0.5)
carrier.visible_message("<span class='danger'>\icon [B] \The [B] lashes out at \the [L]!</span>")
carrier.visible_message("<span class='danger'>[icon2html(B,viewers(carrier))] \The [B] lashes out at \the [L]!</span>")
var/datum/beam/drain_beam = carrier.Beam(L, icon_state = "drain_life", time = 10 SECONDS)
active_beams |= drain_beam
spawn(9 SECONDS)

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

@@ -41,10 +41,10 @@
/datum/blob_type/ravenous_macrophage/on_chunk_tick(obj/item/weapon/blobcore_chunk/B)
var/mob/living/L = locate() in range(world.view, B)
if(prob(5) && !L.stat) // There's some active living thing nearby, produce offgas.
B.visible_message("<span class='alien'>\icon [B] \The [B] disgorches a cloud of noxious gas!</span>")
B.visible_message("<span class='alien'>[icon2html(B,viewers(B))] \The [B] disgorches a cloud of noxious gas!</span>")
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)
BS.set_up(3, 0, T)
playsound(T, 'sound/effects/smoke.ogg', 50, 1, -3)
BS.start()
BS.start()

10
code/modules/blob2/overmind/types/reactive_spines.dm
View File

@@ -55,5 +55,11 @@
return
/datum/blob_type/reactive_spines/chunk_setup(obj/item/weapon/blobcore_chunk/B)
GLOB.moved_event.register_global(B, /obj/item/weapon/blobcore_chunk/proc/call_chunk_unique)
return
B.RegisterSignal(SSmobs, COMSIG_OBSERVER_GLOBALMOVED, /obj/item/weapon/blobcore_chunk/proc/call_chunk_unique)
return
//I'm putting this here so everybody knows that it's this shitty code that is why that comsig exists.
//I'm just reimplementing the way it worked before but with comsigs. I don't have the patience to refactor this.
/mob/living/Moved()
. = ..()
SEND_SIGNAL(SSmobs, COMSIG_OBSERVER_GLOBALMOVED)

8
code/modules/blob2/overmind/types/roiling_mold.dm
View File

@@ -28,7 +28,7 @@
return
var/mob/living/L = locate() in (view(world.view + 3, get_turf(B)) - view(2,get_turf(B)) - previous_targets) // No adjacent mobs.
if(!check_trajectory(L, B, PASSTABLE))
if(!(L in check_trajectory(L, B, PASSTABLE)))
if(!LAZYLEN(previous_targets))
previous_targets = list()
@@ -53,12 +53,12 @@
if(istype(user) && user == L)
continue
if(!check_trajectory(L, B, PASSTABLE)) // Can't fire at things on the other side of walls / windows.
if(!(L in check_trajectory(L, B, PASSTABLE))) // Can't fire at things on the other side of walls / windows.
continue
var/obj/item/projectile/P = new spore_projectile(get_turf(B))
user.visible_message("<span class='danger'>\icon [B] \The [B] discharges energy toward \the [L]!</span>")
user.visible_message("<span class='danger'>[icon2html(B,viewers(user))] \The [B] discharges energy toward \the [L]!</span>")
P.launch_projectile(L, BP_TORSO, user)
return
return

4
code/modules/blob2/overmind/types/synchronous_mesh.dm
View File

@@ -68,5 +68,5 @@
carrier.adjustFireLoss(-3 / nearby_mobs.len)
if(need_beam)
carrier.visible_message("<span class='alien'>\icon [B] \The [B] sends noxious spores toward \the [victim]!</span>")
carrier.Beam(victim, icon_state = "lichbeam", time = 2 SECONDS)
carrier.visible_message("<span class='alien'>[icon2html(B,viewers(carrier))] \The [B] sends noxious spores toward \the [victim]!</span>")
carrier.Beam(victim, icon_state = "lichbeam", time = 2 SECONDS)