cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +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/antagonists/abductor/machinery/console.dm
+1 -1
View File
@@ -46,7 +46,7 @@
filtered_modules[AG.category][AG] = AG
return filtered_modules
/obj/machinery/abductor/console/attack_hand(mob/user)
/obj/machinery/abductor/console/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/modules/antagonists/blob/structures/_blob.dm
+8 -8
View File
@@ -11,7 +11,7 @@
pass_flags_self = PASSBLOB
CanAtmosPass = ATMOS_PASS_PROC
/// How many points the blob gets back when it removes a blob of that type. If less than 0, blob cannot be removed.
var/point_return = 0
var/point_return = 0
max_integrity = 30
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 70)
/// how much health this blob regens when pulsed
@@ -22,12 +22,12 @@
COOLDOWN_DECLARE(heal_timestamp)
/// Multiplies brute damage by this
var/brute_resist = BLOB_BRUTE_RESIST
/// Multiplies burn damage by this
var/fire_resist = BLOB_FIRE_RESIST
/// Multiplies burn damage by this
var/fire_resist = BLOB_FIRE_RESIST
/// Only used by the synchronous mesh strain. If set to true, these blobs won't share or receive damage taken with others.
var/ignore_syncmesh_share = 0
/// If the blob blocks atmos and heat spread
var/atmosblock = FALSE
var/atmosblock = FALSE
var/mob/camera/blob/overmind
@@ -232,8 +232,8 @@
"<b>Effects:</b> <span class='notice'>[scannerreport()]</span>")
/obj/structure/blob/attack_animal(mob/living/simple_animal/M)
if(ROLE_BLOB in M.faction) //sorry, but you can't kill the blob as a blobbernaut
/obj/structure/blob/attack_animal(mob/living/simple_animal/user, list/modifiers)
if(ROLE_BLOB in user.faction) //sorry, but you can't kill the blob as a blobbernaut
return
..()
@@ -350,14 +350,14 @@
// Spore production vars: for core, factories, and nodes (with strains)
var/mob/living/simple_animal/hostile/blob/blobbernaut/naut = null
var/max_spores = 0
var/max_spores = 0
var/list/spores = list()
COOLDOWN_DECLARE(spore_delay)
var/spore_cooldown = BLOBMOB_SPORE_SPAWN_COOLDOWN
// Area reinforcement vars: used by cores and nodes, for strains to modify
/// Range this blob free upgrades to strong blobs at: for the core, and for strains
var/strong_reinforce_range = 0
var/strong_reinforce_range = 0
/// Range this blob free upgrades to reflector blobs at: for the core, and for strains
var/reflector_reinforce_range = 0
code/modules/antagonists/changeling/powers/transform.dm
+8 -8
View File
@@ -12,7 +12,7 @@
item_flags = DROPDEL
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/glasses/changeling/attack_hand(mob/user)
/obj/item/clothing/glasses/changeling/attack_hand(mob/user, list/modifiers)
if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling))
to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
qdel(src)
@@ -24,7 +24,7 @@
item_flags = DROPDEL
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/under/changeling/attack_hand(mob/user)
/obj/item/clothing/under/changeling/attack_hand(mob/user, list/modifiers)
if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling))
to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
qdel(src)
@@ -37,7 +37,7 @@
item_flags = DROPDEL
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/suit/changeling/attack_hand(mob/user)
/obj/item/clothing/suit/changeling/attack_hand(mob/user, list/modifiers)
if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling))
to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
qdel(src)
@@ -50,7 +50,7 @@
item_flags = DROPDEL
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/head/changeling/attack_hand(mob/user)
/obj/item/clothing/head/changeling/attack_hand(mob/user, list/modifiers)
if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling))
to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
qdel(src)
@@ -62,7 +62,7 @@
item_flags = DROPDEL
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/shoes/changeling/attack_hand(mob/user)
/obj/item/clothing/shoes/changeling/attack_hand(mob/user, list/modifiers)
if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling))
to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
qdel(src)
@@ -74,7 +74,7 @@
item_flags = DROPDEL
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/gloves/changeling/attack_hand(mob/user)
/obj/item/clothing/gloves/changeling/attack_hand(mob/user, list/modifiers)
if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling))
to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
qdel(src)
@@ -86,7 +86,7 @@
item_flags = DROPDEL
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/mask/changeling/attack_hand(mob/user)
/obj/item/clothing/mask/changeling/attack_hand(mob/user, list/modifiers)
if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling))
to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
qdel(src)
@@ -100,7 +100,7 @@
item_flags = DROPDEL
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/changeling/attack_hand(mob/user)
/obj/item/changeling/attack_hand(mob/user, list/modifiers)
if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling))
to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
qdel(src)
code/modules/antagonists/cult/cult_items.dm
+1 -1
View File
@@ -257,7 +257,7 @@
breakouttime = 60
knockdown = 30
/obj/item/restraints/legcuffs/bola/cult/attack_hand(mob/living/user)
/obj/item/restraints/legcuffs/bola/cult/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(!iscultist(user))
to_chat(user, "<span class='warning'>The bola seems to take on a life of its own!</span>")
code/modules/antagonists/cult/cult_structures.dm
+9 -9
View File
@@ -46,16 +46,16 @@
return "<span class='cult'>[t_It] [t_is] at <b>[round(obj_integrity * 100 / max_integrity)]%</b> stability.</span>"
return ..()
/obj/structure/destructible/cult/attack_animal(mob/living/simple_animal/M)
if(istype(M, /mob/living/simple_animal/hostile/construct/artificer))
/obj/structure/destructible/cult/attack_animal(mob/living/simple_animal/user, list/modifiers)
if(istype(user, /mob/living/simple_animal/hostile/construct/artificer))
if(obj_integrity < max_integrity)
M.changeNext_move(CLICK_CD_MELEE)
user.changeNext_move(CLICK_CD_MELEE)
obj_integrity = min(max_integrity, obj_integrity + 5)
Beam(M, icon_state="sendbeam", time=4)
M.visible_message("<span class='danger'>[M] repairs \the <b>[src]</b>.</span>", \
Beam(user, icon_state="sendbeam", time=4)
user.visible_message("<span class='danger'>[user] repairs \the <b>[src]</b>.</span>", \
"<span class='cult'>You repair <b>[src]</b>, leaving [p_they()] at <b>[round(obj_integrity * 100 / max_integrity)]%</b> stability.</span>")
else
to_chat(M, "<span class='cult'>You cannot repair [src], as [p_theyre()] undamaged!</span>")
to_chat(user, "<span class='cult'>You cannot repair [src], as [p_theyre()] undamaged!</span>")
else
..()
@@ -89,7 +89,7 @@
icon_state = "talismanaltar"
break_message = "<span class='warning'>The altar shatters, leaving only the wailing of the damned!</span>"
/obj/structure/destructible/cult/talisman/attack_hand(mob/living/user)
/obj/structure/destructible/cult/talisman/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -133,7 +133,7 @@
light_color = LIGHT_COLOR_LAVA
break_message = "<span class='warning'>The force breaks apart into shards with a howling scream!</span>"
/obj/structure/destructible/cult/forge/attack_hand(mob/living/user)
/obj/structure/destructible/cult/forge/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -254,7 +254,7 @@
light_color = LIGHT_COLOR_FIRE
break_message = "<span class='warning'>The books and tomes of the archives burn into ash as the desk shatters!</span>"
/obj/structure/destructible/cult/tome/attack_hand(mob/living/user)
/obj/structure/destructible/cult/tome/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
code/modules/antagonists/cult/runes.dm
+8 -8
View File
@@ -81,7 +81,7 @@ Runes can either be invoked by one's self or with many different cultists. Each
SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_NARNAR] = TRUE
qdel(src)
/obj/effect/rune/attack_hand(mob/living/user)
/obj/effect/rune/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -95,15 +95,15 @@ Runes can either be invoked by one's self or with many different cultists. Each
to_chat(user, "<span class='danger'>You need [req_cultists - invokers.len] more adjacent cultists to use this rune in such a manner.</span>")
fail_invoke()
/obj/effect/rune/attack_animal(mob/living/simple_animal/M)
if(istype(M, /mob/living/simple_animal/shade) || istype(M, /mob/living/simple_animal/hostile/construct))
if(istype(M, /mob/living/simple_animal/hostile/construct/wraith/angelic) || istype(M, /mob/living/simple_animal/hostile/construct/juggernaut/angelic) || istype(M, /mob/living/simple_animal/hostile/construct/artificer/angelic))
to_chat(M, "<span class='warning'>You purge the rune!</span>")
/obj/effect/rune/attack_animal(mob/living/simple_animal/user, list/modifiers)
if(istype(user, /mob/living/simple_animal/shade) || istype(user, /mob/living/simple_animal/hostile/construct))
if(istype(user, /mob/living/simple_animal/hostile/construct/wraith/angelic) || istype(user, /mob/living/simple_animal/hostile/construct/juggernaut/angelic) || istype(user, /mob/living/simple_animal/hostile/construct/artificer/angelic))
to_chat(user, "<span class='warning'>You purge the rune!</span>")
qdel(src)
else if(construct_invoke || !iscultist(M)) //if you're not a cult construct we want the normal fail message
attack_hand(M)
else if(construct_invoke || !iscultist(user)) //if you're not a cult construct we want the normal fail message
attack_hand(user)
else
to_chat(M, "<span class='warning'>You are unable to invoke the rune!</span>")
to_chat(user, "<span class='warning'>You are unable to invoke the rune!</span>")
/obj/effect/rune/proc/conceal() //for talisman of revealing/hiding
visible_message("<span class='danger'>[src] fades away.</span>")
code/modules/antagonists/eldritch_cult/eldritch_effects.dm
+2 -2
View File
@@ -14,7 +14,7 @@
I.override = TRUE
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "heretic_rune", I)
/obj/effect/eldritch/attack_hand(mob/living/user)
/obj/effect/eldritch/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -207,7 +207,7 @@
/obj/effect/broken_illusion/proc/show_presence()
animate(src,alpha = 255,time = 15 SECONDS)
/obj/effect/broken_illusion/attack_hand(mob/living/user)
/obj/effect/broken_illusion/attack_hand(mob/living/user, list/modifiers)
if(!ishuman(user))
return ..()
var/mob/living/carbon/human/human_user = user
code/modules/antagonists/eldritch_cult/eldritch_structures.dm
+1 -1
View File
@@ -61,7 +61,7 @@
return ..()
/obj/structure/eldritch_crucible/attack_hand(mob/user)
/obj/structure/eldritch_crucible/attack_hand(mob/user, list/modifiers)
if(!IS_HERETIC(user) && !IS_HERETIC_MONSTER(user))
if(iscarbon(user))
devour(user)
code/modules/antagonists/slaughter/slaughter.dm
+1 -1
View File
@@ -131,7 +131,7 @@
slam_cooldown = world.time
log_combat(src, victim, "slaughter slammed")
/mob/living/simple_animal/hostile/imp/slaughter/UnarmedAttack(atom/A, proximity)
/mob/living/simple_animal/hostile/imp/slaughter/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
return
if(iscarbon(A))