Commit Graph

2662 Commits

Author SHA1 Message Date
GDN
82b863cefd Converts over the missing TGUI input lists (#23859)
* Converts over the missing TGUI input lists

* last fixes

* num revert
2024-02-14 21:17:29 +00:00
GDN
13a2630028 Removes comparisons to true and false (#24083)
* Removes comparisons to true and false

* Update .github/CONTRIBUTING.md

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-02-14 19:45:37 +00:00
Qwertytoforty
c398e4a617 Adds 2 cybernetic implants, makes emag_act return TRUE (#23876)
* Adds 2 cybernetic implants, makes emag_act return TRUE

* the rest of the fucking owl

* yeah that would do it

* remove this

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* request changes, scaling burn damage, 3 tile range, lowers tech level

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/objects/structures/crates_lockers/crates.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update scanners.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Lewcs good to them?

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* fuck me

* there are no message admins in ba-sing

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-02-08 12:52:11 +00:00
matttheficus
f71d19b222 Removes Something LRP From Code (Literally 1984) (#24043)
* actually 1984

* radio still funny
2024-02-06 18:22:52 +00:00
Qwertytoforty
5dd3f7fb79 stimulants now use stun absorb, flashes no longer makes stun immune people drop items (#23850)
* stimulants now use stun absorb, flashes no longer makes stun immune people drop items

* whoops need this

* and this

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-02-04 21:45:40 +00:00
HMBGERDO
ecc109915a Stamina damage no longer bypass some checks (#23447)
* adjusting stamina damage no longer bypass some checks

* no illness changes

* i surrender on this, let it be
2024-02-04 21:15:20 +00:00
firstghost
c2d3489869 Spray bottle to autolathe (#23725)
* Spray bottle to autolathe

* Update code/modules/research/designs/autolathe_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update spray.dm

* Update autolathe_designs.dm

* Increase spray bottle cost

2000 metal and 5000 glass

* Add plastic variant recipe

6 sheets

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-01-30 14:42:07 +00:00
DGamerL
b254aa18c0 Makes the reagent grinder shake (#23823)
* Easy

* Slight speed tweaks

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-01-29 18:39:55 -05:00
HMBGERDO
80f1b0d113 Extinguisher and spray bottle works on tile you're standing fix (#23914)
* extinguisher once again works on yourself

* you too
2024-01-28 13:27:03 +00:00
DGamerL
79a7558df7 Revives Organ Datumization (#23397)
* first runthrough lol

* okay make this shit actually work

* nerfs slime people

* fixes

* more changes

* fix

* bim bim bam bam

* ok back in the head becuz i dont give a shit

* Sirryan review

* Sirryan review

* Fixes CI

* Stealthy CI fail

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-01-21 22:23:51 +00:00
GDN
0b8c196f67 tgchat day zero changes (#23872)
* tgchat day zero changes

* Update code/game/verbs/ooc.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-21 22:07:57 +00:00
Varelion
8dcc2f4cdf Soda Dispenser Content, Pineapple Juice & Cream (#23777)
* Create reagent vomicilin

* Update vomicilin

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Updating as suggested.

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Revert vomicilin

* Revert vomicilin

* Revert vomicilin

* Add the ability to create droppers from glass

* Add clone memory disorder

* Add pineapple juice and cream  to soda dispenser, remove carrot juice and potato juice

* Revert dropper change

* Revert clone memory loss

* Revert bartender table jump change

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-01-21 21:15:49 +00:00
HMBGERDO
b4c52d70da i ded pls nerf: Combat Beakers (#23708)
* reagent splash now different from touch

* arghhghghg

* hghg

* FUCK THE BOTANY OORAH

* only botany smoke affected

* Update code/modules/reagents/chemistry/reagents/drugs.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/pyrotechnic.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* removing REAGENT_SPLASH, cleaning up

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-01-21 21:12:33 +00:00
Contrabang
5b6329ed25 Fire extinguishers and sprays only hit a tile once. (#23568)
* lmaoooo lol even

* yippee

* DGamerL review

* oops

* sirryan review
2024-01-21 20:44:50 +00:00
DGamerL
ab3992dec8 Refactors some reagent sacid/facid code (#23566)
* I hate if statements

* This would've been bad

* Oops, this could've also been bad

* Masks now properly protect again

* Slight amounts of damage in low volumes for sacid

* Accidental balance change

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Lewc review

* Update code/modules/reagents/chemistry/reagents/toxins.dm

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-01-21 20:44:27 +00:00
DGamerL
db578cdc6f Makes food not a subtype of reagent holders (#23379)
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-21 19:00:02 +00:00
S34N
22fbd9aced TGUIv4 - Core backend updates, TGchat, Asset cache updates (#23726)
* TGUI upgrade project: Port initial TGUI 4.0 changes from TG (#23440)

* tgui4.0

* bugfix for un-interaction

* fix for input not resetting on close

* NTOS restore

* fix all interfaces having scrollbars, fix colours

* bundle update

* dep bumps

* bumps the deps as much as possible

* button regression fix

* TGUI test map rev 1

* fix theme and some component regression

* fix login screen regression

* fixes regression with uplink cart

* bundle

* fix regressions

* fix the input issue, again

* regression fixes, stylesheet edition, hash restore

* fixes GPS BSOD

* draggable control regression

* dev server dep regression

* byondUI regression fix

* section regression fix

* fix secure storage weirdness

* Fixed mining vendor scrolling

* Arthri review pass 1

* mining vendor double-scroll

* fix for RPD, AirAlarm, and Radio

* arthri review pass 2

* arthri review pass 3

* sanitize var setting, fix colours, delete unused file

* adds CI to branch

* god damn AI making random changes

* I should remember to compile when changes are made

* fixes scrollbar issues

* fix camera console, fix flexGrow for sections

* CI fix

* nanomap fix

* Update code/modules/atmospherics/machinery/airalarm.dm

* restore margin

* style semicolon

* TGUIv4 - Moves TGUI Window Sizing from DM to JS (#23524)

* Initial commit

* Transferring the remaining windows to JS

* Resizing part 1

* Resizing part 2

* Some reverts and polish

* Forgot that

* undeployed nuke window size

---------

Co-authored-by: Aylong <alexanderkitsa@gmail.com>

* TGUIv4: Remove force_open (#23537)

* First state fixes

* Removes "force_open"

* TGUIv4 - TGUI Version 4.1 (#23547)

* Reduced Logging Changes

* setSharedState early return for non-interactive UI

* TGUI version bump to 4.1

* Fix sending updates for non-interactive UIs

* Scalablue UI Stylesheet Changes

* CSS Tgui Bundle

* JavaScript TGUI Style Changes

* Update tgui/packages/tgui/styles/base.scss

Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>

* Additional changes to Input and Button scalability

* TGUI logging proc update

* Indentation fix for logging proc

* Update code/__HELPERS/_logging.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Additional log_tgui changes

---------

Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* dev server hotfix (#23584)

* ui_interact object constructor argument check (#23594)

* feat: add smart asset cache, add CDN support for assets, properly group assets (#23585)

* feat: add smart asset cache, add CDN support for assets, properly group assets

* fix: make tgui actually work

* fix: keeping local name for `tgui.bundle.js` and `tgui.bundle.css` for debug and dev server functioning

* fix: make `fontawesome` assets finally work

* fix: make proper identation for `if`

* fix: add `resolveAsset` to `NanoMap.js`

* refactor: update `claw_game` and `chess` to new asset framework

* refactor/tweak: don't use string concatenation for browser `content` and `head_content`, use list instead. Don't use `common.css` for paper UI, keep local name for stamp image assets, replace hard ref of browser to `atom` (rare case) to `UID`

* refactor: remove redundant debug logs

* refactor: remove space betwee `if` and `(`

* refactor: remove one more redundant log, properly reload UI resources

* rafactor: change names of asset files

* fix: adjust existing UIs to properly use assets

* fix: properly pass args to to `onclose` proc

* Update code/modules/asset_cache/transports/asset_transport.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/modules/asset_cache/transports/asset_transport.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* TGUI 4.2: TGchat + Refactor Asset Delivery + Yarn Berry (#23643)

* tgchat

* Little cleanup

* Refactor Asset Delivery (Part 2)

* Little tweaks

* fix code styling issues

* fix file name duplications

* Browser window options fix @gaxeer

* transfer valve fixes

* yarn berry initial

* vsc tasks

* yarn berry working

* node 20

* fix dev server (lol wrong yarn)

* bloody regressions

* fixes that damn scrolltracking bug

* Some tweaks and flexGrow deletions

It still doesn't work as it should, which makes me nervous

* remove unneeded deps

* 514 regression fix

* change stuff to not conflict with other servers

* name it as requested

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* revert test_TGUI map addition

* TGUI 4.3: Stack, Webpack 5 & UI Tweaks, Yarn 3.6.4, TS support, Jest (#23677)

* Stack & UI's Refactor

Almost final, polish required

Stack & UI's Refactor (Part 1)

Stack & UI's Refactor (Part 2)

Stack & UI's Refactor (Part 3)

* Prettier

Maybe bad

* ClearChat & some tweaks

* Adds a Chat Reliability Layer https://github.com/tgstation/tgstation/pull/79479

* Fix chat BSOD

https://github.com/tgstation/tgstation/pull/79821

* WebPack 5 (Didn't work)

I hate this shit

* Yarn 3.6.4

* make it all work

* revert snowflake fix

* Stories

* adds TS support

* re-enable test and prettier

* update yarn sdk's

* Fix some box regression

* ping/reply

* Fixes regressions and some things

* Zebra and Fix chat button transfer

+rebuild

* make VSC use the proper local typescript lib

* Popper Tooltips https://github.com/tgstation/tgstation/pull/58980

* Popper Tooltips performancy fixes

* Dropdown v2 https://github.com/tgstation/tgstation/pull/75164

Without Icon.tsx

* BB test map

* run build

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* we moved these

* change test values

* ignore scss files

* change hash function

* TGUIv4: TGchat fix traitor codeword highlighting (#23720)

* Codeword highlighting for TGUIv4

* null safeties

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* TGUIv4 - updates standalone build tooling (#23721)

* swap `xxhash64` for `md4`

* remove hash function

* remove old file

* TGUI 4.3+4.4: Newscaster fix, `inline-block` replacements and other fixes (#23722)

* TGUI 4.3 fixes

Newscaster fix + inline-blocks

* Be gone Box

* Mod Chat -> Mentor Chat

* Some warning filters

* Rebuild

* Delete tgui-common.bundle.js

* please work

* try it like this

* 4.3.1

* 4.3.2

* fix

* i forgot to build

* 4.4.0

* give me more diff details please so I can fix you

* its not binary pls git

* test without svgs

* removes an un-needed SVG file

* inlined SVGs test

* fix code styling

* comment these

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* TGUIv4 - Removes resizable and improves drag code (#23719)

* Initial commit

* bundle rebuild

* Fixes Radio Sizing

* Updates Radio sizing to fix wrapping issues

* fix dev server

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* fix hotkeys not being passed to BYOND

* Apply suggestions from code review

* bump deps

* forgot these deps

* ci fix

* ChemDispenser fixes and HoloControl cooldown

* Station Traits TGUI

+Rebuild

* CI

* fix CI for real this time

* I have no idea

* fix station trait panel

* Update code/controllers/subsystem/SSping.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/controllers/subsystem/SSticker.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/controllers/subsystem/SSping.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* deterministic module IDs

* TGUI fixes. Again... (#23762)

* TGUI Fixes: Part 1

ORM icon for reinforced glass now showing correctly

Mining vendor moved to Stack

Exofab UI buttons descended from the heavens to the earth

* TGUI Fixes: Part 2

DestTagger now works, forgot import LabeledList

PowerMonitor graph displays correct

Request Console updated to 2.0, BUT, problem with message priority, it was there before the changes, maybe even before the project, I'll have to check it out

* TGUI Fixes: Part 2

Fixed `onEnter` input

Fixed Cloning Console storage (Im dumbass)

Some windows resizing

Fixed bad picture in security and medical records console

Fixed scrollable dropdown

Added translucent color for buttons

* Fucking uplink DONE, and Button.Input fix

* NT Recruiter and Uplink polish

* Del LabeledList from dest. tagger

* ChemMaster and OreRedemption log deletion

* Update test_tiny.dmm

* Translucent button story

* Filter for SQL error

* del: `log_debug` in `hear_say.dm`

* Some little fixes and SpecMenu Stack

* Panel.js: mx -> mr

* fix ghost spawners

* null check

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* fix material name in protolathe

* fix various UI interacts

* card machine runtime fix

* remove legacy folders

* TGUIv4 - TGchat Theme Adjustments (#23772)

* Initial commit

* Changes rule grouping

* Robot class style changes and webpack config

* Reverts webpack/font changes and subs robot font

* revert a state changed in error

* fix uninteractable UIs due to chunky fingers

* TGUIv4: More fixes, tweaks and fixes for tweaks (#23781)

* I fuckin hate PDA

* Vending

* Add `|` to highlight splitters and some light mode tweaks

* Teleporter rewrite

* APC and AiAirlock (God forgive me)

* clarify highlight syntax

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* TGUIv4 - Abductor Experiment Machine TGUI (#23776)

* Experiment Console TGUI

* Update for TGUIv4

* UI Size adjustment

* ui state and ghost attack update

* remove this

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* fix

* TGUIv4 - Adjustments, Fixes, and Tweaks (#23785)

* Photocopier layout adjustments

* Autolathe Text and Button spacing adjustment

* Hotkey fix for moving bug

* Removes rule sets for visited links

* Fixes ordering multiples on cargo console

* fix possible wonky json payloads

* fix admin log input list stuff

* TGUIv4: Reconnect fix and some other fixes + tweaks (#23790)

* Fix reconnecting and transfer it to TSX

* RPD polish

* RCD, AccessList, GuestPass

* Focus reset fix when camera switched. God forgive me again...

* Purple box and identation fixes

For votes and health scanner

* ChemMaster and ChemDispenser

ChemMaster - translucent pills buttons and no grow produce section
ChemDuspenser - dynamic height

* ShuttleManipulator Tabs

* RCD buttons

* make input bar mode more prominent

* fix chem master icons

* tab fix

* Properly sanitizes loaded messages in tgui chat

* TGUIv4 - Adjustments, Fixes, and Tweaks v2 (#23795)

* Fixes icon spacing for nanobank tabs

* Tweaks Dropdown styling

* Fixes sending stuff to old chat

* OpenDream TGUI fix

* Resizes Station Traits window

* Adjusts health analyzer messages for chat tabs

* Revert "Properly sanitizes loaded messages in tgui chat"

This reverts commit 4c32a7094a.

* Revert "Revert "Properly sanitizes loaded messages in tgui chat""

This reverts commit 24afa55922.

* Changes how tgui handles static data

* Reenable no-undef rule. Enable Format On Save for VSCode (#23803)

* Enable Format On Save for VSCode

* Re-enable and fix no-undef

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>

* pda scanner message improvements

* fix mentor/admin PMs being sent to the "unsorted" category

* fix garbled custom vote messages

* moves cyborg analyser to use chatboxes

* fixes regression

* Prevent F5 reload

* TGUIv4: Themes polish and some new ones + misc fixes (#23814)

* Little themes tweaks

* NTOS chat theme

* Update tgui-panel.bundle.js

* Capitalize themes

* Paradise theme v1.0

* Little StationTraitsPanel cleanup

* Update member_content.dmi

* NoCapitalize

* Rebuild

* Delete Paradise.scss

* Create paradise.scss

* Forgot

* Rewritten Security Records Console

For Jesus fucking christ...

* Vending and Wires sizes tweaks

* ThermoMachine

* Syndicate Theme

* Little darker

* Rewritten Medical Records Console

* PDA Nanobank fix

* Syndicate Theme Darker

* Rebuild TGUI

* Wires section grow fix

* fixes the enshittified paradise icon

* Sirryan+Warrior reviews

* bloody define comments

* comment correction

* unprivate these

* errant . begone (how did this not cause a compiler error)

* TGUIv4 - Adjustments, Fixes, and Tweaks v3 (#23807)

* Fixes ERT Manager silenced message function

* Adjusts progress bar on ExosuitFabricator

* Sets Dropdown selected to align left

* Removes the use of self_state select interfaces

* Exosuit Fabricator style adjustments

* fix sextractor UI

* remove empty tochat string

* fix human air alarm interactions

* fix modals

* add F12/IEChooser

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Aylong <alexanderkitsa@gmail.com>
Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
2024-01-21 19:20:35 +01:00
HelmsDeepState
bcceb23560 Fixes IPC drinking jestosterone (#23517)
* fix

* cleanup

* revert changes

* another cleanup

* reagents_holder runtime fix

* ci
2024-01-09 12:49:19 +00:00
Octus
c64b93e8bd lol lmao even (#23738) 2024-01-08 15:38:05 -08:00
DGamerL
1a29419228 Test time (#23734) 2024-01-06 23:18:23 +00:00
Octus
0952977020 mhm (#23642) 2024-01-06 21:51:06 +00:00
Qwertytoforty
150d73648c remind me never to add a food item again (#23607) 2024-01-06 21:47:44 +00:00
DGamerL
20ec46b0ca At least this was caught now (#23563) 2023-12-26 13:26:27 -05:00
Nathan Winters
69da720b20 Fixes pills and patches displaying a fake transfer rate (#23539)
* Fix patches not preserving chem temperature

* Remove some leftover same-as-parent property assignments from pills

* Fix pills/patches showing their nonexistent transfer rate

* Revert "Fix patches not preserving chem temperature"

This reverts commit 8905280613.
2023-12-16 16:15:47 +00:00
Arthri
9c0f8bcb6f Fix patches' placeholder names missing units (#23538)
* Fix patch no longer printing units in default name

* Pills/patches show transfer the contained amount

* Hide pill/patch transfer rates

* Revert "Hide pill/patch transfer rates"

This reverts commit ad0edcfa1b and f27ffe64f0

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
2023-12-16 16:15:01 +00:00
Contrabang
09dd7309ad Lava is no longer a plating + all lava is smooth (#23482)
* woohoo

* sirryan review

* accept incoming and stuff

* fuck
2023-12-16 11:47:44 +00:00
Sheep
ec85e888e6 add trait for 'gunpoint,' swap guns over to new trait. (#23494)
add pointy banana, among other non-gun pointies.

Co-authored-by: Scribble-Sheep <15377810-AlyxisDrayko@users.noreply.gitlab.com>
2023-12-12 20:29:04 +00:00
Arthri
08b071ba41 Restructure Chemical ChemMaster (#22992)
* Fixate size of production section in chemmaster

* Tab infrastructure + pill tab

* Definitions for patches and bottles

* Implement pill creation

* Allow pill name to be set to empty

* Fix oversight. Patches allow 20 at a time, not 10

* Fix flexGrow=0 causing weird sizing

* Make pill buttons slightly larger

* Make ChemMaster bigger vertically

* Propagate onFocus and onBlur in Input component

* Use bind to existing 'change' event instead of reimplementing

* Revert "Use bind to existing 'change' event instead of reimplementing"

This reverts commit 786ddea223fef701e8517f230cb8cbf29dab15da.

* Revert "Propagate onFocus and onBlur in Input component"

This reverts commit 88f0ec89c84af7563b758d44e649404919ea8e62.

* Fill in placeholder name on middle click

* Move pill style buttons to collapsible

* Factor out common code

* Fix naming inconsistency

* Add max bottles and patches to data

* Define children and fix error

* Implement patches

* Implement bottles

* Revert back to labels instead of collapsibles

* Send placeholder names separately

* Make bottle style buttons look better

* Fix bottle sprites

* Deconstruct instead of directly access pillsprite

* Tweak quantity slider pixel scaling

* Fix bottle style selection

* Bottles are not pills

* Use defined maximum production amounts

* Always broadcast placeholders

* Refactor out style button

* Purge dead code

* Fix variable name mismatches

* Remove unused variable

* Set minimum height for buffer and beaker section to 100px

* Allow configuration of icon's style in Button component

* Implement container customization

* Move order of defines for consistency

* Fix name check inconsistency

* Update bundle

* Style Fixes

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Remove space between if and opening parenthesis

* Allow setting tab switching without a beaker

* Allow container customization without a beaker

* allow preferences customization without a beaker

* Always show production tabs

* Only send placeholder names if buffer is not empty

* Prettier format

* remove stepPixelSize

[ci skip]

* Build and update tgui

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Use ui.user instead of usr

* Sanitize names

* Rename params

* [ci skip]

* Build and update tgui

* Rename create medicine variable `name` to `medicine_name`

* Use define instead of constant

* Move static data to ui_static_data

* [ci skip]

* Build and update tgui

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: tgui <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-12-11 12:41:20 +00:00
DGamerL
1927a4c76e Fixes patches and pills not being grindable, and fixes a runtime with xenos (#23430)
* Ezpz

* Kras Review

* Whoops
2023-12-09 19:27:26 -06:00
DGamerL
db52d9631f [s] Fixes a small oversight (#23480)
* Easy

* Fuck
2023-12-06 08:58:58 -05:00
Luc
d286d20467 Adds an overdose to diphenhydramine (#23263)
* adds overdose to diphenhydramine

* more hallucinations

* better hallucination checks

* Remove the copypasted effect

* you saw nothing

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-11-29 18:38:06 +00:00
RomainzZ
83fa92a877 Lid for a bucket (#23351)
* Lid for a bucket and anchor water tanks

* No more anchored water tank
2023-11-29 12:17:34 -05:00
Cocacolagua
4b3a720d96 Removes boxes from the uplink PART 1 (#23189)
* removes boxes part 1

* shorter desc for nano injector

* yeahsure1

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* yeahsure2

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* yeahsure3

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* ok no more kit

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-24 15:33:25 +00:00
DGamerL
307120e7d3 Patches and pills are now no longer subtypes of food (#23063)
* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

* Update code/modules/mob/living/carbon/carbon.dm

* Update code/modules/mob/living/carbon/carbon.dm

* Some missed patches

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

* Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/patch.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/carbon.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-21 15:37:16 +00:00
Adrer
39005bea2b Fixes machine using power from the area it was created in, rather than using the area it is in (#23188)
* Update machine area when power_change() is called.

* Do not attempt to unregister from null powernet

* Move to wrench and update wrench_acts

* Remove accidental pseudocode

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-20 14:10:23 -05:00
Contrabang
48d7b00a0d CI now bans the use of weird spacing in conditionals (#22777)
* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* fuck

* bah

* Update tools/ci/check_grep2.py

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-12 20:59:43 +00:00
GDN
35754c77ea Verb cleanup (#22224)
* Verb cleanup

* rest of the object verbs

* little more object cleanup

* more changes

* last of it

* this too

* tgui

* code review

* time to go
2023-11-12 20:19:17 +00:00
DGamerL
635dd52d1a Whoopsie (#23180) 2023-11-06 21:09:54 -05:00
Arthri
279071ab91 Make Syringe Guns shoot Syringes in Inject mode (#23088)
* Automatically set launched syringes to inject

* Implement for normal syringe guns too

* Put mech syringe back to draw mode if emptied when shot

* Use syringe's defines

* Move defines

* update paradise.dme

* Add comment for defines

* do not set RSG syringes to inject

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
2023-11-03 11:08:38 +00:00
Nathan Winters
b8e98144c6 Tones down the demand for Ash (#22923)
* Make oil fireflash depend on remaining empty space

* Split feedback message

* Update oil fireflash size scaling

* Slightly buff oil -> ash production

* Clarify feedback messages

* Make violent oil fireflashes not produce ash

* Make charcoal recipe require less ash

* Violence begone
2023-11-01 20:15:48 +00:00
JimKil3
233cc473fe Toilet water changes (#23080)
* hgcvhgfcjtfckhc

* Update code/modules/reagents/chemistry/reagents/water.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* never make me balance team please

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-31 18:37:43 +00:00
Daniel Lenrd
0c383028b6 Allows chemistry beaker swapping (#22915)
* Added Beaker Swapping

* Moving repeated code

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Moving repeated code 2

* Updated text to be "inside" rather that "on top"

* proper grammar

* removes excitement for placing a beaker

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-26 10:33:16 +01:00
Adrer
223cd99fd2 Reagent Grinder TGUI (#22645)
* Reagent Grinder TGUI

* Update tgui/packages/tgui/interfaces/ReagentGrinder.js

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update tgui/packages/tgui/interfaces/ReagentGrinder.js

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update tgui/packages/tgui/interfaces/ReagentGrinder.js

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Requested changes

* Fixed import issues

* Added operating component to KitchenMachine.js

* Remember to push the bundle

* Update tgui/packages/tgui/interfaces/ReagentGrinder.js

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Biogenerator processing change

* Updated bundle

* Fixes biogenerator processing

* Update tgui/packages/tgui/interfaces/KitchenMachine.js

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update tgui/packages/tgui/interfaces/KitchenMachine.js

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update tgui/packages/tgui/interfaces/KitchenMachine.js

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Use config over sending name along with data

* Ran prettier

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Updated description on Operating

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Missing parenthesis

* Missing parenthesis

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-26 10:31:04 +01:00
GDN
53589e559c fixes an omni od runtime (#23016) 2023-10-24 22:15:55 +02:00
SchrodingersWolf
a5a298a451 Changes what reagents are allowed within normal Hyposprays (#22918)
* And that is how I lost my Medical license

* Lavaland my beloathed
2023-10-20 20:13:13 +01:00
Adrer
90a5913cdc Mugwort now also heals IPC wizards (#22879)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-10-20 20:11:17 +01:00
DGamerL
1a5cdeafd1 Buffs the chem heater (#22676)
* Done!

* Comment

* Almost forgot these!

* Snowball review

* Oops

* Snowball review pt.2

* Adds support for no target temp

* Snowball review

* Snowball review

* Update code/modules/reagents/chemistry/reagents_holder.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Increases the amount of heating

* Update code/modules/reagents/chemistry/reagents_holder.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-10-14 20:39:01 +02:00
Brillcrafter
95529bc88e Beaker description automatic updates (#22826)
* fixed issue with containers

* whoops

* fixed runtimes on hood, typo in medical designs

* made beaker description update with var edits

* left change from another PR in this

* removed things from other PRs

* causes double examine, bad

* added more detail to the beaker descriptions

if this is a bit too much I will tone it back

* better descriptions for beakers

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* little bit of world building

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* more worldbuilding the better

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* on second thought, this is a better description

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-13 14:26:54 +01:00
Adrer
ee95520a76 Lazarus reagent no longer necrotizes robotic organs (#22812)
* Lazarus reagent no longer necrotizes robotic organs

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2023-10-13 14:25:01 +01:00
Qwertytoforty
169fe09d57 make surge better / surge and crank no longer boil people and perma confuse (#22785) 2023-10-13 14:23:34 +01:00