cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)

Browse Source 
* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-17 14:18:21 +00:00
committed by GitHub
co-authored by LemonInTheDark Gandalf2k15
parent 6f01502b33
commit 43febe3145
254 changed files with 837 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/containment_field.dm
+5 -5
View File
@@ -30,7 +30,7 @@
return ..()
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/machinery/field/containment/attack_hand(mob/user)
/obj/machinery/field/containment/attack_hand(mob/user, list/modifiers)
if(get_dist(src, user) > 1)
return FALSE
else
@@ -54,14 +54,14 @@
/obj/machinery/field/containment/ex_act(severity, target)
return FALSE
/obj/machinery/field/containment/attack_animal(mob/living/simple_animal/M)
/obj/machinery/field/containment/attack_animal(mob/living/simple_animal/user, list/modifiers)
if(!FG1 || !FG2)
qdel(src)
return
if(ismegafauna(M))
M.visible_message("<span class='warning'>[M] glows fiercely as the containment field flickers out!</span>")
if(ismegafauna(user))
user.visible_message("<span class='warning'>[user] glows fiercely as the containment field flickers out!</span>")
FG1.calc_power(INFINITY) //rip that 'containment' field
M.adjustHealth(-M.obj_damage)
user.adjustHealth(-user.obj_damage)
else
return ..()
code/modules/power/singularity/emitter.dm
+4 -4
View File
@@ -166,14 +166,14 @@
to_chat(user, "<span class='warning'>[src] needs to be firmly secured to the floor first!</span>")
return TRUE
/obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/M)
if(ismegafauna(M) && anchored)
/obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/user, list/modifiers)
if(ismegafauna(user) && anchored)
set_anchored(FALSE)
M.visible_message("<span class='warning'>[M] rips [src] free from its moorings!</span>")
user.visible_message("<span class='warning'>[user] rips [src] free from its moorings!</span>")
else
. = ..()
if(. && !anchored)
step(src, get_dir(M, src))
step(src, get_dir(user, src))
/obj/machinery/power/emitter/process(delta_time)
if(machine_stat & (BROKEN))
code/modules/power/singularity/field_generator.dm
+4 -4
View File
@@ -148,14 +148,14 @@ no power level overlay is currently in the overlays list.
return TRUE
/obj/machinery/field/generator/attack_animal(mob/living/simple_animal/M)
if(M.environment_smash & ENVIRONMENT_SMASH_RWALLS && active == FG_OFFLINE && state != FG_UNSECURED)
/obj/machinery/field/generator/attack_animal(mob/living/simple_animal/user, list/modifiers)
if(user.environment_smash & ENVIRONMENT_SMASH_RWALLS && active == FG_OFFLINE && state != FG_UNSECURED)
set_anchored(FALSE)
M.visible_message("<span class='warning'>[M] rips [src] free from its moorings!</span>")
user.visible_message("<span class='warning'>[user] rips [src] free from its moorings!</span>")
else
..()
if(!anchored)
step(src, get_dir(M, src))
step(src, get_dir(user, src))
/obj/machinery/field/generator/blob_act(obj/structure/blob/B)
if(active)