Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/RandomZLevels/TheBeach.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2098,7 +2098,7 @@
pixel_x = -8;
pixel_y = -6
},
/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
/obj/item/reagent_containers/cup/soda_cans/circuitcrush{
pixel_x = 15;
pixel_y = -11
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomZLevels/museum.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4061,7 +4061,7 @@
/area/awaymission/museum)
"GB" = (
/obj/structure/table,
/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
/obj/item/reagent_containers/cup/soda_cans/circuitcrush{
pixel_y = 7
},
/turf/open/floor/iron/cafeteria,
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -81318,7 +81318,7 @@
/area/station/command/vault)
"vDM" = (
/obj/structure/table,
/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
/obj/item/reagent_containers/cup/soda_cans/circuitcrush{
pixel_x = 14;
pixel_y = 3
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/Deltastation/DeltaStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -27736,7 +27736,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
/obj/item/reagent_containers/cup/soda_cans/circuitcrush{
pixel_x = -3;
pixel_y = 3
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/KiloStation/KiloStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -57347,7 +57347,7 @@
},
/obj/item/reagent_containers/cup/glass/bottle/beer{
desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death.";
list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko=30);
list_reagents = list(/datum/reagent/consumable/ethanol/circuitcrush=30);
name = "Kilo-Kocktail";
pixel_x = 5;
pixel_y = 5
Expand Down
2 changes: 1 addition & 1 deletion _maps/virtual_domains/island_brawl.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1487,7 +1487,7 @@
pixel_x = -8;
pixel_y = -6
},
/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
/obj/item/reagent_containers/cup/soda_cans/circuitcrush{
pixel_x = 15;
pixel_y = -11
},
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/random/food_or_drink.dm
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 3,
/obj/item/reagent_containers/cup/soda_cans/grey_bull = 3,
/obj/item/reagent_containers/cup/soda_cans/monkey_energy = 2,
/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 2,
/obj/item/reagent_containers/cup/soda_cans/circuitcrush = 2,
/obj/item/reagent_containers/cup/glass/bottle/beer/light = 2,
/obj/item/reagent_containers/cup/soda_cans/shamblers = 1,
/obj/item/reagent_containers/cup/soda_cans/pwr_game = 1,
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/storage/sixpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 15,
/obj/item/reagent_containers/cup/soda_cans/monkey_energy = 15,
/obj/item/reagent_containers/cup/soda_cans/volt_energy = 10,
/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 5,
/obj/item/reagent_containers/cup/soda_cans/circuitcrush = 5,
)

/obj/item/storage/cans/sixgamerdrink/PopulateContents()
Expand All @@ -65,7 +65,7 @@
/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 50,
/obj/item/reagent_containers/cup/soda_cans/monkey_energy = 30,
/obj/item/reagent_containers/cup/soda_cans/volt_energy = 15,
/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 5,
/obj/item/reagent_containers/cup/soda_cans/circuitcrush = 5,
)

/obj/item/storage/cans/sixenergydrink/PopulateContents()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/heretic/items/corrupted_organs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
var/list/extra_ingredients = list(
/datum/reagent/consumable/ethanol/pina_olivada,
/datum/reagent/consumable/ethanol/rum,
/datum/reagent/consumable/ethanol/thirteenloko,
/datum/reagent/consumable/ethanol/circuitcrush,
/datum/reagent/consumable/ethanol/vodka,
/datum/reagent/consumable/superlaughter,
/datum/reagent/drug/bath_salts,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/bounties/reagent.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
/datum/reagent/consumable/ethanol/syndicatebomb,
/datum/reagent/consumable/ethanol/tequila_sunrise,
/datum/reagent/consumable/ethanol/manly_dorf,
/datum/reagent/consumable/ethanol/thirteenloko,
/datum/reagent/consumable/ethanol/circuitcrush,
/datum/reagent/consumable/triple_citrus,
/datum/reagent/consumable/ethanol/vodkamartini,
/datum/reagent/consumable/ethanol/whiskeysoda,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@

/datum/chemical_reaction/drink/hiveminderaser
results = list(/datum/reagent/consumable/ethanol/hiveminderaser = 4)
required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 2, /datum/reagent/consumable/ethanol/thirteenloko = 1, /datum/reagent/consumable/grenadine = 1)
required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 2, /datum/reagent/consumable/ethanol/circuitcrush = 1, /datum/reagent/consumable/grenadine = 1)

/datum/chemical_reaction/drink/manhattan
results = list(/datum/reagent/consumable/ethanol/manhattan = 3)
Expand Down Expand Up @@ -326,8 +326,8 @@
results = list(/datum/reagent/consumable/ethanol/driestmartini = 2)
required_reagents = list(/datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/ethanol/gin = 1)

/datum/chemical_reaction/drink/thirteenloko
results = list(/datum/reagent/consumable/ethanol/thirteenloko = 3)
/datum/chemical_reaction/drink/circuitcrush
results = list(/datum/reagent/consumable/ethanol/circuitcrush = 3)
required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/limejuice = 1)
reaction_tags = REACTION_TAG_DRINK | REACTION_TAG_EASY | REACTION_TAG_OTHER

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@
upgrade_reagents = null
/// The default list of emagged reagents dispensable by the soda dispenser
var/static/list/drink_emagged_reagents = list(
/datum/reagent/consumable/ethanol/thirteenloko,
/datum/reagent/consumable/ethanol/circuitcrush,
/datum/reagent/consumable/ethanol/whiskey_cola,
/datum/reagent/toxin/mindbreaker,
/datum/reagent/toxin/staminatoxin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,34 +227,34 @@
if(SPT_PROB(5, seconds_per_tick))
drinker.adjust_hallucinations(4 SECONDS * metabolization_ratio)

/datum/reagent/consumable/ethanol/thirteenloko
name = "Thirteen Loko"
/datum/reagent/consumable/ethanol/circuitcrush
name = "Circuit Crush"
description = "A potent mixture of caffeine and alcohol."
color = "#102000" // rgb: 16, 32, 0
nutriment_factor = 1
boozepwr = 80
quality = DRINK_GOOD
overdose_threshold = 60
taste_description = "jitters and death"
taste_description = "static and bad decisions"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS
metabolized_traits = list(TRAIT_STIMULATED)

/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio)
/datum/reagent/consumable/ethanol/circuitcrush/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio)
. = ..()
drinker.adjust_drowsiness(-14 SECONDS * metabolization_ratio * seconds_per_tick)
drinker.AdjustSleeping(-4 SECONDS * metabolization_ratio * seconds_per_tick)
drinker.adjust_bodytemperature(-5 * metabolization_ratio * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, drinker.get_body_temp_normal())
if(!HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE))
drinker.set_jitter_if_lower(10 SECONDS)

/datum/reagent/consumable/ethanol/thirteenloko/overdose_start(mob/living/drinker, metabolization_ratio)
/datum/reagent/consumable/ethanol/circuitcrush/overdose_start(mob/living/drinker, metabolization_ratio)
. = ..()
to_chat(drinker, span_userdanger("Your entire body violently jitters as you start to feel queasy. You really shouldn't have drank all of that [name]!"))
drinker.set_jitter_if_lower(40 SECONDS)
drinker.Stun(1.5 SECONDS)

/datum/reagent/consumable/ethanol/thirteenloko/overdose_process(mob/living/drinker, seconds_per_tick, metabolization_ratio)
/datum/reagent/consumable/ethanol/circuitcrush/overdose_process(mob/living/drinker, seconds_per_tick, metabolization_ratio)
. = ..()
if(SPT_PROB(3.5, seconds_per_tick) && iscarbon(drinker))
var/obj/item/held_item = drinker.get_active_held_item()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
name = "glass of candy corn liquor"
desc = "Good for your Imagination."

/datum/glass_style/drinking_glass/thirteenloko
required_drink_type = /datum/reagent/consumable/ethanol/thirteenloko
name = "glass of Thirteen Loko"
desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
/datum/glass_style/drinking_glass/circuitcrush
required_drink_type = /datum/reagent/consumable/ethanol/circuitcrush
name = "glass of Circuit Crush"
desc = "This is a glass of Circuit Crush. The carbonation is aggressive enough to feel personal."
icon_state = "thirteen_loko_glass"

/datum/glass_style/drinking_glass/vodka
Expand Down
8 changes: 4 additions & 4 deletions code/modules/reagents/reagent_containers/cups/soda.dm
Original file line number Diff line number Diff line change
Expand Up @@ -379,11 +379,11 @@
list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30)
drink_type = SUGAR | JUNKFOOD

/obj/item/reagent_containers/cup/soda_cans/thirteenloko
name = "Thirteen Loko"
desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
/obj/item/reagent_containers/cup/soda_cans/circuitcrush
name = "Circuit Crush"
desc = "The CMO has advised crew members that consumption of Circuit Crush may result in seizures, blindness, drunkenness, or even death."
icon_state = "thirteen_loko"
list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30)
list_reagents = list(/datum/reagent/consumable/ethanol/circuitcrush = 30)
drink_type = SUGAR | JUNKFOOD

/obj/item/reagent_containers/cup/soda_cans/dr_gibb
Expand Down
4 changes: 2 additions & 2 deletions code/modules/vending/cola.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/obj/item/reagent_containers/cup/soda_cans/volt_energy = 3,
)
contraband = list(
/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 6,
/obj/item/reagent_containers/cup/soda_cans/circuitcrush = 6,
/obj/item/reagent_containers/cup/soda_cans/shamblers = 6,
/obj/item/reagent_containers/cup/soda_cans/wellcheers = 6,
)
Expand All @@ -44,7 +44,7 @@
/datum/reagent/consumable/ethanol/gin = 5,
/datum/reagent/consumable/ethanol/rum = 5,
// A bit rarer, can be dangerous if you take too much
/datum/reagent/consumable/ethanol/thirteenloko = 3,
/datum/reagent/consumable/ethanol/circuitcrush = 3,
/datum/reagent/consumable/ethanol/absinthe = 3,
/datum/reagent/consumable/ethanol/hooch = 3,
/datum/reagent/consumable/ethanol/moonshine = 3,
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui-dev-server/link/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function serializeObject(obj: Record<string, any>): string {
// Error object
const isError =
value instanceof Error ||
(value.code && value.message && value.message.includes('Error'));
(value.code && value.message?.includes('Error'));
if (isError) {
return {
__error__: true,
Expand Down
4 changes: 2 additions & 2 deletions tgui/packages/tgui/interfaces/AtmosControlConsole.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const AtmosControlConsole = (props) => {
<Section
title={selectedChamber ? selectedChamber.name : 'Chamber Reading'}
buttons={
!!data.reconnecting && (
data.reconnecting && (
<Button
icon="undo"
content="Reconnect"
Expand All @@ -70,7 +70,7 @@ export const AtmosControlConsole = (props) => {
)
}
>
{!!selectedChamber && !!selectedChamber.gasmix ? (
{selectedChamber?.gasmix ? (
<GasmixParser
gasmix={selectedChamber.gasmix}
gasesOnClick={setActiveGasId}
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/Cargo/CargoCart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function CheckoutItems(props) {
<Table.Cell>{entry.object}</Table.Cell>

<Table.Cell width={11}>
{!!can_send && !!entry.can_be_cancelled ? (
{can_send && entry.can_be_cancelled ? (
<>
<Button
icon="minus"
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/Cargo/CargoStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function CargoStatus(props) {
>
<LabeledList>
<LabeledList.Item label="Shuttle">
{!!docked && !requestonly && !!can_send ? (
{docked && !requestonly && can_send ? (
<Button
color={grocery ? 'orange' : 'green'}
tooltip={
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/Flatpacker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const BoardPreview = (props: BoardPreviewProps) => {
icon="cog"
fontSize={1.2}
textAlign="center"
disabled={!design || design.disableReason !== ''}
disabled={design?.disableReason !== ''}
tooltip={design.disableReason}
tooltipPosition="bottom"
onClick={() => onPrint()}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NtosWindow } from '../layouts';
import { useBackend } from '../backend';
import { SeedTable, SeedData, TraitData } from './SeedTable';
import { SeedTable, type SeedData, type TraitData } from './SeedTable';

type Data = {
seeds: SeedData[];
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/NtosRadar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const TargetDisplay = (props) => {
if (!selected || !target) {
return null;
}
if (!Object.keys(target).length && !!selected) {
if (!Object.keys(target).length && selected) {
return (
<NoticeBox
position="absolute"
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/Orbit/OrbitBlade.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function OrbitInfo(props) {
const { name, full_name, health, job } = orbiting;

let department;
if ('job' in orbiting && !!job) {
if ('job' in orbiting && job) {
department = getDepartmentByJob(job);
}

Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/Orbit/OrbitTooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function OrbitTooltip(props: Props) {
}

const extraInfo = extra?.split(':');
const displayHealth = !!health && health >= 0 ? `${health}%` : 'Critical';
const displayHealth = health && health >= 0 ? `${health}%` : 'Critical';
const showAFK = 'client' in item && !item.client;
const displayJob = realNameDisplay ? mind_job : job;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { sortBy } from 'es-toolkit';
import { type PropsWithChildren, type ReactNode, useState } from 'react';
import { useBackend } from 'tgui/backend';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export const ServerPrefs = createContext<ServerData | undefined>({
jobs: {
departments: {},
jobs: {},
jobs_sorted: [],
},
names: {
types: {},
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/PrisonerManagement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ const AllImplantDisplay = (props: { implants: ImplantInfo[] }) => {
</Tabs>
</Stack.Item>
<Stack.Item>
{implantTab && implantsByCategory && implantsByCategory[implantTab] ? (
{implantTab && implantsByCategory?.[implantTab] ? (
implantsByCategory[implantTab].map((implant) => (
<ImplantDisplay key={implant.ref} implant={implant} />
))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const CrimeDisplay = ({ item }: { item: Crime }) => {
const { current_user, higher_access } = data;
const { author, crime_ref, details, fine, name, paid, time, valid, voider } =
item;
const showFine = !!fine && fine > 0 ? `: ${fine} cr` : ': PAID OFF';
const showFine = fine && fine > 0 ? `: ${fine} cr` : ': PAID OFF';

let collapsibleColor = '';
if (!valid) {
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/StationAlertConsole.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const StationAlertConsoleContent = (props) => {
<Stack.Item grow>
<li className="color-average">
{alert.name}{' '}
{!!cameraView && alert.sources > 1
{cameraView && alert.sources > 1
? ` (${alert.sources} sources)`
: ''}
</li>
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/Techweb/nodes/TechNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export function TechNode(props: Props) {
!nocontrols && (
<>
{tier > 0 &&
(!!can_unlock && (is_free || queue_nodes.length === 0) ? (
(can_unlock && (is_free || queue_nodes.length === 0) ? (
<Button
icon="lightbulb"
disabled={!can_unlock || tier > 1 || queue_nodes.length > 0}
Expand Down
Loading