Skip to content

Commit 2d78b6d

Browse files
committed
Update/ fix error
1 parent e8cf13e commit 2d78b6d

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

code/game/objects/items/weapons/weaponry.dm

+16-17
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,8 @@
9898
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
9999
resistance_flags = FIRE_PROOF
100100
var/katana_cooldown
101-
var/mob/living/carbon/human/user = owner
101+
var/mob/living/user = null
102102
var/mob/living/target
103-
var/obj/item/organ/external/head/head = target.get_organ(BODY_ZONE_HEAD)
104103

105104

106105
/obj/item/melee/katana/suicide_act(mob/user)
@@ -109,39 +108,39 @@
109108

110109
/obj/item/melee/katana/proc/reset_cooldown()
111110
katana_cooldown = FALSE
112-
if(owner)
113-
owner.update_action_buttons()
114-
to_chat(owner, span_notice("Вы готовы к новому рывку."))
111+
if(user)
112+
user.update_action_buttons()
113+
to_chat(user, span_notice("Вы готовы к новому рывку."))
115114

116115

117116
/obj/item/melee/katana/ui_action_click(mob/user, datum/action/action, leftclick)
118117
if(katana_cooldown)
119-
to_chat(owner, span_warning("Вам нужна отдышка перед новым рывком!"))
118+
to_chat(user, span_warning("Вам нужна отдышка перед новым рывком!"))
120119
return
121120

122121
charge()
123122

124-
implant_emp_downtime = TRUE
123+
katana_cooldown = TRUE
125124
addtimer(CALLBACK(src, PROC_REF(reset_cooldown)), 100 SECONDS) // 100 секунд для повторного рывка
126125

127-
/obj/item/melee/katana/proc/charge()
128-
owner.multiplicative_slowdown = -1
129-
owner.Move(NewLoc,Dir=0,step_x=5,step_y=0)
130-
owner.scream
126+
/obj/item/melee/katana/proc/charge(atom/newloc)
127+
user.multiplicative_slowdown = -1
128+
user.Move(newloc,Dir=0,step_x=5,step_y=0)
129+
user.emote("scream")
131130

132131
/obj/item/melee/katana/Bump(atom/bumped)
132+
var/obj/item/organ/external/head/head = target.get_organ(BODY_ZONE_HEAD)
133133
if(!charge())
134134
return
135135
if(isliving(bumped))
136136
if(ismegafauna(bumped))
137137
return
138138
target = bumped
139-
head.droplimb()
140-
add_attack_logs(owner, target, "beheaded with [src]")
141-
H.regenerate_icons()
142-
kill_count++
143-
if(!HAS_TRAIT(owner, TRAIT_FLOORED))
144-
owner.Weaken(3 SECONDS)
139+
head.droplimb()
140+
add_attack_logs(user, target, "beheaded with [src]")
141+
target.regenerate_icons()
142+
if(!HAS_TRAIT(user, TRAIT_FLOORED))
143+
user.Weaken(3 SECONDS)
145144

146145
/obj/item/melee/katana/basalt
147146
name = "basalt katana"

0 commit comments

Comments
 (0)