* renamed Δv railing to reinforced variant
* made delv railings craftable, TODO: fix decon and hitbox
* wip
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* commit fixes by the illustrious verybigman311
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* fix: ergo chairs now unanchored on creation, counter corner textures fixed. TODO: counter intersect texture redos for metal, wood, craft
* rug and mat constructiongraphs added, countertops fixed. rug orientations need to be fixed
* i hope this will still work
* out of time
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* i forgot to remove this
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Delete useless constructiongraph
Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>
* Revert "Delete useless constructiongraph"
This reverts commit 2be446d310.
* final changes before review, fix offset desks
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Update Resources/Prototypes/Entities/Structures/Walls/railing.yml
Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>
* Update Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/rugs_carpets.yml
Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>
* Apply suggestions from code review
Co-authored-by: muon <ilovetoaaaaaainthemorn@gmail.com>
Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>
* Apply suggestions from code review
Co-authored-by: muon <ilovetoaaaaaainthemorn@gmail.com>
Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>
* add locids
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* revert alt desk to normal
* fix test fails
* fix test fails pt. 2
* hopefully last fix
* rug fixes
* fix up mats required
* oops i forgot to add this
* Apply suggestions from Toby222's code review
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: muon <243844715+muonpoly@users.noreply.github.com>
* Apply additional suggestions from Toby222
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* oookay one last thing maybe
* apply additional review changes
---------
Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>
Signed-off-by: muon <243844715+muonpoly@users.noreply.github.com>
Co-authored-by: iipro-rgb <71106851+iipro-rgb@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
* .rsi
* mini vial
* try stop TryStopNukeOpsFromConstantlyFailing from failing
* slight sprite change
* mail and lathe recipe
* real test fail
* resolve arbitrage
* cleanup
* always forgetting something
* always forgetting something
* drink no more
* remove integrated vial
* initial port
* Rename the rsi states
* Rename the rsi states
* up to standards
* finish
* testfail
* minor touchup
* arby
* op
* mix meta
* small changes to the vials
* commit
* commit
* style nit
---------
Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
* add sprites
* update sprite
* repaired sprite
* repaired pinpointer
* different id
* piece of pinpointer core
* borgs drop the piece
* end of file new line
* typo
Co-authored-by: āda <ss.adasts@gmail.com>
* make the tape darker
* four variations
* same variation in the crafting menu
---------
Co-authored-by: āda <ss.adasts@gmail.com>
* PUSH!!!
* Femtanyl
* eh swap em back
* My PR is ruined!!!
* review 2 electric boogaloo
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Add craft for bonfire and bonfire with stake
* review
* review
* nullable MaxFireStacks
* retry
* retry
* review
* I will change it and hope that they will agree with me
* Revert "I will change it and hope that they will agree with me"
This reverts commit 83823692d0116bf9aa9eceb85a10e95c88b51fb9.
* construction
Merged the graphs
Changed the bonfire stake ID to follow the proper naming scheme
* add destroy sound
* planks Instead of logs
* of course I forgot about ftl
* Slarti review + Princess review
Yes I sneaked an admeme abuse change here
* a small fix
* clamp firestacks
* This was on purpose, leave as is
This reverts commit 7d63e38b66cb63e5e50b7fac5030013e2ef508b5.
* irrelevant
* Fixtures
* cleanup
---------
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Add 6 new ironsand tiles
Ironsand plating and ironsand tile are based on the asteroid plating and
asteroid tile tiles. Ironsand concrete tiles are based on the concrete
and gray concrete tiles. Packed ironsand is slightly based on smooth gray
concrete, but mostly original.
* Add ironsand cobble wall
* Finish adding tile objects for ironsand concrete tiles
Includes inhands, even though the other concrete tiles don't even have
'em.
* Add cutter recipes for ironsand concrete
I'm sad that I can't require iron ore for these recipes. Iron ore can't
go in a cutter, though, and changing that seems like it'd be more
complicated than it's worth. Assuming I don't just make the thing accept
any and all ores, which... um.
* Delete temporary .swp file that shouldn't have been in the repo to begin with
* Add ironsand pavement tile
* Add ironsand stone door
* Add ironsandstone walls
* Improve packed ironsand texture
* Add ironsand step
* Add ironsand step corner
* Add three mysterious, runed pillars
* Lighten ironsand wall border
* Replace art for paved ironsand
* Make steps more closely match paved ironsand tiles
* Increase border contrast of ironstone door
* Add fake "astro-" versions of ironsand tiles
* Add second tall pillar sprite
* Add prototype for second tall statue
* Make astro-ironsand researchable and latheable
* Update corner step texture to match straight steps
* Add corner steps that go the other way
* Add door variant to match cobbled ironsand wall
* Fix license for ironsand step sprites
* Darken ironsandstone walls for better contrast
* Update ironstone doors to match walls and be more distinct
* Remove merge conflict detritus
* Fix duplicate component
* Update tile stack prototypes
* Add detail to copyright info
* Improve ironstone wall and door destruction
* Normalize ironsand statue prototypes
* Normalize ironsand tile object prototypes
* Move ironsand plating in with the rest of the plating tiles
* Remove .gitignore additions
I might just make a new PR just for this, though. I'm very tempted.
* Add sound effect to ironsand step destruction
* Add abstract base class to stairs and steps
* Remove redundant destruction trigger behavior from cardboard door
* Add destruction behavior to ironsand statues
* Fix up ironsand step prototypes
* Remove redundant bits from ironsandstone wall prototypes
* Remove ironstone door crush behavior
* Add individual ironstone statue bounding boxes
* Make ironstone statues shootable
* Tweak ironsand statue bounding boxes
* merged chemical into bloodstream
* changed injectable to bloodstream
* separated bleeding and direct blood removal
* removed blood gain from protein
* reduced blood gain from saline
* rejuvenating fills to reference volume
* fixed blood regulation
* red mead requires stirring to make
* reverted accidental line deletion
* cleared the skeletons from the closet
* additional routing
* field rename for xeno
* removed mention of chemstream and field rename for asteroid mobs
* minor optimizations
* Revert "reduced blood gain from saline"
This reverts commit de26fd1c0d99f3019fe7dd1451a50230cc90f058.
* Revert "removed blood gain from protein"
This reverts commit 7a1648caf39fe26406db73c2a5afa389b82c612f.
* removed unused component fetch
* dead check mini refactor
* eventized blood exclusion
* quick fix
* Pain
* Commit of doom
* COMMIT
* renamed bloodMaxFactor to MaxVolumeFactor
* addressed floating point error
* returned vomiting chemicals
* blood reagent always skips the flush
* no need to mention blood reagent
* fixed passing blood flush
* adadsafasfasfassfasf
* whoops
* merge fixed injectors
* Revert "adadsafasfasfassfasf"
This reverts commit 0a5313a68dd6484d36d28d08930c76851b72ae38.
* simplify reagent removal
* enabled foreign blood transfusion
* Revert "COMMIT"
This reverts commit 19abd679cd7761ebd47bb242bd644176a3006a42.
* simplified reagent removal when modifying blood level
* removed misleading coment since the changes
* documented MetabolismExclusionEvent
* fixed negative negative modification of blood level
* fixed hypervolemia not normalizing
* constrainted blood modification
* returned bloodpack stop on fully healed
* forgot to stage this
* band aid for diona blood
* swapping GetReagent with GetPrototype
* optimize blood filtering
* multiplicative multi reagent blood level calculation
* removed unused stuff
* optimized blood calculation a tiny bit
* added per reagent blood regulation
* optimized (referenceVolume + bloodReagents) into referenceSolution
* polished coded to proper function
* forgot to stage rootable system change
* clean up, unnecessary GetBloodLevel call
* rename method name to TryAddToBloodstream instead of Chemicals
* placed overfill safety
* cleanup and final touches
* final touch
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* add door control module
* some commentary
* can't eject stuff anymore
* make xenoborg door remote eletrify doors
* clean yml
* anchors and aliases
* not show stuff about id in xenoborg access config
* engi xenoborg can see eletrified doors
* Added random gate
* minor edit
* cleaning up my shit after trying to do something faster
* new lines
* some changes
* joke
* UI
* Long Division
* Dont use ctrl + x in 3 am
* I hope these are the final touches
* One thing, I don't know why
* noname commit
* no way, 1kk of code lines edit
* sudo rm -rf ... and something there...
* update
* sometimes its sad
* Add files via upload
i dont know what im doing but this seems legit
Signed-off-by: jimbobby-the-FUCKING-first <Dcmontgomery123@gmail.com>
* Update shotguns.yml
adds the forged sawn off yaml
Signed-off-by: jimbobby-the-FUCKING-first <Dcmontgomery123@gmail.com>
* Update shotguns.yml
makes the forged saw-able
Signed-off-by: jimbobby-the-FUCKING-first <Dcmontgomery123@gmail.com>
* Add files via upload
makes the forged gun saw-able even more
Signed-off-by: jimbobby-the-FUCKING-first <Dcmontgomery123@gmail.com>
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Update meta.json
put that , there
Signed-off-by: jimbobby-the-FUCKING-first <Dcmontgomery123@gmail.com>
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* fix filepath oopsie
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
---------
Signed-off-by: jimbobby-the-FUCKING-first <Dcmontgomery123@gmail.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
* easier to just redo the PR rather then fix the old one
* remove comment
Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
---------
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
* new cryo chem and adding topicals to medivends and med's techfab
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* me when dumb and tired and on phone
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
* woof
* Update Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
* Update Resources/Prototypes/_DV/Reagents/medicine.yml
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* ok maybe that fixes it if not will look at later
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
* did the />
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
---------
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* change name from heavy laser to laser cannon
* fixed some ids
* fix name and description
* change cost of upgrade modules
* remove unwield penalty
* commentary
* change name of scout modules
* same firerate as before
* typo
Co-authored-by: āda <ss.adasts@gmail.com>
* new line at end of file
* duplicated
---------
Co-authored-by: āda <ss.adasts@gmail.com>
* Tweaked reagents required for recipes, increased output of recipe, lowered time of accent per unit, and tweaked chem thresholds
* tweaks
i was lazy
* product change
lazy again
* yuh
* pluh
---------
Co-authored-by: NoreUhh <noreuhh@gmail.com>
* Give Rust Removal a shorter Doafter (#770)
* Yeah, yeah, mircobalance. Every janitor player will fight you though. Welding and brushing walls free of rust now takes just three seconds.
* Now reinforced walls take a bit longer to de-rust. Times are as follows:
Solid wall: 1s weld, 3s brush
Reinforced wall: 2s weld, 3s brush
* Actually, just make both take 4s to brush and 1s to weld. Problem solved.
* changed the welding timer from 1 to 2 seconds for lag compensation.
* was it worth the hype
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* minor stuff
* multi-ingredient recipe support
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* oil transfer
* explosions and fire
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* make the yaml linter happy
* YML recipes
* typo ops
* review
* Apply suggestions from code review
Milon told me to.
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
* Added Jet Injectors
* Small fixes
* YML Linter fix
* Requested Adjustments
* Better Sprites for the Jet Injector
* Actually forgor to give credit
* Fix merge conflicts and refactor
* Undo Oversight
* Introduction of Advanced Jet Injectors
* minor oversight
* Adhere to requests
* Remove Loadout, add Lockers
* harder better faster stronger
* vend shortage
* Sound effect
* will this work or do I just gotta choose one at random???
* alright fine I'll do it this way
* quiet the hissing, raise the pitch
* Merge new sprites
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Voice Signaler can be Linked
* Fixes and Balancing
* a space has officially been added
* thinmfg
* things
* finalized everything I think?
* fixed??
* actually commit please (imagine this fixes everything im gonna cry)
* new fix
* Update Resources/Prototypes/Entities/Objects/Devices/Electronics/misc_linking_utilities.yml
added as per review
Co-authored-by: āda <ss.adasts@gmail.com>
* connection range from 25 to 15
* Renamed state from 'voice' to 'icon'
* Change state from 'voice' to 'icon' in YAML
* removed comma from voicesensor sprite yml
* Modify defaultLinks for Trigger source port
Updated defaultLinks for Trigger source port.
* Changed PNG name from voice to icon
* Removed G menu recipe and added autolathe recipe
* Fixed test fail
* removed empty line
* removed another line
* removed extra lines in meta.json
* test commit to rerun tests
---------
Co-authored-by: āda <ss.adasts@gmail.com>
* Flavors, Flavor Profiles, Reagent Text
* Base Reagent and Mix reaction
* Borkinase, flavor stuff
* Final touches me thinks
* Comment out shit
* Update fun.yml
removed comments
* Update fun.yml
Increased output for borkinase and felinase
* explosive reaction
creates razorium when mixed and makes a radioactive explosion. screaming explosion funny!!!
* reagent descriptions
updated em
* chem is no longer nuclear bomb
* remove tile-break scale
* recipe change
done through web view dont kill me im lazy
* removed cellular, halved rads
done through web again, dont end me thanks
* updated locale to reflect name change
* updated reagent to reflect name change
* updated reactions to reflect name changes
---------
Co-authored-by: NoreUhh <noreuhh@gmail.com>
* rename kira
* these one too
* migration
* Revert "migration"
This reverts commit ae0006ef745909c2e17b37fd18fd1d57204fe773.
* Revert "these one too"
This reverts commit 9757d2cf6898719b158e03c0f3b637cd2b55ce17.
* Revert "rename kira"
This reverts commit 170408c6f7486a6746b7a7c52cf10c597ead2608.
* bless the emo
* aaaaa
* time to end this right here and right now
* Revert "time to end this right here and right now"
This reverts commit b2c38573f9f8b5e8f736443d646d26839a0694cf.
* Revert "aaaaa"
This reverts commit 0f9451e22533b2f646211219e04103ce16d952ca.
* Revert "bless the emo"
This reverts commit 223607accf81e286481cab8d1037b1eb89a44dac.
* rename
* bikeshedding
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Folders recycle into paper, clipboards recycle into wood/plastic and steel
* CC clipboards also contain some cloth
* The nuclear code folder is also made of paper
* Whoops, violated the laws of thermodynamics
* Whoops, broke the laws of economics
* Made a new generic borg module for art; the Artistry Module!
* Made requested changes, changed the crayon emptyRepresentatives
* Did the thing.
* Added updated action sprite,with thanks to TiniestShark, also Attempted to fix the merge conflict
* changed empty representative of red to rainbow
* Added recharging crayon 'Electric Crayon' and sprite to the borg module, removed redundant extra crayon slot.
* Added requested changes, replaced old spraypainter with new recharging borg spraypainter
* Forgot to readd the recyclable tag to Crayon
* Removed compressed paint hand
* add table and curtains as constructables; carpet now in printer
* add textures
* whoops, didn't mean to change that
* textures v2
* add open curtain proto
---------
Co-authored-by: Quasr <~182430031+quasr-9@users.noreply.github.com>
Theo
Tobias Berger
muon
ScarKy0
āda
Samuka
Princess Cheeseballs
Hitlinemoss
B_Kirill
Aearo-Deepwater
Nikovnik
Borsh
Velken
BarryNorfolk
KOTOB
jimbobby-the-FUCKING-first
Pharaz4
AeraAulin
keekee38
NoreUhh
Nuggets219
SolidSyn
Astra
Milon
Apachito
Sir Warock
LukaSlade
rumaks
kosticia
Vanessa
Moomoobeef
Kittygyat
Wolfkey-SomeoneElseTookMyUsername
Quasr