[MIRROR] Vapes use correct fill level overlays (#28767)

* Vapes use correct fill level overlays (#84821)

## About The Pull Request

Closes #83573 by removing an underscore

## Changelog
🆑
fix: Vapes use correct fill level overlays
/🆑

* Vapes use correct fill level overlays

---------

Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-07-11 19:40:57 +05:30
committed by GitHub
co-authored by SmArtKar
parent b847267d50
commit 1bd321cb76
5 changed files with 12 additions and 12 deletions
@@ -265,15 +265,15 @@
/datum/greyscale_config/vape/open_low
name = "Open Vape Low"
json_config = 'code/datums/greyscale/json_configs/vape_open_low.json'
json_config = 'code/datums/greyscale/json_configs/vapeopen_low.json'
/datum/greyscale_config/vape/open_med
name = "Open Vape Medium"
json_config = 'code/datums/greyscale/json_configs/vape_open_med.json'
json_config = 'code/datums/greyscale/json_configs/vapeopen_med.json'
/datum/greyscale_config/vape/open_high
name = "Open Vape High"
json_config = 'code/datums/greyscale/json_configs/vape_open_high.json'
json_config = 'code/datums/greyscale/json_configs/vapeopen_high.json'
//
// TAPE
@@ -1,5 +1,5 @@
{
"vape_open_high": [
"vapeopen_high": [
{
"type": "icon_state",
"icon_state": "vapeOutlet",
@@ -1,5 +1,5 @@
{
"vape_open_low": [
"vapeopen_low": [
{
"type": "icon_state",
"icon_state": "vapeOutlet",
@@ -1,5 +1,5 @@
{
"vape_open_med": [
"vapeopen_med": [
{
"type": "icon_state",
"icon_state": "vapeOutlet",
+6 -6
View File
@@ -1181,13 +1181,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM
to_chat(user, span_notice("You open the cap on [src]."))
reagents.flags |= OPENCONTAINER
if(obj_flags & EMAGGED)
icon_state = "vape_open_high"
icon_state = "vapeopen_high"
set_greyscale(new_config = /datum/greyscale_config/vape/open_high)
else if(super)
icon_state = "vape_open_med"
icon_state = "vapeopen_med"
set_greyscale(new_config = /datum/greyscale_config/vape/open_med)
else
icon_state = "vape_open_low"
icon_state = "vapeopen_low"
set_greyscale(new_config = /datum/greyscale_config/vape/open_low)
else
screw = FALSE
@@ -1202,12 +1202,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(!super)
super = TRUE
to_chat(user, span_notice("You increase the voltage of [src]."))
icon_state = "vape_open_med"
icon_state = "vapeopen_med"
set_greyscale(new_config = /datum/greyscale_config/vape/open_med)
else
super = FALSE
to_chat(user, span_notice("You decrease the voltage of [src]."))
icon_state = "vape_open_low"
icon_state = "vapeopen_low"
set_greyscale(new_config = /datum/greyscale_config/vape/open_low)
if(screw && (obj_flags & EMAGGED))
@@ -1226,7 +1226,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
obj_flags |= EMAGGED
super = FALSE
balloon_alert(user, "voltage maximized")
icon_state = "vape_open_high"
icon_state = "vapeopen_high"
set_greyscale(new_config = /datum/greyscale_config/vape/open_high)
var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread //for effect
sp.set_up(5, 1, src)