Commit Graph

29 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
Will 11250fa9d3 Experisci Expansion part 0.5 (#18631)
* telescience experiments

* use defines

* fixed up telesci stuff

* non-working bluespace crystal experiment

* allow sec to print basic cells

* allow anyone to make basic power cells

* fix

* medical basic tools

* bad paths

* pathfix

* fixed DA experiments, and clarified proc name

* circuitboards use copper

* changed it back

* lint

* moved signal

* slime deconstructing

* circuits don't give steel

* corrected defines

* correcting designs

* autolathe is not synced yet

* lets just mirror original behavior

* keep procs

* engies get signaler

* no dupe

* destructive borg belly

* unify point generate proc
2026-02-18 00:33:32 -05:00
Killian d871b645fa Woodstravaganza (#18814)
* woodstravaganza

* floor color handling

* woodstravaganza

* woodstravaganza: sivian edition

* woodstravaganza: vertical tiles

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-11-27 21:17:10 -05:00
FluffMedic 56d1535957 Energized Agate Upport (#18799)
* Energized Agate Upport

Upports Energized Agate for sprite cohesion

* Forgot to remove this

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-11-20 09:20:05 -05:00
Ryumi 57a8e42441 Fixes being able to conjure leather by crafting steel furniture (#18705)
* Fixes being able to conjure leather by crafting steel furniture

* woops-
2025-11-05 16:30:18 -05:00
Kashargul fac274e5f9 sane stacks (#18342)
* sane stacks

* .

* .

* .

* -

* clean that up

* .

* .

* fix chat scaling

* readd cords

* .

* guh

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2025-08-30 00:57:26 +02:00
ShadowLarkens b60cd47309 Techwebs & Experi-Sci (#17987)
* Techwebs

* Add basic stock parts

* Techweb production machines

* Circuit Imprinter

* More work

* More designs

* More designs, nodes'

* More more

* Better sorting for designs

* Add the exosuit fab'

* More conversions

* More and more and more

* mechfab parts

* Modsuit Designs

* Pinnace baron

* Equipment

* more mechfab

* vehicles

* more mecha

* Micro mechs

* Update mechfab_designs.dm

* no time

* zero

* Update mechfab_designs.dm

* Prosthetics Fabricator and fixes

* Update maps to use new parts

* Whoops, fix a few maps

* Fix lint error

* Port scene tools

* Fireworks~~

* Don't label the sex toys as sex toys

* Fixup maps in TGM format

26517b7122: maps/virgo_minitest/virgo_minitest-1.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* Significant portion of designs converted

* Fix paths

* Fix tgui lints

* Just a whole bunch of designs

* Almost doneeee

* ALL DESIGNS CONVERTED

* Merk all of the old stuff

* Fix a few errors

* Fix more errors

* MORE FIX

* Make server control work

* Undo changes to archive

* Fix a TODO

* Make disks work

* Start the long process of finishing the node tree

* One more oops

* All mechfab designs

* Add departmental protolathes

* Down to 200 designs unsorted

* FINISH TECHWEBS

* Fuck whoops

* Remove the debug verbs

* Little map tweaks

* Fix mousedrop

* More map fixes

* Upstream bug lmao

* guess CI hates this

* Fixup maps in TGM format

fe062e7bc4: maps/tether/tether-03-surface3.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* I gotta stop committing this

* Change scree requested

* Make science able to print implants too

* Fix ghost spawns

* Move NSFW gun

* Merk partbundles, make janus module work

* Pretty animation when you complete the tree :)

* Don't display designs you can't print

* Move security protolathes to warden's office

* Make servers recover from power failure gracefully

* Make fabricators drop their mats on the ground when destroyed

* Ore Silo

* Make CI happy

* Fixup maps in TGM format

fe062e7bc4: maps/tether/tether-05-station1.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* Fix MC crash

* Make experiscanner work for borgs

* I REALLY gotta stop committing this

* Make scientists and the RD spawn with an experiscanner

* Lock NIFs behind scanning mice

* Make Biome happy

* Allow scanning Cocoa and Kendrick in case they can't find mice

* Change from Kendrick to Ratthew, ;help maint, or Brick

* Change the name of the /rat/pet class so the experiscanner is more helpful

* Add departmental_flags to a bunch of things

* Remove a few things from security's techfab

* Add a second engineering lathe to atmos

* Fix runtime recycling rig modules, add name to cost sequence

* Add a discount experiment for scanning slime cores

* Change some fluff and shuffle chameleon clothes to bluespace yadayada

* Make closets alt click immune

* Do a bunch of sorting

* Silly

* Hopefully fix all infinite material bugs in techwebs

* bad merge

* quick ai fix

* fix some robot stuff

* axe downlaod fully

* list

* no ref

* easier readable

---------

Co-authored-by: C.L. <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-07-26 06:30:08 +02:00
Kashargul 5a5d8117ae no infinite materials (#17814)
* no infinite materials

* cleanup

* RMS and some other stuff

* fix name

* shock fix

* .

* .name

* Update RMS.dm

* names

---------

Co-authored-by: C.L. <killer65311@gmail.com>
2025-06-07 10:08:18 -04:00
Kashargul f84536fc3a some small things (#17693)
* some small things

* .

* clean this up

* potentially fix nulls in player list

* .

* Fixes

* Update machine_stacking.dm

---------

Co-authored-by: C.L. <killer65311@gmail.com>
2025-05-15 00:56:26 -04:00
Kashargul cdfa1c853f New to init final (#17512)
* Initial

* some more

* next few

* only light left

* fix things up

* some rmore fixes

* guh

* Update ai_vr.dm

* comment

* lets try something

* .

* hmm

* .

* .

* hmm

* push that here

* fix layout

* grrr
2025-04-14 00:07:35 +02:00
Kashargul 9d688b7a7c Some more Init and Destroy issues (#17252)
* moreInitandDestroy

* .

* oups

* .

* .

* fix?

* oups

* clean this up

* fix those dels

* ...

* fix

* ummm

* reworks resource handling

* .

* .
2025-03-06 01:53:52 +01:00
Kashargul 2ae6355aff more new to Init (#17147)
* more new to Init

* fix pumps

* style update

* fix atmos memory leak

* fix mech

* qdel in here

* Update hands.dm

* Update rings.dm
2025-02-16 00:16:15 +01:00
SatinIsle cd89f4d237 Glamour Experimentation (#17003)
* Glamour Experimentation

Added a new stable glamour crafting material that can be used to craft various items.

Added a new unstable glamour item, that has a few risky effects when used and picked up without protection.

Added a new particle smasher recipe to turn unstable glamour into stable glamour.

Added new items to the lleill transmute ability.

Added new glamour bow and arrow items.

* Fixed a bit of phrasing

* Consolidates TF procs

Changed TF procs and belly transfer procs to be called from one location rather than being repeated in various different procs across the code.

* forgot to include

* Fixed size change effect

* timer instead of spawn

* Added new glamour turfs for whitespace maps.
2025-02-01 14:28:56 -05:00
Kashargul 2d75eee0eb . 2024-12-08 20:57:49 +01:00
Kashargul 8d6bf161a8 cleanup the last 2024-12-08 20:54:28 +01:00
Kashargul 2bd0f9c14d other.dm 2024-12-07 00:12:42 +01:00
Kashargul 80edcd2c3d Converts gas, mat and reagent strings to defines 2024-12-06 17:26:00 +01:00
Varlaisvea 1ae49ef905 the little construction pr 2023-03-08 23:24:56 -05:00
VirgoBot 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
Killian 70b88ad181 hardwood material port 2021-10-28 10:21:38 +01:00
Aronai Sieyes 27bf0c07d4 Fix merge 2021-10-22 14:22:58 -04:00
MistakeNot4892 af10c9d0c9 Expands the ring selection 2021-09-05 23:29:36 -04:00
VerySoft 6ba1086887 ALMOST DONE 2021-08-13 23:12:12 -04:00
Aronai Sieyes 6a5d9a5660 Add building steps! 2021-07-22 16:01:52 -04:00
Aronai Sieyes ca82ce3c20 Add plant fiber material/stacks 2021-07-11 01:55:20 -04:00
Aronai Sieyes b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
MarinaGryphon 385fa640af Linter diagnostics + bans non-var relative pathing 2021-06-20 18:16:45 -04:00
ShadowLarkens 2a70cfe91f MaterialContainer: Add a component to hold materials
No implementations in this commit.
2021-06-12 18:17:44 -07:00
Atermonera d9fffdd07b Moves material stacks to modules/materials 2021-04-22 18:59:27 -04:00