Commit Graph

677 Commits

Author SHA1 Message Date
ShiftyRail
04374cc2c2 More hard dels tracking (#37654) 2025-06-02 08:48:03 -04:00
ShiftyRail
fa42b8cca8 Some fixes for wrapper code (#37525)
* Some fixes for wrapper code

* linter
2025-05-06 09:03:20 -04:00
SECBATON GRIFFON
048b24ad8c The lockbox access update (#37497)
* lockbox stuffs

* adds these in

* stack and autolathe stuff

* actually this makes no sense sorry

* finally renames this

* adds this, maybe?

* update icon consistency

* fixes

* removes redundant definition, brings vars over and updates description to be more accurate

* correct order

* covers the vials too

* so that it actually goes inside properly

* moves stuff to protolathe

* moves this here too, does some more starting mats

* vial thing icon

* something to stop this showing up in the list

* more usage

* more use of this

* sanity

* some lock consistency

* has to be rewritten to allow putting things in here

* forgot this

* can't forget this

* unneeded checks
2025-04-30 20:05:00 +01:00
CrazyAmphibian
d1939978c0 More fission fixing (#37451)
* swapped temps

* visual enhancment, consistency. names, too.

* wrenchmove :DDDD

* wrenchmove inspect text

* infinite money glitch

* linter warning

* let there be light!

* faster construction, fewer resources
2025-03-03 20:25:03 -06:00
CrazyAmphibian
c5787f45bc soth (#37440)
* fixes

* container fixes

* bigger radiation

* linter fix maybe?

* var/list/list/obj/list/list/obj/aaaaaaaaa=list()

* better manuals, ?.

* construct

* test

* constructn

* radon ISC fix?

* suggested change

Co-authored-by: west3436 <66280799+west3436@users.noreply.github.com>

* suggested change

Co-authored-by: west3436 <66280799+west3436@users.noreply.github.com>

---------

Co-authored-by: west3436 <66280799+west3436@users.noreply.github.com>
2025-02-24 07:22:08 -05:00
Eneocho
8cda905078 assorted fission reactor typofixes (#37438)
* typofix 1

* typofix 2

* typofix 3 + text tweak

* name tweak

* .

* .

* .

* .

* tweaks/typofix for the reactor manual
2025-02-20 08:20:59 -05:00
CrazyAmphibian
5a4f4d75e7 fission rectors but with less goto (#37435)
* mm code

* size detection and setup

* it actually compiles now

* smore changes

* fixes, additions

* making things buildable pt 1

* buildability pt2

* grammar, because i was making this at 3 in the morning

* file seperation and fixes

* adds a new reagent

* placeholder sprites pt1

* conflict resolution (i hope)

* more icons, reactor assembly works on spawned obj

need to add things to material construction menus, as well as make datum code a bit better.

* rework to fuel mechanics, constructability additions

* fixes, changes, stuff

* cargo orders, construciton, bugs

* runtime fixes, errors and isues. it just werks.

* Update datums.dm

* ENGAGE HYPERSHITCODE THRUSTERS!!!1!111!!

* suggested changes pt1

* changes pt2

goto goto goto while true

* SCRAM actually works now. better controller examine text.

* FIX IT FIX IT FIX IT FIX IT

* the candle the burns twice as long burns half as bright (fuel number change)

* nerf starter

* new cargo order

* reactor UI

* UI refactor

* reactor UI functional

* construction fixes

* fuel creation UI

* deconstruction

* adjustable units

* new fuelrod subtype

* fuel recycling

* rads

* meltdown framework

* rads, guide

* finishing touches

* UI autoclose, explosion changes

* oops wrong side

* nevermind i'm dumb

* explosion tweak

* ex_act

* seconds are 2 digits

* more rod icons

* more heatcap

* TWO SECONDS

* file rename

* updated control rod code for 2 secs

* sprite changes, system changes, ui changes

* reactor controller sounds

* scram sound manually

* post-review code fixes

* BEGONE SUBSYSTEM, CURSE YE TO THE SHADOWS

* movment fix

* UI recolred to look more similar

* case icon updates

* enhanced detection of reactor construction, fixed runtimes

* fixes lmao

* changed sprites, overlay reworks

* changed controller sprites

* nu reactor ui

* new fuel machine UI

* more ui, expanded funcs, changed radium's role

* regenerate calcium nerf

* meltdowns are slower

* nu sprites

* areas, runtimes, guides, oh my!

* new reagent! runtime fix!

* removed old files

* updated corium, tweaked meltdowns

* removed gotos

---------

Co-authored-by: west3436 <66280799+west3436@users.noreply.github.com>
2025-02-19 15:01:40 -05:00
west3436
3921ed8ca2 Revert "new engine: fission reactor (try 2) (#37397)" (#37431)
This reverts commit e50096a5a3.
2025-02-19 09:42:36 -05:00
CrazyAmphibian
e50096a5a3 new engine: fission reactor (try 2) (#37397)
* mm code

* size detection and setup

* it actually compiles now

* smore changes

* fixes, additions

* making things buildable pt 1

* buildability pt2

* grammar, because i was making this at 3 in the morning

* file seperation and fixes

* adds a new reagent

* placeholder sprites pt1

* conflict resolution (i hope)

* more icons, reactor assembly works on spawned obj

need to add things to material construction menus, as well as make datum code a bit better.

* rework to fuel mechanics, constructability additions

* fixes, changes, stuff

* cargo orders, construciton, bugs

* runtime fixes, errors and isues. it just werks.

* Update datums.dm

* ENGAGE HYPERSHITCODE THRUSTERS!!!1!111!!

* suggested changes pt1

* changes pt2

goto goto goto while true

* SCRAM actually works now. better controller examine text.

* FIX IT FIX IT FIX IT FIX IT

* the candle the burns twice as long burns half as bright (fuel number change)

* nerf starter

* new cargo order

* reactor UI

* UI refactor

* reactor UI functional

* construction fixes

* fuel creation UI

* deconstruction

* adjustable units

* new fuelrod subtype

* fuel recycling

* rads

* meltdown framework

* rads, guide

* finishing touches

* UI autoclose, explosion changes

* oops wrong side

* nevermind i'm dumb

* explosion tweak

* ex_act

* seconds are 2 digits

* more rod icons

* more heatcap

* TWO SECONDS

* file rename

* updated control rod code for 2 secs

* sprite changes, system changes, ui changes

* reactor controller sounds

* scram sound manually

* post-review code fixes

* BEGONE SUBSYSTEM, CURSE YE TO THE SHADOWS

* movment fix

* UI recolred to look more similar

* case icon updates

* enhanced detection of reactor construction, fixed runtimes

* fixes lmao

* changed sprites, overlay reworks

* changed controller sprites

* nu reactor ui

* new fuel machine UI

* more ui, expanded funcs, changed radium's role

* regenerate calcium nerf

* meltdowns are slower

* nu sprites

* areas, runtimes, guides, oh my!

* new reagent! runtime fix!

* removed old files

* updated corium, tweaked meltdowns

---------

Co-authored-by: west3436 <66280799+west3436@users.noreply.github.com>
2025-02-19 09:10:27 -05:00
west3436
d4de3e23c3 Revert "Minor ZAS Optimizations (#37277)" (#37306)
This reverts commit 8cba58907e.
2024-10-27 15:09:52 -05:00
west3436
8cba58907e Minor ZAS Optimizations (#37277)
* ZAS Optimizations

* more

* even more

* smoke
2024-10-18 18:22:28 -05:00
SECBATON GRIFFON
f0bd028ef2 Makes plastic crates actually a crate type (#37261)
* Makes plastic crates actually a crate type

* removes commented code too
2024-10-14 17:03:09 -04:00
jwhitak
36ca9ab025 Fixes Most Screwdriver/Wrench/Wirecutter Special Tool Interactions (#37207)
* most cases

* forgot user ref and more calls

* fixes reversed arguments, standardize is_hot
2024-10-02 08:35:37 -04:00
west3436
4d150fd98a Crate Shelves (#37151)
* crate shelves

* fix layers

* fix layering and placement checks

* it kill people
2024-09-25 07:16:14 -05:00
west3436
04114a8d44 Plated Catwalks (#37125)
* Plated Catwalks

* fix perspective

* rewrite

* mapping aid
2024-09-25 06:55:55 -05:00
SECBATON GRIFFON
0a37d67dc2 Fixes a ton of sentence starts with non capitalised improper nouns. (#37099)
* Fixes capitalisation on throwing stuff in disposals

* in fact, fixes it for everything

* even more

* outta here
2024-09-16 22:37:36 -05:00
DeityLink
6bafe27fe1 Paintable Clay Pots & Easier Recipe (#37024)
* Clay Pots

* clay pot easier recipe
2024-09-07 22:00:11 -05:00
DeityLink
ca674eff9d The Boomerang Update (feat. Castlevania: Rondo of Blood, and Gurren Lagann) (#36993)
* Castlevania and Boomerangs

* GURREN BOOMERANG

* Alright

* failsafe

* better boomerang protection
2024-09-02 11:12:54 -04:00
SECBATON GRIFFON
ab5251a051 Stack storage fixes (#36709)
* Ore and sheet storage fixes

* let's be specific here

* makes it refresh properly

* cleans up this

* flip this

* cleaner

* adds this back cause it displayed the other message by mistake too

* makes this display right

* clearer insert message, sheet snatcher has more old behaviour accurate

* even closer again

* this allows adding to be easier

* some info

* reverts back, as requested
2024-08-29 19:37:45 -05:00
SECBATON GRIFFON
d9ee71e35b Vendor coinbox and vendpack qol (#36668)
* Vendor coinbox and vendpack qol

* removes this error from happening

* unatomic, will do in other pr

* hotfix for this

* makes coinbox buildable, this version has no access requirements
2024-08-29 19:46:46 -04:00
jwhitak
a3470d8927 Blacksmithing Quality of Life Pass (#36964)
* blacksmithing qol changes

* fixes adding fuel mid-light
2024-08-27 10:05:05 -04:00
DeityLink
2b52b0cb3e Hydroponic Tray moody lights pass, lid re-sprite, and other visual goodness (#36950)
* haha jesus christ

* oh baby

* finishing touches

* future coder QoL

* visible_stages

* hurp durp

* pottedplants

* polish

* more polish

* oh boy

* clown tray

* the end is never the end is never the end is never the end is never

* alright
2024-08-24 01:29:21 -05:00
Toomykins
1bb70cb97e Update nanopaste.dm (#36925) 2024-08-15 21:23:20 -05:00
jwhitak
a15dfed01e Easier (Grug) Leatherworking (#36913)
* grug leatherworking

* descriptors

* logic changes
2024-08-10 08:49:41 -04:00
jwhitak
6cd68886bb Wooden Buckets and Grugstation Changes (#36915)
* wooden buckets

* grugstation changes

* undoes unatomic change
2024-08-10 08:01:32 -04:00
malfunctioning-ai
e6b217eadc Grugstation Event Content (#36865)
* Most of the work on content for the grug event done.

* Lots more grug content.

* Defibrilator eels, nature procgen improvements, etc

* Final round of content for grug bus

* Standardizes strings so that typos won't break EVERYTHING!!

* Adds missing return to fix defib eels.

* Rock doors!

* Blacklists fireaxes from destroying planetary grass.

* Forgot a comma.
2024-08-07 18:46:51 -04:00
Dacendeth
059860e12e Sand crafting menu for making sandstone (#36766)
* Ore Recipe Addition

* Sand recipe addition
2024-07-18 08:28:42 -04:00
jwhitak
0142e01b27 Revert "Standardises item blending (#36617)" (#36761)
This reverts commit 39152f3514.
2024-07-06 00:48:56 -04:00
SECBATON GRIFFON
39152f3514 Standardises item blending (#36617)
* initial code

* adds unit test

* syntax fix

* clearer

* makes this work with slices

* more cleanup

* fix

* fix for mortars

* tests this item too

* forgot to clear

* IN THE BEAKER

* copy pasted code not even once

* makes name show up right

* hopefully fixes this

* fixes this, but at the expense of less corn oil from mortars

* should make soda cans work, also cut down a lot of code

* of course

* back to normal

* Update reagentgrinder.dm

back where it was too

* move sheetcode here

* moves to right place

* closer to old syntax

* even more loop cutdown

* lot of cutdown for consistency

* makes transfer work right

* fix

* does it like this

* detail

* makes grown stuff work now

* this was being handled alreadyyy

* fix here

* removes unused

* pre_use function helps with this

* back to this

* reorganises procs

* moves these to atom

* updates the unit test

* cleanup

* makes this compile

* fix

* fix

* possible fix

* wow really

* consistent terminology

* ok now surely

* forgot these

* maybe someday

* forgot this too

* stops sound runtime

* don't modify the var

* only do this if deleted

* removes var only used once

* this should cover those overflow cases as intended behaviour

* missed a spot

* stops runtime

* let's give this a try again

* yea, someone will need to fix that cult goblet runtime first, too unatomic

* wrote these lines wrong

* unnecessary lines. also amazed the change still worked

* logic cutdown

* scope up

* more in line with pre-PR behaviour

* types are clearer

* forgot to clear this too when code was moved to be cut down

* cleans up the test a bit

* this macro made me change the var name!

* fixes possible runtime

* maybe now itll work

* ah it's this now
2024-07-04 07:37:04 -05:00
SECBATON GRIFFON
0cef7d148e More TK and dropping sanity fixes (#36475)
* forgot these

* cleaner

* better check

* fixes logic here, proc is only used now anyways

* null check

* fixes this not going up right

* redundant check

* cuts these down

* comma

* FINALLY fixes this proc

* can't drop checks

* updates these

* some more

* starts cutting down this line EVERYWHERE

* fixes these

* more cutdown

* last of em

* don't make this output "1"

* cleaner

* cuts down brick soap code

* sanity

* fixes this from creating it anyways, also cuts down use of new

* fixes this back

* fixes this a bit, still not working yet

* ornaments don't need to make a new one, also transfers dropping vars

* cuts down bluntcode while converting to create in hands

* cuts down circuitboard code

* fix grammar

* cuts down ALL of these!

* cuts these down too

* removes legacy before take item stuff by... cutting down code!

* makes this work again

* lines no longer needed, handled here now

* forgot this

* bot code cutdown
2024-06-25 08:47:18 -05:00
Toomykins
0cbad8c2e2 Update misc.dm (#36644) 2024-06-10 08:41:23 -04:00
west3436
b223436c84 w_class Fixes (#36520)
* w_class fixes

* oops
2024-05-18 16:20:05 -05:00
west3436
434ac40c7a Fire Rework (#35988)
* initial commit

* switcheroo

* include the rest

* fire triangle

* a

* update 2-20

* turfs and reagents and more

* zburn first draft

* remove fire_old

* initial compat

* stable compile

* remove pressure factor

* total autoignition death

* thermal material datums

* a

* more autoignition

* temporary fix for testing

* everything is FUCK

* burning now

* stacks burning

* recursive functionality

* restore burnitselfup

* specific burn case

* everything is shit and fuck

* refactor

* nit

* color & light performance increase

* fix

* smoke cap + changes

* updates

* final (for now)

* remove double count, unit issues, and more tweaks

* logspam and grammar

* prevents worn or held items from burning

* minimum burn time

* fix runtime

* The Cardboard Update

* vis_contents

* cigs burn lol

* lmao

* refactor fire protection

* final fix

* some more held/worn item fixes

* maybe fix foods burning forever

* compile

* restore plasma burning lmao

* review changes

* copypasta error

* copypasta errors 2: this time it's personal

* declare

* extensive fixes

* fix liquid burning behavior

* wtf

* undo smoke cap

* mutable appearances + removal of debug messages

* DMDOC compat

* review changes

* return

* misleading comment
2024-05-14 07:43:39 -05:00
SECBATON GRIFFON
795c11a07a Telekinesis sanity fixes (#36362)
* Telekinesis sanity fixes

* not today

* more stuff

* more

* unnecesssary

* returns

* returns

* some more

* doesn't need separate proc

* doesn't need separate proc

* cleanup

* now they don't runtime

* cryo tubes, disk duplicators and floodlights (wow this refactor actually works???)

* more

* more

* more

* mooore

* more one size fits all approach

* cleanup

* cleanup

* cleanup

* cleanup

* cleanup

* cleanup

* makes these not teleport too

* makes more stuff work better

* covers these too

* restores some old behaviour

* does revialver

* railguns, and application for this hinthint

* tomahawk code chopdown

* now i know why these are there, putting it into an offhand is just odd

* good helper proc to cut down on code

* good helper proc to cut down on code

* dupe line

* going thru this file

* big file

* meant to do thsi

* getting these

* more items, nearly done? not sure

* well, i was wrong

* updates syntax

* updates syntax

* aaand looks done!

* more consistent with old logic soz

---------

Co-authored-by: SECBATON-GRIFFON <>
2024-04-30 02:27:26 -05:00
SECBATON GRIFFON
22099bca6e Makes LAssailant a weakref (#36351)
* Makes LAssailant a weakref

* Makes LAssailant a weakref

* Makes LAssailant a weakref

* Makes LAssailant a weakref

* cleans up comments

* cleans up comments

* cleanup

* cleanup

* cleans up this comment now for anyone who could re-enable

* more like old syntax

* better var name

---------

Co-authored-by: SECBATON-GRIFFON <>
2024-04-17 07:56:24 -04:00
west3436
c7cb1e1569 Prevents cargo borgs from wrapping their modules (#36317)
* Prevents cargo borgs from wrapping their modules

* more
2024-04-16 08:13:21 -05:00
DeityLink
19febc5268 The Chandlery Update (feat. wax crafting) (#35863)
* Chandlery

* derp

* herp

* color

* that just makes sense

* recycle candles

* alright

* IT'S A FEATURE

* it just makes sense

* offset

* This way we can also blow off the flame of flammin drinks

* blood candle food

* water will extinguish candles on snacks too
2024-02-09 00:02:16 -06:00
DeityLink
0b49f503fc Fix Glass Tiles (#35731) 2024-01-06 15:06:52 -06:00
Kurfursten
03f839fe50 Bolts (#34525)
* Bolts

* Finished

* Fixed frakenbolts
2023-12-31 01:36:44 -06:00
DeityLink
a26bd09c0c Fixes missing blueprint and light tile icons (#35598) 2023-12-15 19:03:50 +00:00
Kurfursten
34ea4d1392 Library Sprites (#35557)
* Library Sprites

* missing /
2023-12-12 12:33:37 -06:00
DeityLink
30f9caeb59 The Paint & Linen Update [Splinter 6]: Flax, Linen, Weaving, Sewing, Dyeing (#35538)
* Soft Reset

* fixing typos and stuff

* 😌

* fix types here and there
2023-12-10 18:08:47 -06:00
DeityLink
0f9180bf19 The Paint & Linen Update [Splinter 4]: Painting Brush, Palette, Canvas, and Paintings changes (#35530)
* Soft Reset

* fix issues

* radium fluff

* :agony:
2023-12-10 17:53:03 -06:00
DeityLink
3ec956fbca The Paint & Linen Update [Splinter 3]: Mapping Changes (#35529)
* Soft Reset

* dme edit

* bigstacks of cloth

* fixing snaxi conflicts
2023-12-10 17:39:37 -06:00
DeityLink
dd749c36c4 The Paint & Linen Update [ATOMIZED] (#35451)
* Soft Reset

* better nanopaint cost

* AHHHH
2023-12-10 17:29:37 -06:00
DeityLink
04eaaf7153 The Paint & Linen Update [Splinter 5]: Painting Floors, Walls, Paint Rollers, High Rollers (#35534)
* Soft Reset

* white define

* alpha define

* high roller starting mats, recyk, and melt temp

* open container check

* removed radium prank, moved to a special interaction with the painting brush

* fixing conflicts in items.dmi (removed coin icons moved to coins.dmi)
2023-12-10 17:04:17 -06:00
RealestEstate
a08211de72 New Silver and Gold Tiles & Walls (#35257)
* adds silver and gold architecture

* Both new and old, silver and gold, wall and tile, can be in style...

* remove unnecessary variable

* old tiles renamed to alternate tiles. Making walls with tiles has alternate display text than standard material stacks.

---------

Co-authored-by: realestestate <>
2023-12-02 23:25:58 -06:00
nervere
d90bdde622 Update nanopaste.dm (#35482) 2023-12-02 19:22:39 -06:00
DeityLink
d6d7317222 Rapid Cable Layer rewrite & Cable Coilours (#35241)
* RCL Revolution

* Polishing

* fixing conflicts

* aight

* SpaceRCL

* Fixing Conflict & macro name

* fixing conflicts
2023-10-29 21:55:15 -05:00
DeityLink
93919d9e7c Catwalks (#35249) 2023-10-29 20:50:45 -05:00