Skip to content

Commit

Permalink
removes blob_act
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Jun 24, 2024
1 parent 0e31f9c commit 1b8ae37
Show file tree
Hide file tree
Showing 46 changed files with 5 additions and 245 deletions.
2 changes: 0 additions & 2 deletions code/__DEFINES/dcs/signals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@
#define COMSIG_ATOM_CHECKPARTS "atom_checkparts"
///from base of atom/CheckParts(): (atom/movable/new_craft) - The atom has just been used in a crafting recipe and has been moved inside new_craft.
#define COMSIG_ATOM_USED_IN_CRAFT "atom_used_in_craft"
///from base of atom/blob_act(): (/obj/structure/blob)
#define COMSIG_ATOM_BLOB_ACT "atom_blob_act"
///from base of atom/acid_act(): (acidpwr, acid_volume)
#define COMSIG_ATOM_ACID_ACT "atom_acid_act"
///from base of atom/emag_act(): (/mob/user)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/squeak.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, use_delay_override, extrarange, falloff_exponent, fallof_distance)
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), PROC_REF(play_squeak))
RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), PROC_REF(play_squeak))
if(ismovable(parent))
RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT), PROC_REF(play_squeak))
AddComponent(/datum/component/connect_loc_behalf, parent, item_connections)
Expand Down
9 changes: 0 additions & 9 deletions code/game/atoms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -779,15 +779,6 @@
contents_explosion(severity, target)
SEND_SIGNAL(src, COMSIG_ATOM_EX_ACT, severity, target)

/**
* React to a hit by a blob objecd
*
* default behaviour is to send the [COMSIG_ATOM_BLOB_ACT] signal
*/
/atom/proc/blob_act(obj/structure/blob/B)
SEND_SIGNAL(src, COMSIG_ATOM_BLOB_ACT, B)
return

/atom/proc/fire_act(exposed_temperature, exposed_volume)
SEND_SIGNAL(src, COMSIG_ATOM_FIRE_ACT, exposed_temperature, exposed_volume)
return
Expand Down
8 changes: 0 additions & 8 deletions code/game/mecha/combat/durand.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,6 @@ Expects a turf. Returns true if the attack should be blocked, false if not.*/
else
. = ..()

/obj/mecha/combat/durand/blob_act(obj/structure/blob/B)
if(defense_check(B.loc))
log_message("Attack by blob. Attacker - [B].", LOG_MECHA, color="red")
log_message("Attack absorbed by defense field.", LOG_MECHA, color="orange")
shield.blob_act(B)
else
. = ..()

/obj/mecha/combat/durand/attackby(obj/item/W as obj, mob/user as mob, params)
if(defense_check(user.loc))
log_message("Attack absorbed by defense field. Attacker - [user], with [W]", LOG_MECHA, color="orange")
Expand Down
4 changes: 0 additions & 4 deletions code/game/mecha/mecha_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@
log_message("Attack by hulk. Attacker - [user].", LOG_MECHA, color="red")
log_combat(user, src, "punched", "hulk powers")

/obj/mecha/blob_act(obj/structure/blob/B)
log_message("Attack by blob. Attacker - [B].", LOG_MECHA, color="red")
take_damage(30, BRUTE, "melee", 0, get_dir(src, B))

/obj/mecha/attack_tk()
return

Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/effects/decals/decal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
)
AddElement(/datum/element/connect_loc, loc_connections)

/obj/effect/decal/blob_act(obj/structure/blob/B)
if(B && B.loc == loc)
qdel(src)

/obj/effect/decal/proc/NeverShouldHaveComeHere(turf/T)
return isclosedturf(T) || isgroundlessturf(T)

Expand Down
3 changes: 0 additions & 3 deletions code/game/objects/effects/decals/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
pass_flags = PASSTABLE | PASSGRILLE
layer = FLY_LAYER

/obj/effect/decal/chempuff/blob_act(obj/structure/blob/B)
return

/obj/effect/decal/fakelattice
name = "lattice"
desc = "A lightweight support lattice."
Expand Down
3 changes: 0 additions & 3 deletions code/game/objects/effects/effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
/obj/effect/mech_melee_attack(obj/mecha/M)
return 0

/obj/effect/blob_act(obj/structure/blob/B)
return

/obj/effect/attack_hulk(mob/living/carbon/human/user)
return FALSE

Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,6 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
else
return 1

/obj/item/blob_act(obj/structure/blob/B)
if(B && B.loc == loc)
qdel(src)

/obj/item/ComponentInitialize()
. = ..()
// this proc says it's for initializing components, but we're initializing elements too because it's you and me against the world >:)
Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/items/chrono_eraser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,5 @@
/obj/structure/chrono_field/ex_act()
return

/obj/structure/chrono_field/blob_act(obj/structure/blob/B)
return


#undef CHRONO_BEAM_RANGE
#undef CHRONO_FRAME_COUNT
11 changes: 0 additions & 11 deletions code/game/objects/items/tanks/tanks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,6 @@

. += "<span class='notice'>It feels [descriptive].</span>"

/obj/item/tank/blob_act(obj/structure/blob/B)
if(B && B.loc == loc)
var/turf/location = get_turf(src)
if(!location)
qdel(src)

if(air_contents)
location.assume_air(air_contents)

qdel(src)

/obj/item/tank/deconstruct(disassembled = TRUE)
if(!disassembled)
var/turf/T = get_turf(src)
Expand Down
7 changes: 0 additions & 7 deletions code/game/objects/obj_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,6 @@
take_damage(hulk_damage(), BRUTE, "melee", 0, get_dir(src, user))
return TRUE

/obj/blob_act(obj/structure/blob/B)
if(isturf(loc))
var/turf/T = loc
if(T.intact && HAS_TRAIT(src, TRAIT_T_RAY_VISIBLE))
return
take_damage(400, BRUTE, "melee", 0, get_dir(src, B))

/obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime
user.do_attack_animation(src)
user.changeNext_move(CLICK_CD_MELEE)
Expand Down
6 changes: 0 additions & 6 deletions code/game/objects/structures/fireaxe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,6 @@
new /obj/item/stack/sheet/metal(loc, 2)
qdel(src)

/obj/structure/fireaxecabinet/blob_act(obj/structure/blob/B)
if(fireaxe)
fireaxe.forceMove(loc)
fireaxe = null
qdel(src)

/obj/structure/fireaxecabinet/attack_hand(mob/user)
. = ..()
if(.)
Expand Down
3 changes: 0 additions & 3 deletions code/game/objects/structures/lattice.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
if(LAT != src)
QDEL_IN(LAT, 0)

/obj/structure/lattice/blob_act(obj/structure/blob/B)
return

/obj/structure/lattice/attackby(obj/item/C, mob/user, params)
if(resistance_flags & INDESTRUCTIBLE)
return
Expand Down
3 changes: 0 additions & 3 deletions code/game/objects/structures/safe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ FLOOR SAFES
to_chat(user, "<span class='warning'>You can't put [I] into the safe while it is closed!</span>")
return

/obj/structure/safe/blob_act(obj/structure/blob/B)
return

/obj/structure/safe/ex_act(severity, target)
if(((severity == 2 && target == src) || severity == 1) && explosion_count < BROKEN_THRESHOLD)
explosion_count++
Expand Down
7 changes: 0 additions & 7 deletions code/game/turfs/closed/walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,6 @@
if(!density)
..()


/turf/closed/wall/blob_act(obj/structure/blob/B)
if(prob(50))
dismantle_wall()
else
add_dent(WALL_DENT_HIT)

/turf/closed/wall/mech_melee_attack(obj/mecha/M)
M.do_attack_animation(src)
switch(M.damtype)
Expand Down
3 changes: 0 additions & 3 deletions code/game/turfs/open/floor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@
for(var/obj/structure/A in contents)
return 1

/turf/open/floor/blob_act(obj/structure/blob/B)
return

/turf/open/floor/update_icon()
. = ..()
update_visuals()
Expand Down
10 changes: 0 additions & 10 deletions code/modules/antagonists/blob/blob_mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,6 @@
if(overmind)
. += "Blobs to Win: [overmind.blobs_legit.len]/[overmind.blobwincount]"

/mob/living/simple_animal/hostile/blob/blob_act(obj/structure/blob/B)
if(stat != DEAD && health < maxHealth)
for(var/i in 1 to 2)
var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(src)) //hello yes you are being healed
if(overmind)
H.color = overmind.blobstrain.complementary_color
else
H.color = "#000000"
adjustHealth(-maxHealth*0.0125)

/mob/living/simple_animal/hostile/blob/fire_act(exposed_temperature, exposed_volume)
..()
if(exposed_temperature)
Expand Down
8 changes: 0 additions & 8 deletions code/modules/antagonists/blob/blobstrains/reactive_spines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@
message = "The blob stabs you"
reagent = /datum/reagent/blob/reactive_spines

/datum/blobstrain/reagent/reactive_spines/damage_reaction(obj/structure/blob/B, damage, damage_type, damage_flag)
if(damage && damage_type == BRUTE && B.obj_integrity - damage > 0) //is there any damage, is it brute, and will we be alive
if(damage_flag == "melee")
B.visible_message("<span class='boldwarning'>The blob retaliates, lashing out!</span>")
for(var/atom/A in range(1, B))
A.blob_act(B)
return ..()

/datum/reagent/blob/reactive_spines
name = "Reactive Spines"
taste_description = "rock"
Expand Down
3 changes: 0 additions & 3 deletions code/modules/antagonists/blob/overmind.dm
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,6 @@ GLOBAL_LIST_EMPTY(blob_nodes)
var/link = FOLLOW_LINK(M, src)
to_chat(M, "[link] [rendered]")

/mob/camera/blob/blob_act(obj/structure/blob/B)
return

/mob/camera/blob/get_status_tab_items()
. = ..()
if(blob_core)
Expand Down
14 changes: 4 additions & 10 deletions code/modules/antagonists/blob/structures/_blob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
playsound(src.loc, 'sound/effects/splat.ogg', 50, TRUE) //Expand() is no longer broken, no check necessary.
return ..()

/obj/structure/blob/blob_act()
return

/obj/structure/blob/Adjacent(atom/neighbour)
. = ..()
if(.)
Expand Down Expand Up @@ -123,10 +120,7 @@
return 0 //oh no we failed

/obj/structure/blob/proc/ConsumeTile()
for(var/atom/A in loc)
A.blob_act(src)
if(iswallturf(loc))
loc.blob_act(src) //don't ask how a wall got on top of the core, just eat it
update_appearance()

/obj/structure/blob/proc/blob_attack_animation(atom/A = null, controller) //visually attacks an atom
var/obj/effect/temp_visual/blob/O = new /obj/effect/temp_visual/blob(src.loc)
Expand Down Expand Up @@ -163,11 +157,11 @@
ConsumeTile() //hit the tile we're in, making sure there are no border objects blocking us
if(!T.CanPass(src, get_dir(T, src))) //is the target turf impassable
make_blob = FALSE
T.blob_act(src) //hit the turf if it is
update_appearance()
for(var/atom/A in T)
if(!A.CanPass(src, get_dir(T, src))) //is anything in the turf impassable
make_blob = FALSE
A.blob_act(src) //also hit everything in the turf
update_appearance()

if(make_blob) //well, can we?
var/obj/structure/blob/B = new /obj/structure/blob/normal(src.loc, (controller || overmind))
Expand All @@ -181,7 +175,7 @@
return B
else
blob_attack_animation(T, controller)
T.blob_act(src) //if we can't move in hit the turf again
update_appearance()
qdel(B) //we should never get to this point, since we checked before moving in. destroy the blob so we don't have two blobs on one tile
return null
else
Expand Down
5 changes: 0 additions & 5 deletions code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -436,11 +436,6 @@
else
. = timer_set

/obj/machinery/nuclearbomb/blob_act(obj/structure/blob/B)
if(exploding)
return
qdel(src)

/obj/machinery/nuclearbomb/zap_act(power, zap_flags)
..()
if(zap_flags & ZAP_MACHINE_EXPLOSIVE)
Expand Down
3 changes: 0 additions & 3 deletions code/modules/antagonists/revenant/revenant.dm
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,6 @@
/mob/living/simple_animal/revenant/ex_act(severity, target)
return 1 //Immune to the effects of explosions.

/mob/living/simple_animal/revenant/blob_act(obj/structure/blob/B)
return //blah blah blobs aren't in tune with the spirit world, or something.

/mob/living/simple_animal/revenant/singularity_act()
return //don't walk into the singularity expecting to find corpses, okay?

Expand Down
3 changes: 0 additions & 3 deletions code/modules/lighting/emissive_blocker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
/atom/movable/emissive_blocker/singularity_pull()
return

/atom/movable/emissive_blocker/blob_act()
return

//Prevents people from moving these after creation, because they shouldn't be.
/atom/movable/emissive_blocker/forceMove(atom/destination, no_tp=FALSE, harderforce = FALSE)
if(harderforce)
Expand Down
3 changes: 0 additions & 3 deletions code/modules/lighting/lighting_object.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,6 @@
/atom/movable/lighting_object/singularity_pull()
return

/atom/movable/lighting_object/blob_act()
return

/atom/movable/lighting_object/wash(clean_types)
return

Expand Down
3 changes: 0 additions & 3 deletions code/modules/mob/living/brain/brain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
/mob/living/brain/ex_act() //you cant blow up brainmobs because it makes transfer_to() freak out when borgs blow up.
return

/mob/living/brain/blob_act(obj/structure/blob/B)
return

/mob/living/brain/get_eye_protection()//no eyes
return 2

Expand Down
7 changes: 0 additions & 7 deletions code/modules/mob/living/carbon/carbon_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,6 @@
if(is_type_in_typecache(active_item, GLOB.shove_disarming_types))
visible_message("<span class='warning'>[name] regains their grip on \the [active_item]!</span>", "<span class='warning'>You regain your grip on \the [active_item]</span>", null, COMBAT_MESSAGE_RANGE)

/mob/living/carbon/blob_act(obj/structure/blob/B)
if (stat == DEAD)
return
else
show_message("<span class='userdanger'>The blob attacks!</span>")
adjustBruteLoss(10)

/mob/living/carbon/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_CONTENTS)
Expand Down
10 changes: 0 additions & 10 deletions code/modules/mob/living/carbon/human/human_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -473,16 +473,6 @@
if(!max_limb_loss)
break


/mob/living/carbon/human/blob_act(obj/structure/blob/B)
if(stat == DEAD)
return
show_message("<span class='userdanger'>The blob attacks you!</span>")
var/dam_zone = pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
apply_damage(5, BRUTE, affecting, run_armor_check(affecting, "melee"))


///Calculates the siemens coeff based on clothing and species, can also restart hearts.
/mob/living/carbon/human/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
//If it doesnt have physiology its prob still initializing.
Expand Down
7 changes: 0 additions & 7 deletions code/modules/mob/living/silicon/ai/ai_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@
/mob/living/silicon/ai/attack_slime(mob/living/simple_animal/slime/user)
return //immune to slimes

/mob/living/silicon/ai/blob_act(obj/structure/blob/B)
if (stat != DEAD)
adjustBruteLoss(60)
updatehealth()
return 1
return 0

/mob/living/silicon/ai/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
Expand Down
4 changes: 0 additions & 4 deletions code/modules/mob/living/silicon/pai/pai_defense.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@

/mob/living/silicon/pai/blob_act(obj/structure/blob/B)
return FALSE

/mob/living/silicon/pai/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
Expand Down
Loading

0 comments on commit 1b8ae37

Please sign in to comment.