Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c47feed

Browse filesBrowse files
authored
Update explosive_fist.dm (yogstation13#20511)
1 parent 8a21ede commit c47feed
Copy full SHA for c47feed

1 file changed

+6-2Lines changed: 6 additions & 2 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎yogstation/code/datums/martial/explosive_fist.dm‎

Copy file name to clipboardExpand all lines: yogstation/code/datums/martial/explosive_fist.dm
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@
5252
var/burn_block = D.run_armor_check(affecting, BOMB, 0)
5353
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
5454
playsound(get_turf(D), get_sfx("explosion"), 50, TRUE, -1)
55-
new /obj/effect/hotspot(get_turf(D)) //for the flashy
55+
56+
if(isopenturf(get_turf(D)))
57+
var/turf/open/flashy = get_turf(D)
58+
flashy.IgniteTurf(rand(5, 10)) //for the flashy
59+
5660
D.ignite_mob()
5761
D.apply_damage(A.get_punchdamagehigh() + 3, BRUTE, selected_zone, brute_block) //10 brute
5862
D.apply_damage(A.get_punchdamagehigh() + 3, BURN, selected_zone, burn_block) //10 burn (vs bomb armor)
@@ -356,7 +360,7 @@
356360
target.adjustFireLoss(30)
357361
target.ignite_mob()
358362
for(var/turf/open/flashy in view_or_range(2, A, "range"))
359-
new /obj/effect/hotspot(flashy) //for the flashy
363+
flashy.IgniteTurf(15)
360364

361365
var/obj/item/bodypart/hed = D.get_bodypart(BODY_ZONE_HEAD)
362366
var/armor_block = D.run_armor_check(hed, BOMB)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.