From 7ccb5bc711fb1339c6a05ed5b2f1e2778fb244db Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 26 Apr 2021 14:21:59 -0700 Subject: [PATCH] fixes --- code/datums/components/identification.dm | 2 +- code/datums/status_effects/debuffs.dm | 2 +- code/game/objects/items.dm | 6 +++--- code/game/objects/items/devices/traitordevices.dm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/datums/components/identification.dm b/code/datums/components/identification.dm index 474363b85b..59b98b57ac 100644 --- a/code/datums/components/identification.dm +++ b/code/datums/components/identification.dm @@ -24,7 +24,7 @@ identification_method_flags = id_method_flags /datum/component/identification/RegisterWithParent() - RegisterSignal(parent, COMSIG_IDENFICATION_KNOWLEDGE_CHECK, .proc/check_knowledge) + RegisterSignal(parent, COMSIG_IDENTIFICATION_KNOWLEDGE_CHECK, .proc/check_knowledge) RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) if(identification_effect_flags & ID_COMPONENT_EFFECT_NO_ACTIONS) RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 27de3bd702..d01d3a1454 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -190,9 +190,9 @@ /datum/status_effect/electrode/no_combat_mode id = "tased_strong" movespeed_mod = /datum/movespeed_modifier/status_effect/tased/no_combat_mode - blocks_combatmode = TRUE stamdmg_per_ds = 1 + //OTHER DEBUFFS /datum/status_effect/his_wrath //does minor damage over time unless holding His Grace id = "his_wrath" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 330865c5b7..5dd9b9928c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -453,15 +453,15 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_ITEM_PICKUP, user) item_flags |= IN_INVENTORY - if(combat_flags & (ITEM_CAN_BLOCK | ITEM_CAN_PARRY) && user.client && !(type in user.client.block_parry_hinted)) + if(item_flags & (ITEM_CAN_BLOCK | ITEM_CAN_PARRY) && user.client && !(type in user.client.block_parry_hinted)) var/list/dat = list("You have picked up an item that can be used to block and/or parry:") // cit change - parry/block feedback var/datum/block_parry_data/data = return_block_parry_datum(block_parry_data) - if(combat_flags & ITEM_CAN_BLOCK) + if(item_flags & ITEM_CAN_BLOCK) dat += "[src] can be used to block damage using directional block. Press your active block keybind to use it." if(data.block_automatic_enabled) dat += "[src] is also capable of automatically blocking damage, if you are facing the right direction (usually towards your attacker)!" - if(combat_flags & ITEM_CAN_PARRY) + if(item_flags & ITEM_CAN_PARRY) dat += "[src] can be used to parry damage using active parry. Pressed your active parry keybind to initiate a timed parry sequence." if(data.parry_automatic_enabled) dat += "[src] is also capable of automatically parrying an incoming attack, if your mouse is over your attacker at the time if you being hit in a direct, melee attack." diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 6e3a73f25c..6e06a87ac3 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -116,7 +116,7 @@ effective or pretty fucking useless. interact(user) /obj/item/healthanalyzer/rad_laser/interact(mob/user) - var/knowledge = SEND_SIGNAL(COMSIG_IDENTIFICATION_KNOWLEDGE_CHECK, user) == ID_COMPONENT_KNOWLEDGE_FULL + var/knowledge = SEND_SIGNAL(src, COMSIG_IDENTIFICATION_KNOWLEDGE_CHECK, user) == ID_COMPONENT_KNOWLEDGE_FULL if(knowledge) ui_interact(user)