mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-11 08:06:33 +01:00
SmArtKar
7ddc30783a
## About The Pull Request This is the first PR in a series attempting to modernize our damage and armor, both from a code and a gameplay perspective. This part implements unique attack animations, adds alternate attack modes for items and fixes some minor oversights. Items now have unique attack animation based on their sharpness - sharp items are now swung in an arc, while pointy items are thrust forward. This change is ***purely visual***, this is not swing combat. (However, this does assign icon rotation data to many items, which should help swing combat later down the line). Certain items like knives and swords now have secondary attacks - right clicks will perform stabbing attacks instead of slashing for a chance to leave piercing wounds, albeit with slightly lower damage - trying to stick a katana through someone won't get you very far! https://github.com/user-attachments/assets/1f92bbcd-9aa1-482f-bc26-5e84fe2a07e1 Turns out that spears acted as oversized knives this entire time, being SHARP_EDGED instead of SHARP_POINTY - in order for their animations to make sense, they're now once again pointy (according to comment, originally they were made sharp because piercing wounds weren't very threatening, which is no longer the case) Another major change is that structure damage is now influenced by armor penetration - I am not sure if this is intentional or not, but attacking item's AP never applied to non-mob damage. Additionally, also fixes an issue where attack verbs for you and everyone else may differ.
141 lines
5.3 KiB
Plaintext
141 lines
5.3 KiB
Plaintext
/obj/item/wrench
|
|
name = "wrench"
|
|
desc = "A wrench with common uses. Can be found in your hand."
|
|
icon = 'icons/obj/tools.dmi'
|
|
icon_state = "wrench"
|
|
inhand_icon_state = "wrench"
|
|
worn_icon_state = "wrench"
|
|
icon_angle = -135
|
|
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
|
|
obj_flags = CONDUCTS_ELECTRICITY
|
|
slot_flags = ITEM_SLOT_BELT
|
|
force = 5
|
|
throwforce = 7
|
|
demolition_mod = 1.25
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
usesound = 'sound/items/tools/ratchet.ogg'
|
|
operating_sound = list('sound/items/tools/ratchet_fast.ogg', 'sound/items/tools/ratchet_slow.ogg')
|
|
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*1.5)
|
|
drop_sound = 'sound/items/handling/tools/wrench_drop.ogg'
|
|
pickup_sound = 'sound/items/handling/tools/wrench_pickup.ogg'
|
|
|
|
attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks")
|
|
attack_verb_simple = list("bash", "batter", "bludgeon", "whack")
|
|
tool_behaviour = TOOL_WRENCH
|
|
toolspeed = 1
|
|
armor_type = /datum/armor/item_wrench
|
|
|
|
/datum/armor/item_wrench
|
|
fire = 50
|
|
acid = 30
|
|
|
|
/obj/item/wrench/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/falling_hazard, damage = force, wound_bonus = wound_bonus, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound)
|
|
|
|
/obj/item/wrench/suicide_act(mob/living/user)
|
|
user.visible_message(span_suicide("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
playsound(loc, 'sound/items/weapons/genhit.ogg', 50, TRUE, -1)
|
|
return BRUTELOSS
|
|
|
|
/obj/item/wrench/abductor
|
|
name = "alien wrench"
|
|
desc = "A polarized wrench. It causes anything placed between the jaws to turn."
|
|
icon = 'icons/obj/antags/abductor.dmi'
|
|
inside_belt_icon_state = "wrench_alien"
|
|
icon_angle = -135
|
|
custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT)
|
|
usesound = 'sound/effects/empulse.ogg'
|
|
toolspeed = 0.1
|
|
|
|
|
|
/obj/item/wrench/medical
|
|
name = "medical wrench"
|
|
desc = "A medical wrench with common(medical?) uses. Can be found in your hand."
|
|
icon_state = "wrench_medical"
|
|
inhand_icon_state = "wrench_medical"
|
|
force = 2 //MEDICAL
|
|
throwforce = 4
|
|
attack_verb_continuous = list("heals", "medicals", "taps", "pokes", "analyzes") //"cobbyed"
|
|
attack_verb_simple = list("heal", "medical", "tap", "poke", "analyze")
|
|
///var to hold the name of the person who suicided
|
|
var/suicider
|
|
|
|
/obj/item/wrench/medical/examine(mob/user)
|
|
. = ..()
|
|
if(suicider)
|
|
. += span_notice("For some reason, it reminds you of [suicider].")
|
|
|
|
/obj/item/wrench/medical/suicide_act(mob/living/user)
|
|
user.visible_message(span_suicide("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
user.Stun(100, ignore_canstun = TRUE)// Stun stops them from wandering off
|
|
user.set_light_color(COLOR_VERY_SOFT_YELLOW)
|
|
user.set_light(2)
|
|
user.add_overlay(mutable_appearance('icons/mob/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER))
|
|
playsound(loc, 'sound/effects/pray.ogg', 50, TRUE, -1)
|
|
|
|
// Let the sound effect finish playing
|
|
add_fingerprint(user)
|
|
sleep(2 SECONDS)
|
|
if(!user)
|
|
return
|
|
for(var/obj/item/suicide_wrench in user)
|
|
user.dropItemToGround(suicide_wrench)
|
|
suicider = user.real_name
|
|
user.dust()
|
|
return OXYLOSS
|
|
|
|
/obj/item/wrench/cyborg
|
|
name = "hydraulic wrench"
|
|
desc = "An advanced robotic wrench, powered by internal hydraulics. Twice as fast as the handheld version."
|
|
icon = 'icons/obj/items_cyborg.dmi'
|
|
icon_state = "toolkit_engiborg_wrench"
|
|
icon_angle = 0
|
|
toolspeed = 0.5
|
|
|
|
/obj/item/wrench/combat
|
|
name = "combat wrench"
|
|
desc = "It's like a normal wrench but edgier. Can be found on the battlefield."
|
|
icon_state = "wrench_combat"
|
|
inhand_icon_state = "wrench_combat"
|
|
inside_belt_icon_state = "wrench_combat"
|
|
icon_angle = -90
|
|
attack_verb_continuous = list("devastates", "brutalizes", "commits a war crime against", "obliterates", "humiliates")
|
|
attack_verb_simple = list("devastate", "brutalize", "commit a war crime against", "obliterate", "humiliate")
|
|
tool_behaviour = null
|
|
|
|
/obj/item/wrench/combat/Initialize(mapload)
|
|
. = ..()
|
|
AddComponent( \
|
|
/datum/component/transforming, \
|
|
force_on = 6, \
|
|
throwforce_on = 8, \
|
|
hitsound_on = hitsound, \
|
|
w_class_on = WEIGHT_CLASS_NORMAL, \
|
|
clumsy_check = FALSE, \
|
|
)
|
|
RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
|
|
|
|
/*
|
|
* Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
|
|
*
|
|
* Gives it wrench behaviors when active.
|
|
*/
|
|
/obj/item/wrench/combat/proc/on_transform(obj/item/source, mob/user, active)
|
|
SIGNAL_HANDLER
|
|
|
|
tool_behaviour = active ? TOOL_WRENCH : initial(tool_behaviour)
|
|
if(user)
|
|
balloon_alert(user, "[name] [active ? "active, woe!":"restrained"]")
|
|
playsound(src, active ? 'sound/items/weapons/saberon.ogg' : 'sound/items/weapons/saberoff.ogg', 5, TRUE)
|
|
return COMPONENT_NO_DEFAULT_MESSAGE
|
|
|
|
/obj/item/wrench/bolter
|
|
name = "bolter wrench"
|
|
desc = "A wrench designed to grab into airlock's bolting system and raise it regardless of the airlock's power status."
|
|
icon_state = "bolter_wrench"
|
|
inhand_icon_state = "bolter_wrench"
|
|
icon_angle = -90
|
|
w_class = WEIGHT_CLASS_NORMAL
|