juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,842 Commits 57 Branches 0 Tags
b7e4fbb74addd9e59c5a2aa4e4aef7300c0709ce
Commit Graph

31842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Southbridge
915234a043 Cog Station - Dirt Fix (#34355) 
Cog
 2025-01-10 01:35:09 -07:00
Southbridge
ad59eea64e Marathon Station - Dirt Fix (#34354) 
* Marathon

* Rerunning tests
 2025-01-10 01:35:00 -07:00
Southbridge
4b1b4c0114 Omega Station - Dirt Fix (#34353) 
omega
 2025-01-10 01:34:53 -07:00
Southbridge
869ecb2923 Fland Station - Dirt Fix (#34352) 
Fland
 2025-01-10 01:34:43 -07:00
IProduceWidgets
0bc17159ae Oasis updoot the dimmining (#34347) 
updooty
 2025-01-09 23:57:39 -07:00
PJBot
ac2eb887dc Automatic changelog update 2025-01-10 06:56:12 +00:00
Southbridge
edbc861c78 Add copy threshold button to air alarms (#34346) 2025-01-09 22:55:05 -08:00
Errant
0b1ed3ec7e Fix battery charging stopping just short of being full (#34028) 2025-01-10 17:54:55 +11:00
Alpaccalypse
b42a01580c Renamed water melon juice to watermelon juice (#34341) 2025-01-09 19:28:03 -05:00
ScarKy0
dd28f17b9a Fix access configurator debug assert (#34330) 
* fix

* greytide fix

* fix admin log

* Dirty
 2025-01-09 19:22:28 -05:00
PJBot
abf7f62e6f Automatic changelog update 2025-01-09 20:25:38 +00:00
Alpaccalypse
36cbd07c07 Drink titles and soda vendor consistency (#34178) 
* Made capitalisation of proper names consistent.

* Roy Rogers is presumably a proper name.

* Second pass at distinguishing proper names only.

* Two nitpicking/minor changes

* Fixed some overlooked can brand names. Matched case with descriptions.

* Switched generic sodas with brands for SodaInventory

* Removed commonly available branded cans

* Matched case consistency used elsewhere. Minor SPAG corrections.

* Added "nothing" and some missing alcohol bottles to RandomSpawner

* Added distinct ad and bye chatter to Dr. Gibb machines.

* Revert "Added distinct ad and bye chatter to Dr. Gibb machines."

This reverts commit f90b8a470556de05aca81255db8b6b03596ae944.

* Revert "Removed commonly available branded cans"

This reverts commit 43b82168dac1f73b187b7677f34ecdd33b6bb81a.

* Revert "Switched generic sodas with brands for SodaInventory"

This reverts commit f1790f0ce61ef135c79068de6a741e8bb50d85d3.

* Lowercased DrinkGlass suffix. Moved alcoholic drinks from drinks to alcohol.

* Renamed energy drink to Red Bool. Corrected and added some jug descriptions.

* Added reagent names for all bottles except poison-wine

* Revision of title case for cocktails

* SPAG and fixed the only brand reagen with unbranded name.

* Possibly controversial, shortened some bran names to better fit the UI.

* Fixed some inconsistencies in naming

* Matched brand localisation change

* Two name style edits

* Fixed Smite bottle name

* Minor, punctuation

* Blank line to end of file

* Upgraded descriptive names to title case

* Banana Mama

* reverts change, moved to another PR to avoid conflict.

* Removed caffeine reference.

* Minor, corrected some more inconsistencies

* Removed Bottle of Nothing from random spawner.
 2025-01-09 21:24:31 +01:00
Ed
c41927cdf2 Bugfixes (#716) 
* job localization fix

* Update job.ftl

* metall scraps

* tomato seeds craft

* fix #105

* health alerts fixed

* bucket size fix

* hat fix
 2025-01-09 22:28:39 +03:00
A.Ne.
c3976dd08d plants inspection, resolve #449 (#615) 
* plants inspection, resolve #449

* Update farming.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-01-09 22:05:22 +03:00
Nim
1af112aeb2 candle (#713) 2025-01-09 21:26:14 +03:00
Ed
9ab34417f4 More Bank positions (#715) 
* add bank positions

* Update sell.yml
 2025-01-09 17:23:35 +03:00
Nim
005a6012be sound (#714) 2025-01-09 16:40:18 +03:00
Ed
f1fc16c6f0 Update CP14IgnitionModifierComponent.cs 2025-01-09 15:27:28 +03:00
PJBot
66810ef257 Automatic changelog update 2025-01-09 11:24:44 +00:00
deltanedas
04984984fe change locking to use ComplexInteraction (#34326) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2025-01-09 12:23:37 +01:00
Ed
2b0fa46857 david balance pass (#712) 2025-01-09 13:13:35 +03:00
PJBot
fdbb3c8f39 Automatic changelog update 2025-01-09 08:55:16 +00:00
Southbridge
e0b2d000ef Amber Station - Fixes and Warm Lights (#34324) 
* Added warm lights, placed them around the map, also fixed an issue with the MV wire in the cafeteria

* Fixed lv wiring in caf, and adjusted a couple things

* Empty commit to force checks to rerun
 2025-01-09 09:54:04 +01:00
flymo5678
ba9eed7670 Added missing cameras to Loop Station (#34308) 
* Added missing cameras

* Added missing cameras
 2025-01-08 16:38:13 -07:00
Nim
4366e940cb armor (#710) 2025-01-09 00:46:53 +03:00
Nim
76d828e9fd Мелочи фидбека (#709) 
* things

* chees

* hmm

* tag

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-01-09 00:46:27 +03:00
Ed
00ecf1f4b6 Health alerts + Modular tools labeling renaming (#708) 
* fix health alert

* grips label

* Update grips.yml
 2025-01-08 23:22:58 +03:00
PJBot
60e1c6f515 Automatic changelog update 2025-01-08 15:24:42 +00:00
c4llv07e
904d75c8a9 Fix empty lines in adminwho with stealthmins. (#34122) 
Don't print newline if admin is hidden.
 2025-01-08 10:23:33 -05:00
Ed
815c031a16 localization sync 2025-01-08 15:31:17 +03:00
Ed
8248fcb07e Events tweaks (#707) 
* mosquito + outbreak markers

* Update comoss.yml

* Update monster.yml
 2025-01-08 14:16:38 +03:00
flymo5678
c1aaf64521 Fixed Loop Station's southern solar array unlinked airlocks (#34296) 
Fixed Southern solar external airlock door bolts
 2025-01-08 04:10:50 -07:00
Southbridge
8945ac3560 Amber Station - Balance Improvements (#34294) 
changed the center area in med bay to a garden, weakened meteor shielding in some areas, also general touch ups around the station
 2025-01-08 02:13:39 -07:00
Piras314
010924611d Happy New Year (#34288) 
happy new year
 2025-01-08 03:50:46 +01:00
PJBot
4d26ea619e Automatic changelog update 2025-01-08 01:01:30 +00:00
Tayrtahn
23f0b304f2 Add bleating accent to goats (#34273) 2025-01-08 02:00:20 +01:00
Pancake
90b46699f6 Update vessel_warning.ogg (#34263) 
* Update vessel_warning.ogg

Remove DC offset and apply short fade out.

* Update attributions.yml

* Update attributions.yml
 2025-01-08 03:51:53 +03:00
Ed
228a7226ff Random events (#706) 
* first game event! Closet skeleton!

* demiplane outbreak gamerules

* Update game_presets.yml

* d
 2025-01-08 02:55:54 +03:00
slarticodefast
45e0b9eb92 merge stable to master (#34279) 2025-01-08 00:22:02 +01:00
ArtisticRoomba
e0163fb022 [HOTFIX] Fix Meta station power (#34256) 
* hotfix meta power

* fixed AME

* add missing cargo shuttle pilot console to cargo
 2025-01-07 16:03:10 -07:00
Ed
5c21ec2774 fix 2025-01-07 23:41:42 +03:00
SlamBamActionman
3238c2e144 [HOTFIX] Fix chameleon PDAs renaming IDs (#34249) 
Fix chameleon PDA
 2025-01-07 20:31:54 +01:00
Tayrtahn
483ac50f5f Fix portable scrubber appearing powered on spawn (#34274) 2025-01-07 19:48:32 +01:00
Pieter-Jan Briers
af75c1a92b Fix compilation errors in tests from update (#34272) 
Required for https://github.com/space-wizards/RobustToolbox/pull/5590 to not cause compile fails, but can be merged on its own
 2025-01-07 19:27:54 +01:00
nikthechampiongr
4a3d3efd62 Implement approved rule changes (#34233) 2025-01-07 19:04:42 +01:00
PJBot
aa458a24ca Automatic changelog update 2025-01-07 17:46:10 +00:00
Alpaccalypse
b4e2a3693f Special reagents now appear in the guidebook (#34265) 
* Special reagents now appear in the guidebook

* Improved guidebook wording for reagent category
 2025-01-07 18:45:02 +01:00
nikthechampiongr
2d78b6c930 Implement approved rule changes (#34233) 2025-01-07 17:58:28 +01:00
Ed
35eb0c48c1 Graves and Tombstones (#705) 
* dirt grave

* Update grave.yml

* tombstone

* Update grave.yml
 2025-01-07 18:08:47 +03:00
Alpaccalypse
43db40c487 Added distinct ad and bye chatter to Dr. Gibb vending (#34182) 
* Added distinct ad and bye chatter to Dr. Gibb vending

* Correcting revert mistake

* Changed ad pack names to better match naming convention
 2025-01-07 09:10:16 -05:00