Commit Graph

15175 Commits

Author SHA1 Message Date
PJBot 2e0d22bc90 Automatic changelog update 2024-02-27 13:02:30 +00:00
PJBot 6343eb5759 Automatic changelog update 2024-02-27 07:58:22 +00:00
rosieposie 8dd1748cec
Lockable Buttons & Button Frames (#25631)
initial commit
2024-02-27 00:57:17 -07:00
PJBot a411810171 Automatic changelog update 2024-02-27 01:39:07 +00:00
Julian Giebel 0752acdc2c
News UI overhaul and PDA notifications (#19610) 2024-02-26 21:38:00 -04:00
Emisse cb45b6c072
train update (#25626) 2024-02-26 17:12:46 -07:00
PJBot 5ad5739706 Automatic changelog update 2024-02-26 23:35:20 +00:00
Zadeon 133bd0353a
Adds minable salt "ore" (#25324)
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.

* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json

* Added chlorine to the list of solutions salt gives when used in the grinder.

* Gave salt ore and salt rock overlay unique sprites.

* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition

* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.
2024-02-26 16:34:15 -07:00
PJBot 8e951f3582 Automatic changelog update 2024-02-26 23:32:43 +00:00
PJBot bd99c0dcdb Automatic changelog update 2024-02-26 23:30:01 +00:00
Velcroboy 32a440b487
Adjusts wallmount arcs and partially fix nanomed issues (#25451)
* Adjusts wallmount arcs and partially fix nanomed issues

* wall closets

* Guess it wants this

* Adjust arc to 175

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-02-26 16:28:55 -07:00
PJBot a6f2146885 Automatic changelog update 2024-02-26 23:27:55 +00:00
PJBot acc7927d94 Automatic changelog update 2024-02-26 23:26:50 +00:00
Whisper ff65cb7b0c
Whisper bleed update v3 (#25434)
* Whisper bleed update v3

* missed a few

* Add bleeding message to health analyzer.

* Fix bleed notification not updating.

* Apparently this either doesnt exist
2024-02-26 16:26:46 -07:00
Sphiral 88ae71715b
More windoors (starring directional window) (#25501)
* Added Plasma and Uranium Windoors, plus uranium directional windows

* I forgor the locked proto's too ;-;

* Skill issue, forgot to remove something that was a test

* Please dear git tests, let me sleep (ShardGlassRUranium indeed does not exist)

* No more static prices for windows/windoors

* I wish I knew how to run the tests locally ;-;
2024-02-26 16:25:44 -07:00
PJBot 9015573a49 Automatic changelog update 2024-02-26 23:20:57 +00:00
Ed 7a5f81ddb4
Handheld Mass Scanner (#25526)
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix
2024-02-26 16:19:51 -07:00
PJBot 79df39ed94 Automatic changelog update 2024-02-26 23:16:59 +00:00
MACMAN2003 0536ce6f95
add NanoTrasen balloon (#25543)
nt balloon

surprised one didn't exist already
2024-02-26 16:15:53 -07:00
SlamBamActionman 3af2928a25
Add nose customization to humans & dwarves (#25557)
Initial commit
2024-02-26 16:15:04 -07:00
PJBot a0b0579d2e Automatic changelog update 2024-02-26 23:12:27 +00:00
Ed 84cbcb93ca
Fancy table (#25562)
* blue

* others

* add white table

* add crafting carpets

* finish carpets

* tags

* crafting

* pip

* finish
2024-02-26 16:11:20 -07:00
PJBot 7fc75f7541 Automatic changelog update 2024-02-26 23:07:15 +00:00
GNF54 b7b6f61f2a
Added several cosmetic items to the Medidrobe (#25582)
Update medidrobe.yml
2024-02-26 16:07:06 -07:00
PoorMansDreams 25deede839
Behonker Lobby Art (#25455)
* Behonker Lobby

* Change to WebP

* More PostProcessing!
2024-02-26 16:06:08 -07:00
Whisper 74232f9831
handcuff replacements are faster to escape from (#25601)
makeshift handcuffs are easier to escape from
2024-02-26 16:05:16 -07:00
Ilya246 849dc43365
macrobomb 20->13 TC (#25585)
Update uplink_catalog.yml
2024-02-26 16:04:26 -07:00
PJBot 7593a2e958 Automatic changelog update 2024-02-26 23:01:56 +00:00
Brandon Hu 5367d99545
fix(cooktime): mushroom pizza are set to the proper cook time of 30 seconds (#25614) 2024-02-26 16:01:21 -07:00
Hanz 6b00f592b6
ERT PDA Fixup (#25606)
meat and potatoes

ayup
2024-02-26 16:00:51 -07:00
PJBot 2faf7433c0 Automatic changelog update 2024-02-26 23:00:21 +00:00
CyberDuck c0290d18f2
Buff/Nerf Gases Cost (#25608)
* Nerf/Buff Gases cost

* Nerf/Buff Gases cost

* Nerf/Buff Gases cost

---------

Co-authored-by: CyberDuck <tsyaslovscky.dima@yandex.by>
2024-02-26 16:00:13 -07:00
Whisper 30e09af2a4
Add weh to: Anomalies, Artifacts, random puddles (#25611)
* Add weh to: Anomalies, Artifacts, random puddles

* also change weh to wehs!
2024-02-26 15:59:15 -07:00
botanySupremist c6bfb657ad
Fixed a few small typos in ghost role information. (#25613)
Co-authored-by: botanySupremist <definitelyrealBotSupremist@gmail.com>
2024-02-26 15:58:44 -07:00
Flareguy 4bf2364f5f
fixes the old ai sat ruin's lights (#25615) 2024-02-26 15:58:16 -07:00
MACMAN2003 89c8226380
Lathe-able LED light tubes and LED bulbs (#25616)
let there be (led) light
2024-02-26 15:58:01 -07:00
Velcroboy 918eb1fe87
fixes arcade tile position (#25620)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-02-26 15:57:29 -07:00
Velcroboy 19ce9edf10
Fix inconsistency in onions (#25619)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-02-26 15:57:19 -07:00
Velcroboy 2efad4f3c5
Cleans up base crates for mapping clarity (#25618)
* Cleans up base crates for mapping clarity

* migration

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-02-26 15:56:41 -07:00
Boaz1111 76823cc522
swapped icons for RCD crates (#25600)
swapped icons for crates
2024-02-26 07:37:49 -05:00
PJBot c02c8c2319 Automatic changelog update 2024-02-26 03:41:54 +00:00
deltanedas 002b8d8871
add crew monitor as traitor steal objective (#25563) 2024-02-25 22:40:48 -05:00
PJBot 2a2324ecaf Automatic changelog update 2024-02-26 02:42:26 +00:00
SlamBamActionman 485fb4cb65
Remove self-uncuff spam suicide, damage changes (#25161)
* Initial commit

* Remove damage from cuffs entirely

* Changed from Action uncuffing cooldown to UseDelay cooldown

* Minor merge conflict fix

* Edit the actual correct line

* Submodule fix
2024-02-26 13:41:20 +11:00
OctoRocket b7be6932f3
[Tweak] Everything can read (#25580)
Everything can read (kinda)
2024-02-26 13:40:22 +11:00
PJBot 90279b3357 Automatic changelog update 2024-02-25 23:42:29 +00:00
Ed 656679cb54
Flora anomaly nerf (#25499)
* Update kudzu.yml

* Update living_light.yml

* files

* Update flora.yml

* Update kudzu.yml

* bul

* Update kudzu.yml

* Update living_light.yml

* bullet immune
2024-02-25 15:41:24 -08:00
hiucko 97d41cf945
add "missing spacepen" poster (#25502)
* add missing spacepen poster

adds missing spacepen poster

* Update meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-02-26 02:33:12 +03:00
PJBot 48604b0019 Automatic changelog update 2024-02-25 23:26:05 +00:00
Ubaser f463cdf3a5
Satchel empty space is now fully transparent (#25147)
* add

* thin spaces

* update
2024-02-25 18:24:59 -05:00