Damned title doesnt want to show up
This commit is contained in:
@@ -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."
|
||||
desc = "A water bong used for smoking dried plants. This one's made out of a coconut and some bamboo."
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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 (
|
||||
<Fragment>
|
||||
{data.onstation && (
|
||||
<Section title="User">
|
||||
{data.user && (
|
||||
<Box>
|
||||
Welcome, <b>{data.user.name}</b>,
|
||||
{' '}
|
||||
<b>{data.user.job || "Unemployed"}</b>!
|
||||
</Box>
|
||||
) || (
|
||||
<Box color="light-gray">
|
||||
No registered ID card!<br />
|
||||
Please contact your local HoP!
|
||||
</Box>
|
||||
)}
|
||||
</Section>
|
||||
)}
|
||||
)
|
||||
<Section title="Products" >
|
||||
<Table>
|
||||
{inventory.map((product => {
|
||||
@@ -79,7 +65,7 @@ export const Vending = props => {
|
||||
<Table.Cell>
|
||||
{custom && (
|
||||
<Button
|
||||
content={"VEND"}
|
||||
content={"Vend"}
|
||||
onClick={() => act(ref, 'dispense', {
|
||||
'item': product.name,
|
||||
})} />
|
||||
@@ -88,7 +74,7 @@ export const Vending = props => {
|
||||
disabled={(
|
||||
data.stock[product.namename] === 0
|
||||
)}
|
||||
content={"VEND"}
|
||||
content={"Vend"}
|
||||
onClick={() => act(ref, 'vend', {
|
||||
'ref': product.ref,
|
||||
})} />
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user