cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +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/events/crystal_event.dm
+2 -2
View File
@@ -564,8 +564,8 @@ This section is for the crystal portals variations
. = ..()
. += "<span class='notice'>The [src] seems to be releasing some sort or high frequency wavelength, maybe it could be closed if another signal is sent back or if an equivalent device is used on it.</span>"
/obj/structure/crystal_portal/attack_animal(mob/living/simple_animal/M)
if(faction_check(faction, M.faction, FALSE) && !M.client)
/obj/structure/crystal_portal/attack_animal(mob/living/simple_animal/user, list/modifiers)
if(faction_check(faction, user.faction, FALSE) && !user.client)
return ..()
/obj/structure/crystal_portal/attackby(obj/item/W, mob/living/user, params)
code/modules/events/immovable_rod.dm
+1 -1
View File
@@ -249,7 +249,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
if(smeared_mob.density || prob(10))
smeared_mob.ex_act(EXPLODE_HEAVY)
/obj/effect/immovablerod/attack_hand(mob/living/user)
/obj/effect/immovablerod/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
code/modules/events/spacevine.dm
+3 -3
View File
@@ -407,18 +407,18 @@
SM.on_cross(src, AM)
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/spacevine/attack_hand(mob/user)
/obj/structure/spacevine/attack_hand(mob/user, list/modifiers)
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_hit(src, user)
user_unbuckle_mob(user, user)
. = ..()
/obj/structure/spacevine/attack_paw(mob/living/user)
/obj/structure/spacevine/attack_paw(mob/living/user, list/modifiers)
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_hit(src, user)
user_unbuckle_mob(user,user)
/obj/structure/spacevine/attack_alien(mob/living/user)
/obj/structure/spacevine/attack_alien(mob/living/user, list/modifiers)
eat(user)
/datum/spacevine_controller