87 Commits
Author SHA1 Message Date
KashargulandGitHub 55a3daa81d bunch of issues (#17900)
* bunch of issues

* .

* fix those properly

* safety else none at all

* .

* workaround for a byond bug

* .

* invis robot weapons

* light needs to be reset

* .

* use proper datums

* fix sorting here

* only store non vital

* .

* Update organ_external.dm
2025-06-25 23:39:44 -07:00
0f40ad6416 Faltered & Dormant diseases update (#17720)
* syringes

* *cough

* .

* .

* Makes linters happy

* Stares at the unit tests

* Oops

* typo

* Disease Carrier trait

* Virus Immunity trait

* No dormant disease trait

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-05-30 15:23:46 -07:00
c213dbcd21 Reagent Addictions (#17498)
* Addictions

* improvements to addiction code

* some small revamps

* some polishing to reagent code

* some more fixes

* wiki updated for addiction

* proper addiction sync on respawn

* final cleanup, config

* coffee handle addiction proc

* fixed global var

* Addictions and

Gives alcohol special effects
Disables the harder addictions
Gives nicotine an a special effect

* remove >0

* safety

* Update medicine.dm

* Update medicine.dm

* Update food_drinks.dm

* update lazydefines

* disable alcohol addiction on virgo

* use lazylen, proper addiction end messages

* cure message bugfix

* use right args

* proper macro

---------

Co-authored-by: C.L. <killer65311@gmail.com>
2025-05-15 10:57:41 -07:00
640cab345e Virology Update #3 (#17227)
* Base stuff

* Thresholds

* Cockroaches, adjustments

* Extrapolator + TGUI Update

* Adjustments

* Updoot

* Revert "Updoot"

This reverts commit 8c27a2525e.

* Gwuh

* test

* heals

* Genetic

* Holder and vomit

* Indents

* Compilable :)

* Various fixes

* Updates Symptoms

* Genevirus

* Neutered Symptoms

* Adjustments

* rads

* Extra symptoms

* Extra extra symptoms

* Adjustments, fixes, more symptoms

* Powder that makes the linter green

* Finishing touches?

* Fixup maps in TGM format

5041170ae1: maps/expedition_vr/beach/submaps/quarantineshuttle.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* Last bits

* Defines

* Oxy heal

* I crave the green check

* fix

* Maps

* Macrophages to turf

* Fimxes

* Fixes :)

* Vomit

* Preset

* Fire desc

* SPELLING MISTAKE

* Extra stuffs

* types

Allows infecting children of a type

* feet

paws?

* fix

* Fixes

* Update

* Flags

* Update _disease.dm

* Infinite blood glitch (100% real)

* virus data properly carries over

* GODSPEED, KELENIUS

YOUR 10 YEAR TODO IS FINALLY DONE

* define

* U2

* Implicit

* Damn it Fleming

* oops

linter is kill

* Update _reagents.dm

* Extra check

* .

* ough

* fixes

* Small changes

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-04-21 06:12:15 -04:00
c42610c5ae Have you bingled that (#17407)
* Initial wiki system

* wiki organization and spoilers

* hide belly chems

* move ads to tgui

* add search

* .

* load screen

* error screen

* 8

* center

* .

* .

* make this more realistic

* tgui errro col

* move search to top

* .

* non NT theme

* logo to common

* base custom theme

* .

* wip refactor

* almost halfway

* reworked wiki data

* easy fix

* get data fix

* Material Page in tgui

* catch null supply points

* .

* forward crash

* reset pages

* .

* canvas prep

* fix icon stacking

* .

* colored outlined images

* fix sm datum

* fix material names

* subType prep

* only on crash

* fix null crash

* .

* fix solgov

* clean hiding

* .

* implement catalog page

* .

* particle smasher page

* I'm lazy

* unfuck some sins

* ore page

* botany page

* allergen list

* allergen returns null too

* slime injection var

* slime core data

* fixed warning

* wip

* proper data list for chems

* pass is_slime as null

* chems

* split that

* .

* .

* .

* .

* donation for bingle, some cleanup

* return types

* partially colord icons for chemistry

* .

* more sillies

* donation page

* thaler

* needs some variation

* .

* this will crash until implemented

* handle it

* fix that

* dismiss donation banner button

* .

* fix that

* donating procs

* donation stuff for comp

* -

* drink glass for drinks

* illegal iconstate pass

* fixes

* .

* nuke drink fix

* .

* .

* .

* Drink reagent fix

* more cleanup

* adjust

* .

* simple food

* .

* food list

* sending nulls, removed flavor from recipes

* .

* .

* get_donation_current added

* .

* missing key

* .

* duped recipes fixed

* .

* .

* wiki food reagent recipes

* double list add

* properly forbid remaining bad reagent

* hide this too

* stacky

* enable eslint const

* fix typing

* update that

* use proper donation proc

* printing fixes

* grinding

* .

* beaker fill volume

* plant ore and mat grinding results

* duped recipes fixed, unit test tweak

* yes this is terrible

* .

* .

* .

* chem analyzer tgui mode, some subsystem changes to support it

* redoce

* .

* ,

* .

* small fixes, missing reagent volume

* push

* sort

* catalog entries unlocked by explo

* new chem stuff

* .

* fix byond code

* fix scroll tracking

* comment

* alphabetical

* also this

* .

* fallback icon

* .

* ...

* rel path

* that too

* to defines

* organ to define

* .

* .

* .

---------

Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-03-28 19:00:50 +01:00
e31df5e920 Recipie conflict unit test + Chemanalyzer PRO (#17270)
* conflict test

* crash fix

* test bad chem

* tweaked

* is this even working

* what?

* is this broken?

* test fix

* force reactions

* Another attempt

* oop

* another

* oop

* actual check

* inverted

* distilling pain

* backward

* attempting again

* slime rules

* wrong path

* fix for slime

* no test chem

* oops lol

* inhibitor test

* var

* another fix

* what is going on

* oh that's how that works

* this?

* again...

* better inhibitors

* fixed order

* clear beaker

* lets try this, plus cleanup

* comments

* another test

* fix

* stale ref?

* more logs

* round and round

* keycheck

* reverse lookup lists

* chemanalyzer update

* addiction code commented out

* span cleanup, downstream code commented out

* debug cleanup

* reaction fixing

* reduced scale again

* another wrapper

* more info in test

* document reagents

* scaling dynamic

* check single inhibitors too

* oop

* using unittest data signal

* fixes

* this is still needed

* broken reactions, and bad id reactions

* oops

* this too actually

* single chems are illegal

* validity on lists

* oops again

* invalid key check, fixed invalid reactions

* test remove

* pretty chat messages

* spanred

* slimecore results

* grinding unit test and grinding results in chem analyzer

* ore check

* fluid pump info

* correct id

* enforce id case

* compliance

* it makes no sense that this machine gives no feedback that you need to reanchor it after construction

* lets not unseal either

* display chems produced

* notify players of belly liquids, as they do not react with anything

---------

Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-03-21 04:36:06 -04:00
KashargulandGitHub 77ac89b2e6 move the from belly (#17386)
* move the from belly

* reactions

* attempt two

* this really needs testing

* .

* clean that up

* also fix that

* make it clear

* .

* .
2025-03-20 15:24:03 +01:00
c8aff28c5b space cleanup (#17300)
* space cleanup

* this

* this too

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-03-14 06:37:13 -04:00
KashargulandGitHub 1def015bad end of file Fix (#17308)
* end of file Fix

* fix those lints too
2025-03-10 16:15:35 -04:00
b949f63d27 Reagent unit testing (#17080)
* initial port

* first ignore batch

* second exclusions

* Tequila fix

* Fixes Changeling Sting

* Virgin Mojito fix

* fixes Love Potion

* Rest of love potion

* Various fixes

* tweaks to unit test

* fix for decl

* get decl properly

* fixie

* put the box back

* tequila fix

* fixes tequila

* check dispenser carts too

* name not id

---------

Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2025-02-13 23:12:48 +01:00
KashargulandGitHub c31886151f few more defines (#16765) 2024-12-28 09:42:44 +10:00
KashargulandGitHub 365b4fbf2a oups small mistake (#16737)
* oups small mistake

* one more

* fix turf tracking
2024-12-21 22:14:52 +01:00
KashargulandGitHub 3083f0b730 Adds a new ghost vis blocking area flag (#16696)
* Adds a new ghost vis blocking area flag

* .

* .

* .

* .

* .,

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* some more

* add admin verbs to add and remove areas

* .
2024-12-16 10:02:07 +10:00
Kashargul 8d6bf161a8 cleanup the last 2024-12-08 20:54:28 +01:00
Kashargul 4e7742e3c8 food.dm 2024-12-08 04:26:19 +01:00
Kashargul e9550345d2 half of the food and drinks 2024-12-08 01:14:10 +01:00
Kashargul 1d8d5b34b5 medicine.dm 2024-12-07 02:10:10 +01:00
Kashargul a12a4d2d5e toxins.dm 2024-12-07 01:03:25 +01:00
Kashargul 2bd0f9c14d other.dm 2024-12-07 00:12:42 +01:00
Kashargul 0b303a3ae5 bunch of fixes 2024-12-06 23:29:36 +01:00
Kashargul c64a251504 mecdicine_vr 2024-12-06 22:47:10 +01:00
Kashargul 5398ec84bf few more 2024-12-06 22:26:07 +01:00
Kashargul e0972e8325 virology 2024-12-06 22:12:35 +01:00
KashargulandGitHub 939fcbb488 Merge branch 'master' into reagentToDefines 2024-12-06 21:57:14 +01:00
Kashargul 429398bdd7 some moire 2024-12-06 21:54:05 +01:00
Heroman3003andGitHub fd4f187ea1 Merge pull request #16669 from SatinIsle/coffeeeeeee
Barista love
2024-12-07 05:08:01 +10:00
Kashargul 80edcd2c3d Converts gas, mat and reagent strings to defines 2024-12-06 17:26:00 +01:00
SatinIsle 35503f3113 Barista love
Added a new dispenser to cafes on each station, the syrup dispenser. These just add flavoured syrups to your drinks, but don't do much unique by themselves. This allows people to customise their coffee more.

Added a whole bunch of flavoured syrups, such as pumpkin spice, chocolate, irish cream and more.

Added new coffee recipes, including things like americano, macchiato, breve, cappuccino and mocha. Unfortunately flat white and latte would cannibalise other recipes if they just used milk and coffee, so they use drip coffee instead.

Added a few new coffee reagents, drip brewed coffee and milk foam.

Changed coffee cups to now include the name or description (in the var cup_prefix) of certain additional reagents. For example, if you have a cup with 25u of mocha and 5u of pumpkin spice, it will take the name "cup of pumpkin spice mocha". A lot of existing reagents have had these added too.

Added a wall locker with additional cups to every station cafe.

Added pineapple juice as an option to the soda vendor.
2024-12-03 14:35:45 +00:00
Guti 3cf6aa9f2a Size stuffs 2024-11-30 17:06:02 +01:00
Guti 9f52fc0b1c Sick stuff 2024-11-25 17:05:54 +01:00
GutiandGitHub 9077c940c4 Better Viro (#16536)
* Better Viro

* Quarantine ship

* Lazy...

* Roanoake prep

* Roanoake

* Verbs

* Verbs + Logging

* Virus breath check
2024-11-05 12:40:02 +01:00
Nadyr 7e50bd3143 fixes bad decaf reactions 2024-10-04 13:19:30 -04:00
Kashargul a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
Heroman3003andGitHub c7b6c3e42b Revert "Revert "Garbage collection, asset delivery, icon2html revolution, and…" (#15816)
This reverts commit f6d0f62622.
2024-04-22 06:29:01 +10:00
SatinIsleandGitHub 711f99944e Entrepreneur Expansion (Part 1) (#15933)
* [WIP] Entrepreneur Expansion

Added a whole range of unique items and load outs to each entrepreneur alt-title.

Intending to give them some station location too.

* Completes outfit expansion
2024-04-21 21:12:12 +10:00
Heroman3003andGitHub f6d0f62622 Revert "Garbage collection, asset delivery, icon2html revolution, and general…" (#15815)
This reverts commit cc05d51b69.
2024-03-10 20:01:05 +10:00
cc05d51b69 Garbage collection, asset delivery, icon2html revolution, and general fixes (515) (#15739)
* Making it compileable

* Adds Tracy & Fixed missing compat in sorting code

* CI workflow using "Stable" beta version

* Tracy define

* Fixes

* Update GC from TGStation

* fixes

* Appease linter

* begone custom_items.txt

* Making it compileable

* Adds Tracy & Fixed missing compat in sorting code

* CI workflow using "Stable" beta version

* Tracy define

* Fixes

* Build dependencies at 514

* Asset delivery/GC/515 megapatch

* fix runtime

* Appease integration tests

* More runtime fixes

* Attempting to resolve runtime

* Update spacemanDMM

* icon2html revolution

* icon2html part 2

* fixes

* Attempt to appease linter

* More fixes

* Final fixes (hopefully)

* operator keyword moment

* minor fixes and additions

* undo extra tgui files

* switch to QDEL_IN_STOPPABLE where necessary

* Pain

* GPS runtime

* dropped(null) fix, + chompedit the fixes just incase.

* Fix chat tags

* Update _build_dependencies.sh

* runtime in orebag, duplicate in computer/ship/proc/look, runtime in zoom

* tweak zoom change

* another registersignal override runtime

* 1

* Revert "1"

This reverts commit 43f619ca6c216c2bc41b8f7a346069f99591261b.

* various qdel ref fixes

* newplayer and observer harddels

* disposalholder logging remove, gargoyle hard del + typo

* retouch atom/movable destroy to be TG-like

* potential edge case ref in manualfollow

* extra following potential ref

* global list refs tweak, new_player undo a thing

* /mob/new_player qdel fixes

* undo some things

* revert atoms/movable/destroy

* revert mind and new_player panel changes

* atoms and atom/movable reversions

* bring back datum/mind and panel fixes

* projectile optimisation

* Reverts useless edits, clothing hood runtime, projectile runtime

I tried a lot of things which do not help, and i reverted a lot of it here.

* a few more reversions of useless changes

* Begin getting rid of CHOMPedit comments

* Nuke remaining chompedit comments

* Revert "undo extra tgui files"

This reverts commit f3bdcde8cb.

* fixing oops

* line ending shenanigans

* More GC cleanup

* Optimisations to test/trace projectile, turrets. Tweaks.

Turrets now only trace when they are absolutely sure they want to shoot. disposalholder, effect master and artefact qdel refs changes.

* bad usage of the check_trajectory proc

check_trajectory returns a list of objects hit along it's path to it's target, not a boolean of the target being hittable. a couple places in code assume this, so here they are fixed.

* puts legacy globals into GLOB datum for debug use

* fix upport oopsie

* fix

* Move recursive listening to component

* Minor fixes and cleanup

* undo my temp solution

* tweaks + a missed thing

* recursive_move sanity checks and safety cases

* Catch null initialisation cases + fix borg creation

VV edit spawns the object in nullspace then directly sets it's loc, which means the movement is unregistered. The spawn(0) delay should hopefully mean that setup_parents happens AFTER any unregistered movement.

* circular inventory check, make checks better

* better handling of safety reset cases

* Add logging to safety checks

---------

Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-03-10 09:39:33 +10:00
VerySoft 0c89bc1430 Per heroman request 2023-09-03 12:04:51 -04:00
Youtubeboy139 87681f6c44 Adds in Protein Powder and new Sprites 2023-06-22 16:32:01 -04:00
SatinIsle 9a95dc8a19 Lipostipo and name change
Adds another drug called lipostipo, which increases your weight without adding nutrition. Made using lipozine, nutriment and fluorine. Essentially acts as a reverse of the other drug, adding 3lbs per 1u, same overdose. Max of 500lbs.

Also changes the name of Lipozine Plus to Lipozilase, on account of it still sounding fantasy, it cleaving away fat and being fun to say. Lipostipo comes from the latin for "stuffing full", so stuffing full of fat and is equally fun to say.

Both changes tested locally and work fine.
2023-04-14 10:38:58 +01:00
SatinIsle 0e8eecb407 Lipozine Plus
Adds a drug called Lipozine plus, made with lipozine plus diethylamine. Causes both a nutrition drain and a steady drain of actual weight from the person who has drunk it. Drains weight at a rate of 3 lbs per 1u. Does not check for weight loss rate, as it's pretty much a scene tool used to modify weight directly.
2023-04-14 00:29:53 +01:00
Heroman 1f93e45840 Adds new bar drink, Burnout 2022-12-22 17:20:11 +10:00
DESKTOP-4BUBN9N\Mike 8847504d58 removes meme reaction, adds sickness to regen 2022-11-20 19:00:36 +00:00
1a8f1760fa [MIRROR] conk rete (ABLE TO BE MERGED) (#13467)
* conk rete

* Update flooring_premade.dm

* Update wall_types.dm

* Update _materials.dm

* Update plasteel.dm

* Update steel.dm

* Update stone.dm

* Update stone.dm

* Update instant.dm

* Update plasteel.dm

* Fixes map changes

Co-authored-by: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:03:19 -04:00
C.L edd38dd8ff Radiation Rework
- Makes low levels of radiation slower and more insidious. (Low levels of rads only have effects every 5 life ticks.)
- Makes high levels of radiation have varying effects and be much more lethal. (When above 600 rads, effects are done every life tick)
- Makes radiation have lingering effects that can be treated with normal radiation chemicals.
- Adds 'Prussian Blue' a chemical made with '("carbon" = 3, "iron" = 1, "nitrogen" = 3)' that temporarily stops radiation effects to allow for medical to treat a patient.
- Makes medical scanners able to give a definitive answer as to how much rads someone has.
- Makes cryopods handle radiation sickness. Maybe now they'll see more use than just genetic damage.
2022-09-19 20:56:52 -04:00
NovacatandGitHub 1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00
MistakeNot4892 d717a4b50a Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298 2022-08-25 14:26:20 +10:00
Heroman 8a9df3b2ea Fixes in-chat icons being broken 2022-07-20 18:55:27 +10:00
Somememeguy c96152408f Make Cooking Great Again [Tedium Update]
Makes cooking less tedious.
2022-05-09 14:22:14 -04:00