Commit Graph

69 Commits

Author SHA1 Message Date
Will 0c8488b0ae Move autolathe design datums to techweb datums (#19202)
* testing makes me feel good

* invalid lists

* get rid of those boards

* show expected mats

* oop

* error

* wip techweb porting

* more techweb entries

* ported too

* disable those for now

* okay nevermind i guess

* already exists

* assemblies

* moar

* welding helmet

* many entries

* lol tg

* fix test

* again

* fixagain

* more moved

* update techweb test

* catch that too

* screeee

* more fixes

* missing announcement

* orphaned sleevecard

* some more fixing

* test

* more

* oops

* glasses

* illegal icons

* non starting

* it's starting

* messed up

* cleanup

* more generic stuff

* morrrreee

* the plastic set

* oops

* correct value

* barbed wires

* more cleaning

* many more

* gone

* cleanup

* no longer

* do not allow duped designs

* it's own node

* proper order no dupes

* last of the broken nodes

* fix bad path

* cleanup

* more test more limits

* gone

* almost done

* these are gone

* syringe gun

* bioregenerator design

* all moved

* organized and webbed

* more fixes

* oops

* cleaning up

* organization

* clean up

* organize

* organized

* didn't save

* wrong mat

* adds many missing ammo types

* svd doesn't exist

* 10mm pistol added

* magazines not casings

* these are pistols

* this is used by like, one weapon

* m1 is ancient

* this is hunting

* extremely botched untested lathe

* disk junk

* rough foundations

* slowly converting

* slowly building this

* local materials

* almost

* big reorganization

* more cleanup

* more cleaning

* lathe stuff

* small fixes

* oops

* many fixes

* mat fix

* more fixes

* actually isolate the hacked designs

* protolathe hacking

* imprinter hacking

* missing ammos

* sheet printing for autolathe

* fixs

* again

* fixed test

* test test

* fix

* fix

* WHY

* fix it...

* here we go

* material print

* on turf

* body disk

* consistant name

* Many weapons to hacked lathe

* missing node

* wrong section

* fixes

* this list should be unified

* ammo boxes

* don't do single shells anymore

* wat

* specifics

* snowflake

* not needed

* already available

* pickaxe too

* tweak

* removed unneeded node

* missing surgery items

* Apply suggestion from @Cameron-The-Raven

* Adds RMS

* typo

* illegal needs hacked

* disabled material weapons

* circuit testing

* STRING TEST

* test

* fixing some things

* huh?

* hidden circuits

* some flakey boards

* grammar

* fixes

* more hidden

* wrong board

* security cams

* alert consoles

* spaceheater is simple enough to not have one

* pcus

* cargo vendors

* tcomms stuff

* solar tracker circuit

* artifact stuff

* SM stuff

* illegal machines

* med machines

* no longer needed

* more stuff

* these are not standard

* moreeee

* doppler and more

* organized

* finishing

* oop

* use the define

* inheret

* dopper fixes

* space heater

* doing some organization

* explain the var

* some tweaks

* wrong one

* fixed test

* material test too

* simple roto gens

* use the define

* emergency power node

* tgui fixes for icons

* not needed

* color blended material designs

* icons for large research

* oops

* unshit that

* use stack here

* center math

* .

* .

* .

* .

* .

* unifi

* fix these

* NO COPYPASTA

* ILLEEGGALLL

* mandate descriptions

* agony

* actually lets do this

* use macros

* description

* desc

* desc

* desc

* desc

* desc

* desc

* gps desc

* telecomms component desc

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2026-03-20 19:38:00 -04:00
Cameron Lennox 9a8b885d38 Scannable chems and fixes (#18899)
* Scannable rework

Makes scannable have tiers.
WIP

* Some more adjustments

* Scanning

* Bodyscanner

* Some more fixes

Fixes amatoxin
Fixes synap not processing when drank
Makes fakedeath show up as braindeath, not massive O2 loss.
Makes zombie and lich powder show time of death properly

* Scanners for fakedeath

* This too

* Refactors bloodloss

* rounding
2025-12-26 05:19:36 -05:00
Killian a01cc9d1d4 drinky tweaks (#18466) 2025-09-14 23:04:11 -04:00
Cameron Lennox ffd8b7e362 Consts (#18455)
* Gets rid of this const

* Unused const

* Update forensics.dm

* Drinks defines

* uNUSED

* Update Keywords.dm

* Update Keywords.dm

* Add

* yar

* Fingerprint
2025-09-15 00:10:48 +02:00
Cameron Lennox d73f6b8dbd Makes uses of do_after sane (#18334)
* Prevents insta-actions

* Do_after sanity

NOTE: NUKE do_after_action

* Update bonfire.dm

* The  rest of them

Also fixes a tpyo

* no minitest :)

* .

* .

* Gets rid of the slowdown for now

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-09-08 02:25:08 +02:00
SatinIsle ee75074a57 Alt click reagent containers to set transfer volume (#18283)
* Alt click reagent containers to set transfer volume

Made it so that you can Alt click reagent containers to set transfer volume.

* Wait that's an old edit

* Change all transfer amount changes to use number input instead

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-08-27 09:36:31 +02:00
Cameron Lennox b3fb00d70d Refactors do_after w/ TG's do_after (#18282)
* part1

* keeps range ability

* no cog vore
2025-08-22 00:21:14 +02:00
Cameron Lennox 9856c64443 Clothing fallback (#18258)
* Clothing fallback

Makes clothing have a fallback in the event of a custom species file not having the appropriate icon state.

* some logging

* testing

* swap all unit tests to use icon_exists

* Update poster_tests.dm

* Update clothing_tests.dm

* Update cosmetic_tests.dm

* Update robot_tests.dm

* whoop

* upgrades people, upgrades

* port these

* Update _atom.dm

* adjust all these

* Update clothing.dm

* TRUEFALSE
2025-08-19 20:42:42 -04:00
Cameron Lennox 0e24446f12 Icon Fixup [IDB IGNORE] (#18284)
* Begin the sprite consolidation

* med stand

* Library

* kitchen cart

* hydroponics

* Delete hydroponics_machines_vr.dmi

* furniture

* unused computer

* food

* fitness

* fixes the eggs

* Decals

* Drinks, Devices, and Drakie

* Cryogenic2

* combines

* chemical

* card new

* cards

* bereaucracy

* Xenoarch

* compile

* virology

* vehicles

* toys

* Surgery

* stationobjs

* clean these up

* gets rid of some dupes

* bye

* how did that get there

* Unused

* Gets rid of unused ninja dupe file

* Move all these old doors

* this too

* get rid of dupes

* Update airlock_angled_bay.dm

* fixes the map with a prop

* map fixes
2025-08-17 19:09:57 -04:00
Kashargul 1def015bad end of file Fix (#17308)
* end of file Fix

* fix those lints too
2025-03-10 16:15:35 -04:00
Kashargul 46bea7cfa2 Initialize fixing (#17279)
* Initialoize fixing

* diff fix

* add init grep test

* fixed missed ones

* .

* some more

* ,
2025-03-08 13:59:29 -05:00
Drathek d062ff9f49 Port OD Pragma Lints (#17171)
* Experimental: Port OD Pragma Lints

* first pass: Includes icon forge fixes/updates

* 2nd pass

* third pass

* debug_ai: This what you're unhappy with?

* Revert "debug_ai: This what you're unhappy with?"

This reverts commit bc178792e6.

* How about this

* Or is it the else?

* Pass summer

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2025-02-26 18:12:03 -05:00
Cameron Lennox 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
Kashargul 3d9113eae3 removes center of mass list (#17064)
* removes center of mass list

* .

* .

* fix that icon

* .
2025-02-05 14:06:59 -05:00
Drulikar ac8f3d5dd0 Fixes 2025-01-07 06:52:06 -06:00
Kashargul 7c7666d670 fix a lot of map issues (#16857)
* fix a lot of map issues

* fix SM template...
2025-01-06 18:57:52 +01:00
SatinIsle be9b667940 Fixed coffee cup storage (#16701)
Fixed coffee cups not being able to be placed back in their boxes.

Closes #16700
2024-12-16 10:02:28 +10: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 5398ec84bf few more 2024-12-06 22:26:07 +01:00
Kashargul 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
SatinIsle 4cf5beeabe Added more cup sizes
Added tall, grande and venti cups that get named similarly to the normal cups.

Added ginger and gingerbread syrups, on request of my wife, lol.
2024-12-03 20:06:57 +00:00
Kashargul b594520a74 next set of spans (#16434)
* next set of spans

* some more

* next

* next

* next

* .

* text...

* next... rest soon

* .

* .

* ok last set for the night

* .

* .

* .

* .

* some more

* next

* next

* all for now

* .

* some more easy ones

* some more easy ones

* .

* .

* some more bolds

* oups auto complete moment

* add the remaining spans

* this as well

* this as well

* .

* .,

* resync them properly
2024-10-16 23:37:27 +02: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
Kashargul 6cabe9f7e6 Undefines local defines and moves global to __define (#16028)
* first set of defines

* some more

* .

* final defines

* del local define
2024-06-09 17:29:20 +10:00
SatinIsle 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
Youtubeboy139 87681f6c44 Adds in Protein Powder and new Sprites 2023-06-22 16:32:01 -04:00
Atermonera df505dfc27 Merge pull request #9012 from Cerebulon/mug_fix
Fix some coffee mugs not using the correct sprites
2023-03-08 23:51:59 -05:00
Heroman 1f93e45840 Adds new bar drink, Burnout 2022-12-22 17:20:11 +10:00
GhostActual d4f6914140 Base Commit 2022-03-21 15:38:31 -04:00
Aronai Sieyes 7ef4a5b686 Merge pull request #11541 from VOREStation/upstream-merge-8249
[MIRROR] A Hint Of Lime
2021-10-22 14:11:51 -04:00
MistakeNot4892 3a70b6b468 Merge pull request #8249 from Cerebulon/cubalibre
A Hint Of Lime
2021-08-31 20:26:15 -04:00
klaasjared e973bf0fd1 Third Commit 2021-08-29 00:58:39 -04:00
Aronai Sieyes 02be2c77a0 Allows sipping proteans/prometheans 2021-08-06 16:33:43 -04:00
MarinaGryphon 577b986ba6 Convert some bools to TRUE/FALSE instead of 1/0. (#11100)
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2021-07-16 13:43:25 -04:00
Aronai Sieyes b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
Aronai Sieyes 4c12504e3b Replace list inputs with tgui_input_list 2021-06-26 10:39:56 -04:00
MarinaGryphon 385fa640af Linter diagnostics + bans non-var relative pathing 2021-06-20 18:16:45 -04:00
TheFurryFeline 3b3df27dac Fix metaglass stuff
The conversion to Pink Russian PR overlooked this metaglass portion. Fixy.

~Also sneaking in map file name fixes because OCD, kek. 5-8-9 = no. 5-6-7 = yes.~
2021-06-18 17:00:11 -04:00
MistakeNot4892 3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Riley 14e1243a87 Drink addons and sprites 2020-10-16 05:40:14 -04:00
Atermonera 4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint
Adds metamorphic pint glasses to RSF, autolathe, supply packs
2020-08-21 01:28:23 -04:00
rboys2 7de3ca1895 Update code/modules/food/drinkingglass/metaglass.dm
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
2020-08-12 13:21:30 -04:00
Riley aacf8c9962 Pink moo drink
this took me too long, me sleepy
2020-08-12 03:32:07 -04:00
SweetBlueSylveon 9640367e88 Fixes two drinks.
Correctly maps "Dumb Shroom Juice" and "Unsweetened Tea" to /ethanol.
2020-05-31 01:59:34 -07:00
Aronai Sieyes a5de42d181 Merge pull request #8140 from SweetBlueSylveon/Drink-update
Drink update
2020-05-30 19:09:25 -04:00
SweetBlueSylveon 2c3c8e8450 Patch 2
Fixed indentations.
Removed "Icon_state" and "center_of_mass" where stated a second time.
2020-05-30 15:57:03 -07:00
SweetBlueSylveon dcdf46212c Drink update
Adds 20 new drinks, 30 replaced sprites for old drinks, and adds 3 new sprites to drinks without one. Snow White recipe changed.
Requires"Allow reagents to have specific metaglass icon files" from Arokha.
2020-05-30 14:55:44 -07:00