diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 5b7c70b1b6..f338c951e9 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -706,7 +706,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM name = "\improper E-Cigarette" desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\""//<<< i'd vape to that. icon = 'icons/obj/clothing/masks.dmi' - icon_state = null + icon_state = "blaVape" //We cant have a null icon state due to the vendor spritesheet item_state = null w_class = WEIGHT_CLASS_TINY var/chem_volume = 100 @@ -1067,4 +1067,4 @@ CIGARETTE PACKETS ARE IN FANCY.DM name = "coconut bong" icon_off = "coconut_bong" icon_on = "coconut_bong_lit" - desc = "A water bong used for smoking dried plants. This one's made out of a coconut and some bamboo." \ No newline at end of file + desc = "A water bong used for smoking dried plants. This one's made out of a coconut and some bamboo." diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 0b58ea234c..d586811461 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -187,7 +187,7 @@ /obj/item/clothing/head/wig name = "wig" desc = "A bunch of hair without a head attached." - icon_state = "" + icon_state = "pwig" item_state = "pwig" flags_inv = HIDEHAIR var/hair_style = "Very Long Hair" @@ -195,6 +195,7 @@ /obj/item/clothing/head/wig/Initialize(mapload) . = ..() + icon_state = "" //Shitty hack that i dont know if it is even neccesary to deal with the vendor stack exception update_icon() /obj/item/clothing/head/wig/update_icon_state() diff --git a/tgui-next/packages/tgui/interfaces/Vending.js b/tgui-next/packages/tgui/interfaces/Vending.js index ed409f93e8..ab8f180048 100644 --- a/tgui-next/packages/tgui/interfaces/Vending.js +++ b/tgui-next/packages/tgui/interfaces/Vending.js @@ -2,6 +2,7 @@ import { Fragment } from 'inferno'; import { act } from '../byond'; import { Section, Box, Button, Table } from '../components'; import { classes } from 'common/react'; +import { useBackend } from '../backend'; export const Vending = props => { const { state } = props; @@ -26,22 +27,7 @@ export const Vending = props => { } return ( - {data.onstation && ( -
- {data.user && ( - - Welcome, {data.user.name}, - {' '} - {data.user.job || "Unemployed"}! - - ) || ( - - No registered ID card!
- Please contact your local HoP! -
- )} -
- )} + )
{inventory.map((product => { @@ -79,7 +65,7 @@ export const Vending = props => { {custom && (