shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

not a gaius reference

Browse Source 
hhhh let me just replace all the ex_acts missing some args and adjust them
This commit is contained in:
DeltaFire
2021-11-14 21:34:59 +01:00
parent 7d2ff194d1
commit 6aa906395c
103 changed files with 126 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/randomverbs.dm
+1 -1
View File
@@ -1592,7 +1592,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
light_range = 2
duration = 9
/obj/effect/temp_visual/target/ex_act()
/obj/effect/temp_visual/target/ex_act(severity, target, origin)
return
/obj/effect/temp_visual/target/Initialize(mapload, list/flame_hit)
code/modules/antagonists/blob/blob/blobs/core.dm
+1 -1
View File
@@ -45,7 +45,7 @@
GLOB.poi_list -= src
return ..()
/obj/structure/blob/core/ex_act(severity, target)
/obj/structure/blob/core/ex_act(severity, target, origin)
var/damage = 50 - 10 * severity //remember, the core takes half brute damage, so this is 20/15/10 damage based on severity
take_damage(damage, BRUTE, "bomb", 0)
code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm
+1 -1
View File
@@ -8,7 +8,7 @@
linked.examine(user)
return ..()
/obj/effect/clockwork/overlay/ex_act()
/obj/effect/clockwork/overlay/ex_act(severity, target, origin)
return FALSE
/obj/effect/clockwork/overlay/singularity_act()
code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
+2 -2
View File
@@ -36,7 +36,7 @@
return TRUE
. = ..()
/obj/effect/clockwork/sigil/ex_act(severity)
/obj/effect/clockwork/sigil/ex_act(severity, target, origin)
visible_message("<span class='warning'>[src] scatters into thousands of particles.</span>")
qdel(src)
@@ -204,7 +204,7 @@
. = ..()
update_icon()
/obj/effect/clockwork/sigil/transmission/ex_act(severity)
/obj/effect/clockwork/sigil/transmission/ex_act(severity, target, origin)
if(severity == 3)
adjust_clockwork_power(500) //Light explosions charge the network!
visible_message("<span class='warning'>[src] flares a brilliant orange!</span>")
code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm
+1 -1
View File
@@ -38,7 +38,7 @@
/obj/effect/clockwork/servant_blocker/singularity_pull()
return
/obj/effect/clockwork/servant_blocker/ex_act(severity, target)
/obj/effect/clockwork/servant_blocker/ex_act(severity, target, origin)
return
/obj/effect/clockwork/servant_blocker/safe_throw_at()
code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm
+2 -2
View File
@@ -102,7 +102,7 @@
return TRUE
return ..()
/obj/effect/clockwork/spatial_gateway/ex_act(severity)
/obj/effect/clockwork/spatial_gateway/ex_act(severity, target, origin)
if(severity == 1 && uses)
uses = 0
visible_message("<span class='warning'>[src] is disrupted!</span>")
@@ -251,7 +251,7 @@
name = "stable gateway"
is_stable = TRUE
/obj/effect/clockwork/spatial_gateway/stable/ex_act(severity)
/obj/effect/clockwork/spatial_gateway/stable/ex_act(severity, target, origin)
if(severity == 1)
start_shutdown() //Yes, you can chain devastation-level explosions to delay a gateway shutdown, if you somehow manage to do it without breaking the obelisk. Is it worth it? Probably not.
return TRUE
code/modules/antagonists/clockcult/clock_items/judicial_visor.dm
+1 -1
View File
@@ -214,5 +214,5 @@
sleep(3) //so the animation completes properly
qdel(src)
/obj/effect/clockwork/judicial_marker/ex_act(severity)
/obj/effect/clockwork/judicial_marker/ex_act(severity, target, origin)
return
code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
+1 -1
View File
@@ -197,7 +197,7 @@
glow = new /obj/effect/clockwork/overlay/gateway_glow(get_turf(src))
glow.linked = src
/obj/structure/destructible/clockwork/massive/celestial_gateway/ex_act(severity)
/obj/structure/destructible/clockwork/massive/celestial_gateway/ex_act(severity, target, origin)
var/damage = max((obj_integrity * 0.7) / severity, 100) //requires multiple bombs to take down
take_damage(damage, BRUTE, "bomb", 0)
code/modules/antagonists/devil/true_devil/_true_devil.dm
+1 -1
View File
@@ -179,7 +179,7 @@
/mob/living/carbon/true_devil/is_literate()
return 1
/mob/living/carbon/true_devil/ex_act(severity, ex_target)
/mob/living/carbon/true_devil/ex_act(severity, target, origin)
if(!ascended)
var/b_loss
switch (severity)
code/modules/antagonists/revenant/revenant.dm
+1 -1
View File
@@ -174,7 +174,7 @@
//Immunities
/mob/living/simple_animal/revenant/ex_act(severity, target)
/mob/living/simple_animal/revenant/ex_act(severity, target, origin)
return 1 //Immune to the effects of explosions.
/mob/living/simple_animal/revenant/wave_ex_act(power, datum/wave_explosion/explosion, dir)
code/modules/antagonists/slaughter/slaughter.dm
+1 -1
View File
@@ -249,7 +249,7 @@
released and fully healed, because in the end it's just a jape, \
sibling!</B>"
/mob/living/simple_animal/slaughter/laughter/ex_act(severity)
/mob/living/simple_animal/slaughter/laughter/ex_act(severity, target, origin)
switch(severity)
if(1)
death()
code/modules/awaymissions/mission_code/stationCollision.dm
+1 -1
View File
@@ -149,5 +149,5 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
if(prob(25))
mezzer()
/obj/singularity/narsie/mini/ex_act()
/obj/singularity/narsie/mini/ex_act(severity, target, origin)
return
code/modules/cargo/supplypod.dm
+1 -1
View File
@@ -187,7 +187,7 @@
else
..()
/obj/structure/closet/supplypod/ex_act() //Explosions dont do SHIT TO US! This is because supplypods create explosions when they land.
/obj/structure/closet/supplypod/ex_act(severity, target, origin) //Explosions dont do SHIT TO US! This is because supplypods create explosions when they land.
return
/obj/structure/closet/supplypod/contents_explosion() //Supplypods also protect their contents from the harmful effects of fucking exploding.
code/modules/events/immovable_rod.dm
+1 -1
View File
@@ -99,7 +99,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
walk(src,0)
walk_towards(src, destination, 1)
/obj/effect/immovablerod/ex_act(severity, target)
/obj/effect/immovablerod/ex_act(severity, target, origin)
return 0
/obj/effect/immovablerod/singularity_act()
code/modules/events/spacevine.dm
+1 -1
View File
@@ -507,7 +507,7 @@
if(master)
master.spawn_spacevine_piece(stepturf, src)
/obj/structure/spacevine/ex_act(severity, target)
/obj/structure/spacevine/ex_act(severity, target, origin)
if(istype(target, type)) //if its agressive spread vine dont do anything
return
var/i
code/modules/holodeck/computer.dm
+1 -1
View File
@@ -203,7 +203,7 @@
return
emergency_shutdown()
/obj/machinery/computer/holodeck/ex_act(severity, target)
/obj/machinery/computer/holodeck/ex_act(severity, target, origin)
emergency_shutdown()
return ..()
code/modules/hydroponics/grown/citrus.dm
+1 -1
View File
@@ -173,7 +173,7 @@
var/mob/M = loc
M.dropItemToGround(src)
/obj/item/reagent_containers/food/snacks/grown/firelemon/ex_act(severity)
/obj/item/reagent_containers/food/snacks/grown/firelemon/ex_act(severity, target, origin)
qdel(src) //Ensuring that it's deleted by its own explosion
/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/prime(mob/living/lanced_by)
code/modules/hydroponics/grown/misc.dm
+2 -2
View File
@@ -224,7 +224,7 @@
if(!QDELETED(src))
qdel(src)
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/ex_act(severity)
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/ex_act(severity, target, origin)
qdel(src) //Ensuring that it's deleted by its own explosion. Also prevents mass chain reaction with piles of cherry bombs
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime(mob/living/lanced_by)
@@ -500,7 +500,7 @@
log_game("Coconut bomb detonation at [AREACOORD(T)], location [loc]")
qdel(src)
/obj/item/reagent_containers/food/snacks/grown/coconut/ex_act(severity)
/obj/item/reagent_containers/food/snacks/grown/coconut/ex_act(severity, target, origin)
qdel(src)
/obj/item/reagent_containers/food/snacks/grown/coconut/deconstruct(disassembled = TRUE)
code/modules/lighting/emissive_blocker.dm
+1 -1
View File
@@ -26,7 +26,7 @@
color = GLOB.em_block_color
/atom/movable/emissive_blocker/ex_act(severity)
/atom/movable/emissive_blocker/ex_act(severity, target, origin)
return FALSE
/atom/movable/emissive_blocker/singularity_act()
code/modules/lighting/lighting_object.dm
+1 -1
View File
@@ -124,7 +124,7 @@
// Variety of overrides so the overlays don't get affected by weird things.
/atom/movable/lighting_object/ex_act(severity)
/atom/movable/lighting_object/ex_act(severity, target, origin)
return 0
/atom/movable/lighting_object/singularity_act()
code/modules/mining/lavaland/necropolis_chests.dm
+2 -2
View File
@@ -484,7 +484,7 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
anchored = TRUE
/obj/effect/warp_cube/ex_act(severity, target)
/obj/effect/warp_cube/ex_act(severity, target, origin)
return
//Meat Hook
@@ -607,7 +607,7 @@
/obj/effect/immortality_talisman/attackby()
return
/obj/effect/immortality_talisman/ex_act()
/obj/effect/immortality_talisman/ex_act(severity, target, origin)
return
/obj/effect/immortality_talisman/singularity_pull()
code/modules/mining/machine_redemption.dm
+1 -1
View File
@@ -346,7 +346,7 @@
to_chat(usr, "<span class='warning'>Required access not found.</span>")
return TRUE
/obj/machinery/mineral/ore_redemption/ex_act(severity, target)
/obj/machinery/mineral/ore_redemption/ex_act(severity, target, origin)
do_sparks(5, TRUE, src)
..()
code/modules/mining/machine_vending.dm
+1 -1
View File
@@ -270,7 +270,7 @@
SSblackbox.record_feedback("tally", "crusher_voucher_redeemed", 1, selection)
qdel(voucher)
/obj/machinery/mineral/equipment_vendor/ex_act(severity, target)
/obj/machinery/mineral/equipment_vendor/ex_act(severity, target, origin)
do_sparks(5, TRUE, src)
if(prob(50 / severity) && severity < 3)
qdel(src)
code/modules/mining/ores_coins.dm
+3 -3
View File
@@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
C.forcesay("*scream")
qdel(src)
/obj/item/stack/ore/glass/ex_act(severity, target)
/obj/item/stack/ore/glass/ex_act(severity, target, origin)
if (severity == EXPLODE_NONE)
return
qdel(src)
@@ -314,7 +314,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
GibtoniteReaction(P.firer)
. = ..()
/obj/item/gibtonite/ex_act()
/obj/item/gibtonite/ex_act(severity, target, origin)
GibtoniteReaction(null, 1)
/obj/item/gibtonite/proc/GibtoniteReaction(mob/user, triggered_by = 0)
@@ -356,7 +356,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
pixel_x = initial(pixel_x) + rand(0, 16) - 8
pixel_y = initial(pixel_y) + rand(0, 8) - 8
/obj/item/stack/ore/ex_act(severity, target)
/obj/item/stack/ore/ex_act(severity, target, origin)
if (!severity || severity >= 2)
return
qdel(src)
code/modules/mob/living/bloodcrawl.dm
+1 -1
View File
@@ -11,7 +11,7 @@
/obj/effect/dummy/phased_mob/slaughter/relaymove(mob/user, direction)
forceMove(get_step(src,direction))
/obj/effect/dummy/phased_mob/slaughter/ex_act()
/obj/effect/dummy/phased_mob/slaughter/ex_act(severity, target, origin)
return
/obj/effect/dummy/phased_mob/slaughter/wave_ex_act(power, datum/wave_explosion/explosion, dir)
code/modules/mob/living/brain/brain.dm
+1 -1
View File
@@ -43,7 +43,7 @@
/mob/living/brain/update_mobility()
return ((mobility_flags = (container?.in_contents_of(/obj/mecha)? MOBILITY_FLAGS_DEFAULT : NONE)))
/mob/living/brain/ex_act() //you cant blow up brainmobs because it makes transfer_to() freak out when borgs blow up.
/mob/living/brain/ex_act(severity, target, origin) //you cant blow up brainmobs because it makes transfer_to() freak out when borgs blow up.
return
/mob/living/brain/wave_ex_act(power, datum/wave_explosion/explosion, dir)
code/modules/mob/living/silicon/ai/ai_defense.dm
+1 -1
View File
@@ -28,7 +28,7 @@
if(2)
SSshuttle.requestEvac(src,"ALERT: Energy surge detected in AI core! Station integrity may be compromised! Initiati--%m091#ar-BZZT")
/mob/living/silicon/ai/ex_act(severity, target)
/mob/living/silicon/ai/ex_act(severity, target, origin)
switch(severity)
if(1)
gib()
code/modules/mob/living/silicon/pai/pai_defense.dm
+1 -1
View File
@@ -13,7 +13,7 @@
emitter_next_use = world.time + emitter_emp_cd
//Need more effects that aren't instadeath or permanent law corruption.
/mob/living/silicon/pai/ex_act(severity, target)
/mob/living/silicon/pai/ex_act(severity, target, origin)
take_holo_damage(severity * 50)
switch(severity)
if(1) //RIP
code/modules/mob/living/silicon/robot/robot_defense.dm
+1 -1
View File
@@ -184,7 +184,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
gib()
return TRUE
/mob/living/silicon/robot/ex_act(severity, target)
/mob/living/silicon/robot/ex_act(severity, target, origin)
switch(severity)
if(1)
gib()
code/modules/mob/living/simple_animal/bot/mulebot.dm
+1 -1
View File
@@ -138,7 +138,7 @@
add_overlay(load)
return
/mob/living/simple_animal/bot/mulebot/ex_act(severity)
/mob/living/simple_animal/bot/mulebot/ex_act(severity, target, origin)
unload(0)
switch(severity)
if(1)
code/modules/mob/living/simple_animal/friendly/cockroach.dm
+1 -1
View File
@@ -60,5 +60,5 @@
else
visible_message("<span class='notice'>[src] avoids getting crushed.</span>")
/mob/living/simple_animal/cockroach/ex_act() //Explosions are a terrible way to handle a cockroach.
/mob/living/simple_animal/cockroach/ex_act(severity, target, origin) //Explosions are a terrible way to handle a cockroach.
return
code/modules/mob/living/simple_animal/guardian/guardian.dm
+7 -4
View File
@@ -273,10 +273,13 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
summoner.adjustCloneLoss(amount * 0.5) //dying hosts take 50% bonus damage as cloneloss
update_health_hud()
/mob/living/simple_animal/hostile/guardian/ex_act(severity, target)
/mob/living/simple_animal/hostile/guardian/ex_act(severity, target, origin)
switch(severity)
if(1)
gib()
if(istype(origin, /datum/explosion))
gib(was_explosion = origin)
else
gib()
return
if(2)
adjustBruteLoss(60)
@@ -286,10 +289,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
/mob/living/simple_animal/hostile/guardian/wave_ex_act(power, datum/wave_explosion/explosion, dir)
adjustBruteLoss(EXPLOSION_POWER_STANDARD_SCALE_MOB_DAMAGE(power, explosion.mob_damage_mod * 0.33))
/mob/living/simple_animal/hostile/guardian/gib()
/mob/living/simple_animal/hostile/guardian/gib(no_brain, no_organs, no_bodyparts, datum/explosion/was_explosion)
if(summoner)
to_chat(summoner, "<span class='danger'><B>Your [src] was blown up!</span></B>")
summoner.gib()
summoner.gib(was_explosion = was_explosion)
ghostize()
qdel(src)
code/modules/mob/living/simple_animal/guardian/types/protector.dm
+1 -1
View File
@@ -11,7 +11,7 @@
toggle_button_type = /atom/movable/screen/guardian/ToggleMode
var/toggle = FALSE
/mob/living/simple_animal/hostile/guardian/protector/ex_act(severity)
/mob/living/simple_animal/hostile/guardian/protector/ex_act(severity, target, origin)
if(severity == 1)
adjustBruteLoss(400) //if in protector mode, will do 20 damage and not actually necessarily kill the summoner
else
code/modules/mob/living/simple_animal/hostile/banana_spider.dm
+1 -1
View File
@@ -87,7 +87,7 @@
else
visible_message("<span class='notice'>[src] avoids getting crushed.</span>")
/mob/living/simple_animal/banana_spider/ex_act()
/mob/living/simple_animal/banana_spider/ex_act(severity, target, origin)
return
/mob/living/simple_animal/banana_spider/start_pulling()
code/modules/mob/living/simple_animal/hostile/bread.dm
+1 -1
View File
@@ -62,7 +62,7 @@
user.transfer_ckey(src, FALSE)
density = TRUE
/mob/living/simple_animal/hostile/bread/ex_act()
/mob/living/simple_animal/hostile/bread/ex_act(severity, target, origin)
return
/mob/living/simple_animal/hostile/bread/start_pulling()
code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+1 -1
View File
@@ -132,7 +132,7 @@ Difficulty: Medium
return FALSE
return ..()
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/ex_act(severity, target)
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/ex_act(severity, target, origin)
if(dash())
return
return ..()
code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+1 -1
View File
@@ -154,7 +154,7 @@ Difficulty: Hard
return 0
return ..()
/mob/living/simple_animal/hostile/megafauna/bubblegum/ex_act(severity, target)
/mob/living/simple_animal/hostile/megafauna/bubblegum/ex_act(severity, target, origin)
if(severity >= EXPLODE_LIGHT)
return
severity = EXPLODE_LIGHT // puny mortals
code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+2 -2
View File
@@ -421,7 +421,7 @@ Difficulty: Very Hard
if(ismob(AM))
ActivationReaction(AM, ACTIVATE_MOB_BUMP)
/obj/machinery/anomalous_crystal/ex_act()
/obj/machinery/anomalous_crystal/ex_act(severity, target, origin)
ActivationReaction(null, ACTIVATE_BOMB)
/obj/machinery/anomalous_crystal/honk //Strips and equips you as a clown. I apologize for nothing
@@ -740,7 +740,7 @@ Difficulty: Very Hard
/obj/structure/closet/stasis/emp_act()
return
/obj/structure/closet/stasis/ex_act()
/obj/structure/closet/stasis/ex_act(severity, target, origin)
return
/obj/structure/closet/stasis/handle_lock_addition()
code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+1 -1
View File
@@ -147,7 +147,7 @@ Difficulty: Extremely Hard
if(isturf(target) || isobj(target))
target.ex_act(EXPLODE_HEAVY)
/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner/ex_act(severity, target)
/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner/ex_act(severity, target, origin)
adjustBruteLoss(30 * severity - 120)
visible_message("<span class='danger'>[src] absorbs the explosion!</span>", "<span class='userdanger'>You absorb the explosion!</span>")
code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+2 -2
View File
@@ -79,7 +79,7 @@ Difficulty: Medium
. = ..()
internal = new/obj/item/gps/internal/dragon(src)
/mob/living/simple_animal/hostile/megafauna/dragon/ex_act(severity, target)
/mob/living/simple_animal/hostile/megafauna/dragon/ex_act(severity, target, origin)
if(severity == 3)
return
..()
@@ -387,7 +387,7 @@ Difficulty: Medium
light_range = 2
duration = 13
/obj/effect/temp_visual/lava_warning/ex_act()
/obj/effect/temp_visual/lava_warning/ex_act(severity, target, origin)
return
/obj/effect/temp_visual/lava_warning/Initialize(mapload, var/reset_time = 10)
code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+1 -1
View File
@@ -674,7 +674,7 @@ Difficulty: Normal
layer = LOW_OBJ_LAYER
anchored = TRUE
/obj/effect/hierophant/ex_act()
/obj/effect/hierophant/ex_act(severity, target, origin)
return
/obj/effect/hierophant/attackby(obj/item/I, mob/user, params)
code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+1 -1
View File
@@ -138,7 +138,7 @@
adjustBruteLoss(-L.maxHealth/2)
L.gib()
/mob/living/simple_animal/hostile/megafauna/ex_act(severity, target)
/mob/living/simple_animal/hostile/megafauna/ex_act(severity, target, origin)
switch (severity)
if (EXPLODE_DEVASTATE)
adjustBruteLoss(250)
code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
+1 -1
View File
@@ -50,7 +50,7 @@
if(isliving(target) && !target.Adjacent(targets_from) && ranged_cooldown <= world.time)//No more being shot at point blank or spammed with RNG beams
OpenFire(target)
/mob/living/simple_animal/hostile/asteroid/basilisk/ex_act(severity, target)
/mob/living/simple_animal/hostile/asteroid/basilisk/ex_act(severity, target, origin)
switch(severity)
if(1)
gib()
code/modules/mob/living/simple_animal/simple_animal.dm
+1 -1
View File
@@ -307,7 +307,7 @@
if((bodytemperature < minbodytemp) || (bodytemperature > maxbodytemp))
adjustHealth(unsuitable_atmos_damage)
/mob/living/simple_animal/gib()
/mob/living/simple_animal/gib(no_brain, no_organs, no_bodyparts, datum/explosion/was_explosion)
if(butcher_results)
var/atom/Tsec = drop_location()
for(var/path in butcher_results)
code/modules/modular_computers/computers/machinery/modular_computer.dm
+2 -2
View File
@@ -124,9 +124,9 @@
// Stronger explosions cause serious damage to internal components
// Minor explosions are mostly mitigitated by casing.
/obj/machinery/modular_computer/ex_act(severity)
/obj/machinery/modular_computer/ex_act(severity, target, origin)
if(cpu)
cpu.ex_act(severity)
cpu.ex_act(severity, target, origin)
// switch(severity)
// if(EXPLODE_DEVASTATE)
// SSexplosions.high_mov_atom += cpu
code/modules/power/antimatter/containment_jar.dm
+1 -1
View File
@@ -15,7 +15,7 @@
var/stability = 100//TODO: add all the stability things to this so its not very safe if you keep hitting in on things
/obj/item/am_containment/ex_act(severity, target)
/obj/item/am_containment/ex_act(severity, target, origin)
switch(severity)
if(1)
explosion(get_turf(src), 1, 2, 3, 5)//Should likely be larger but this works fine for now I guess
code/modules/power/antimatter/control.dm
+1 -1
View File
@@ -114,7 +114,7 @@
check_stability()
return
/obj/machinery/power/am_control_unit/ex_act(severity, target)
/obj/machinery/power/am_control_unit/ex_act(severity, target, origin)
stability -= (80 - (severity * 20))
check_stability()
return
code/modules/power/antimatter/shielding.dm
+1 -1
View File
@@ -94,7 +94,7 @@
/obj/machinery/am_shielding/emp_act()//Immune due to not really much in the way of electronics.
return
/obj/machinery/am_shielding/ex_act(severity, target)
/obj/machinery/am_shielding/ex_act(severity, target, origin)
stability -= (80 - (severity * 20))
check_stability()
return
code/modules/power/cell.dm
+1 -1
View File
@@ -142,7 +142,7 @@
if(charge < 0)
charge = 0
/obj/item/stock_parts/cell/ex_act(severity, target)
/obj/item/stock_parts/cell/ex_act(severity, target, origin)
..()
if(!QDELETED(src))
switch(severity)
code/modules/power/gravitygenerator.dm
+1 -1
View File
@@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
/obj/machinery/gravity_generator/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, gentle = FALSE)
return FALSE
/obj/machinery/gravity_generator/ex_act(severity, target)
/obj/machinery/gravity_generator/ex_act(severity, target, origin)
if(severity >= EXPLODE_DEVASTATE) // Very sturdy.
set_broken()
code/modules/power/rtg.dm
+1 -1
View File
@@ -115,7 +115,7 @@
/obj/machinery/power/rtg/abductor/blob_act(obj/structure/blob/B)
overload()
/obj/machinery/power/rtg/abductor/ex_act()
/obj/machinery/power/rtg/abductor/ex_act(severity, target, origin)
if(going_kaboom)
qdel(src)
else
code/modules/power/singularity/containment_field.dm
+1 -1
View File
@@ -42,7 +42,7 @@
/obj/machinery/field/containment/blob_act(obj/structure/blob/B)
return FALSE
/obj/machinery/field/containment/ex_act(severity, target)
/obj/machinery/field/containment/ex_act(severity, target, origin)
return FALSE
/obj/machinery/field/containment/attack_animal(mob/living/simple_animal/M)
code/modules/power/singularity/narsie.dm
+1 -1
View File
@@ -143,7 +143,7 @@
A.narsie_act()
/obj/singularity/narsie/ex_act() //No throwing bombs at her either.
/obj/singularity/narsie/ex_act(severity, target, origin) //No throwing bombs at her either.
return
code/modules/power/singularity/particle_accelerator/particle.dm
+1 -1
View File
@@ -49,7 +49,7 @@
toxmob(A)
/obj/effect/accelerated_particle/ex_act(severity, target)
/obj/effect/accelerated_particle/ex_act(severity, target, origin)
qdel(src)
/obj/effect/accelerated_particle/singularity_pull()
code/modules/power/singularity/singularity.dm
+1 -1
View File
@@ -97,7 +97,7 @@
return
return ..()
/obj/singularity/ex_act(severity, target)
/obj/singularity/ex_act(severity, target, origin)
switch(severity)
if(1)
if(current_size <= STAGE_TWO)
code/modules/power/tesla/energy_ball.dm
+1 -1
View File
@@ -39,7 +39,7 @@
if(!is_miniball)
set_light(10, 7, "#EEEEFF")
/obj/singularity/energy_ball/ex_act(severity, target)
/obj/singularity/energy_ball/ex_act(severity, target, origin)
return
/obj/singularity/energy_ball/consume(severity, target)
code/modules/projectiles/guns/misc/blastcannon.dm
+1 -1
View File
@@ -156,5 +156,5 @@
mediumr = max(mediumr - 1, 0)
lightr = max(lightr - 1, 0)
/obj/item/projectile/blastwave/ex_act()
/obj/item/projectile/blastwave/ex_act(severity, target, origin)
return
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+1 -1
View File
@@ -165,7 +165,7 @@
obj_flags |= EMAGGED
return TRUE
/obj/machinery/chem_dispenser/ex_act(severity, target)
/obj/machinery/chem_dispenser/ex_act(severity, target, origin)
if(severity < 3)
..()
code/modules/reagents/chemistry/machinery/chem_master.dm
+1 -1
View File
@@ -46,7 +46,7 @@
for(var/obj/item/reagent_containers/glass/beaker/B in component_parts)
reagents.maximum_volume += B.reagents.maximum_volume
/obj/machinery/chem_master/ex_act(severity, target)
/obj/machinery/chem_master/ex_act(severity, target, origin)
if(severity < 3)
..()
code/modules/reagents/reagent_containers.dm
+2 -2
View File
@@ -88,10 +88,10 @@
return 0
return 1
/obj/item/reagent_containers/ex_act()
/obj/item/reagent_containers/ex_act(severity, target, origin)
if(reagents)
for(var/datum/reagent/R in reagents.reagent_list)
R.on_ex_act()
R.on_ex_act(severity)
if(!QDELETED(src))
..()
code/modules/reagents/reagent_dispenser.dm
+1 -1
View File
@@ -151,7 +151,7 @@
/obj/structure/reagent_dispensers/fueltank/blob_act(obj/structure/blob/B)
boom()
/obj/structure/reagent_dispensers/fueltank/ex_act()
/obj/structure/reagent_dispensers/fueltank/ex_act(severity, target, origin)
boom()
/obj/structure/reagent_dispensers/fueltank/fire_act(exposed_temperature, exposed_volume)
code/modules/recycling/disposal/holder.dm
+1 -1
View File
@@ -130,5 +130,5 @@
/obj/structure/disposalholder/AllowDrop()
return TRUE
/obj/structure/disposalholder/ex_act(severity, target)
/obj/structure/disposalholder/ex_act(severity, target, origin)
return
code/modules/shuttle/special.dm
+1 -1
View File
@@ -44,7 +44,7 @@
/obj/machinery/power/emitter/energycannon/magical/attackby(obj/item/W, mob/user, params)
return
/obj/machinery/power/emitter/energycannon/magical/ex_act(severity)
/obj/machinery/power/emitter/energycannon/magical/ex_act(severity, target, origin)
return
/obj/machinery/power/emitter/energycannon/magical/emag_act(mob/user)
code/modules/spells/spell_types/ethereal_jaunt.dm
+1 -1
View File
@@ -105,7 +105,7 @@
forceMove(newLoc)
/obj/effect/dummy/phased_mob/spell_jaunt/ex_act(blah)
/obj/effect/dummy/phased_mob/spell_jaunt/ex_act(severity, target, origin)
return
/obj/effect/dummy/phased_mob/spell_jaunt/wave_ex_act(power, datum/wave_explosion/explosion, dir)
code/modules/spells/spell_types/shadow_walk.dm
+1 -1
View File
@@ -87,7 +87,7 @@
qdel(src)
check_light_level()
/obj/effect/dummy/phased_mob/shadow/ex_act()
/obj/effect/dummy/phased_mob/shadow/ex_act(severity, target, origin)
return
/obj/effect/dummy/phased_mob/shadow/wave_ex_act(power, datum/wave_explosion/explosion, dir)
code/modules/station_goals/bsa.dm
+1 -1
View File
@@ -226,7 +226,7 @@
invisibility = INVISIBILITY_ABSTRACT
var/obj/machinery/parent
/obj/structure/filler/ex_act()
/obj/structure/filler/ex_act(severity, target, origin)
return
/obj/machinery/computer/bsa_control