Adds a welding animation effect (#14362)

This commit is contained in:
Wowzewow (Wezzy)
2022-06-29 20:40:40 +02:00
committed by GitHub
parent 6af2ef15ef
commit f641be7ead
3 changed files with 50 additions and 3 deletions
+9 -3
View File
@@ -213,6 +213,7 @@
icon = 'icons/obj/contained_items/tools/welding_tools.dmi'
icon_state = "welder"
item_state = "welder"
var/welding_state = "welding_sparks"
contained_sprite = TRUE
flags = CONDUCT
slot_flags = SLOT_BELT
@@ -239,7 +240,6 @@
var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2)
var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
var/max_fuel = 20 //The max amount of fuel the welder can hold
var/change_icons = TRUE
/obj/item/weldingtool/iswelder()
@@ -298,6 +298,12 @@
R.add_reagent(/decl/reagent/fuel, max_fuel)
update_icon()
/obj/item/weldingtool/use_tool(atom/target, mob/living/user, delay, amount, volume, datum/callback/extra_checks)
var/image/welding_sparks = image('icons/effects/effects.dmi', welding_state, EFFECTS_ABOVE_LIGHTING_LAYER)
target.add_overlay(welding_sparks)
. = ..()
target.cut_overlay(welding_sparks)
/obj/item/weldingtool/proc/update_torch()
if(welding)
add_overlay("[initial(icon_state)]-on")
@@ -765,10 +771,10 @@
return TRUE
/obj/item/crowbar/rescue_axe/red
/obj/item/crowbar/rescue_axe/red
icon_state = "rescue_axe_red"
item_state = "rescue_axe_red"
// Pipe wrench
/obj/item/pipewrench
name = "pipe wrench"
+41
View File
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Wowzewow (Wezzy)
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- imageadd: "Adds a new welding effect. Try welding something!"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 KiB

After

Width:  |  Height:  |  Size: 331 KiB