cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-15 18:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes some shielded component jank [MDB IGNORE] (#24969)

Browse Source 
* Fixes some shielded component jank

* Update _suits.dm

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-11-13 12:49:09 +01:00
committed by GitHub
parent 4f7cf10841
commit fc7413ff75
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/shielded.dm
+7 -1
View File
@@ -3,6 +3,7 @@
*/
/datum/component/shielded
dupe_mode = COMPONENT_DUPE_UNIQUE
/// The person currently wearing us
var/mob/living/wearer
/// How many charges we can have max, and how many we start with
@@ -113,7 +114,7 @@
if((slot & ITEM_SLOT_HANDS) && !shield_inhand)
lost_wearer(source, user)
return
set_wearer(source, user)
set_wearer(user)
/// Either we've been dropped or our wearer has been QDEL'd. Either way, they're no longer our problem
/datum/component/shielded/proc/lost_wearer(datum/source, mob/user)
@@ -125,6 +126,11 @@
wearer = null
/datum/component/shielded/proc/set_wearer(mob/user)
if(wearer == user)
return
if(!isnull(wearer))
CRASH("[type] called set_wearer with [user] but [wearer] was already the wearer!")
wearer = user
RegisterSignal(wearer, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays))
RegisterSignal(wearer, COMSIG_QDELETING, PROC_REF(lost_wearer))
code/modules/antagonists/cult/cult_items.dm
+9 -2
View File
@@ -377,8 +377,15 @@ Striking a noncultist, however, will tear their flesh."}
fire = 50
acid = 60
/obj/item/clothing/suit/hooded/cultrobes/cult_shield/setup_shielding()
AddComponent(/datum/component/shielded, recharge_start_delay = 0 SECONDS, shield_icon_file = 'icons/effects/cult/effects.dmi', shield_icon = "shield-cult", run_hit_callback = CALLBACK(src, PROC_REF(shield_damaged)))
/obj/item/clothing/suit/hooded/cultrobes/cult_shield/Initialize(mapload)
. = ..()
AddComponent( \
/datum/component/shielded, \
recharge_start_delay = 0 SECONDS, \
shield_icon_file = 'icons/effects/cult/effects.dmi', \
shield_icon = "shield-cult", \
run_hit_callback = CALLBACK(src, PROC_REF(shield_damaged)), \
)
/// A proc for callback when the shield breaks, since cult robes are stupid and have different effects
/obj/item/clothing/suit/hooded/cultrobes/cult_shield/proc/shield_damaged(mob/living/wearer, attack_text, new_current_charges)
code/modules/capture_the_flag/ctf_equipment.dm
+11 -5
View File
@@ -207,12 +207,18 @@
var/lose_multiple_charges = TRUE
var/show_charge_as_alpha = TRUE
/obj/item/clothing/suit/armor/vest/ctf/equipped(mob/user, slot)
/obj/item/clothing/suit/armor/vest/ctf/Initialize(mapload)
. = ..()
if(!slot || slot & ITEM_SLOT_HANDS)
return
AddComponent(/datum/component/shielded, max_charges = max_charges, recharge_start_delay = recharge_start_delay, charge_increment_delay = charge_increment_delay, \
charge_recovery = charge_recovery, lose_multiple_charges = lose_multiple_charges, show_charge_as_alpha = show_charge_as_alpha, shield_icon = team_shield_icon)
AddComponent( \
/datum/component/shielded, \
max_charges = max_charges, \
recharge_start_delay = recharge_start_delay, \
charge_increment_delay = charge_increment_delay, \
charge_recovery = charge_recovery, \
lose_multiple_charges = lose_multiple_charges, \
show_charge_as_alpha = show_charge_as_alpha, \
shield_icon = team_shield_icon, \
)
// LIGHT SHIELDED VEST
code/modules/clothing/suits/_suits.dm
+1 -17
View File
@@ -17,14 +17,7 @@
var/blood_overlay_type = "suit"
limb_integrity = 0 // disabled for most exo-suits
/obj/item/clothing/suit/Initialize(mapload)
. = ..()
setup_shielding()
/// SKYRAT EDIT CHANGE BEGIN - taurs and teshis
// /obj/item/clothing/suit/worn_overlays(mutable_appearance/standing, isinhands = FALSE) // ORIGINAL
/obj/item/clothing/suit/worn_overlays(mutable_appearance/standing, isinhands = FALSE, file2use = null, mutant_styles = NONE)
// SKYRAT EDIT CHANGE END
/obj/item/clothing/suit/worn_overlays(mutable_appearance/standing, isinhands = FALSE, file2use = null, mutant_styles = NONE) // SKYRAT EDIT CHANGE - TAURS AND TESHIS - ORIGINAL: /obj/item/clothing/suit/worn_overlays(mutable_appearance/standing, isinhands = FALSE)
. = ..()
if(isinhands)
return
@@ -58,12 +51,3 @@
if(ismob(loc))
var/mob/M = loc
M.update_worn_oversuit()
/**
* Wrapper proc to apply shielding through AddComponent().
* Called in /obj/item/clothing/Initialize().
* Override with an AddComponent(/datum/component/shielded, args) call containing the desired shield statistics.
* See /datum/component/shielded documentation for a description of the arguments
**/
/obj/item/clothing/suit/proc/setup_shielding()
return