Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Clowns can no longer kill themselves with holographic eswords #2731

Merged
merged 1 commit into from
Apr 5, 2024
Merged

[MIRROR] Clowns can no longer kill themselves with holographic eswords #2731

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion code/datums/components/transforming.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
var/list/attack_verb_simple_on
/// Whether clumsy people need to succeed an RNG check to turn it on without hurting themselves
var/clumsy_check
/// Amount of damage to deal to clumsy people
var/clumsy_damage
/// If we get sharpened with a whetstone, save the bonus here for later use if we un/redeploy
var/sharpened_bonus = 0
/// Dictate whether we change inhands or not
Expand All @@ -51,6 +53,7 @@
hitsound_on = 'sound/weapons/blade1.ogg',
w_class_on = WEIGHT_CLASS_BULKY,
clumsy_check = TRUE,
clumsy_damage = 10,
list/attack_verb_continuous_on,
list/attack_verb_simple_on,
inhand_icon_change = TRUE,
Expand All @@ -69,6 +72,7 @@
src.hitsound_on = hitsound_on
src.w_class_on = w_class_on
src.clumsy_check = clumsy_check
src.clumsy_damage = clumsy_damage
src.inhand_icon_change = inhand_icon_change

if(attack_verb_continuous_on)
Expand Down Expand Up @@ -266,8 +270,21 @@
span_warning("[user] triggers [parent] while holding it backwards and [hurt_self_verb_continuous] themself, like a doofus!"),
span_warning("You trigger [parent] while holding it backwards and [hurt_self_verb_simple] yourself, like a doofus!"),
)
user.take_bodypart_damage(10)
var/obj/item/item_parent = parent
switch(item_parent.damtype)
if(STAMINA)
user.adjustStaminaLoss(clumsy_damage)
if(OXY)
user.adjustOxyLoss(clumsy_damage)
if(TOX)
user.adjustToxLoss(clumsy_damage)
if(BRUTE)
user.take_bodypart_damage(brute=clumsy_damage)
if(BURN)
user.take_bodypart_damage(burn=clumsy_damage)

return TRUE

return FALSE

/*
Expand Down
Loading