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

29142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
f5503352b9 add GuideHelp to alchemy equipment 2024-10-29 12:06:23 +03:00
Ed
817c53d98f Merge branch 'master' into ed-29-10-2024-upstream 2024-10-29 11:51:03 +03:00
Ed
cc80518d2f World minor changes (#519) 
* x2 weather time

* remove alchemy test and battle royale maps, add simple island map

* island map + ocean parallax

* map floor occluder sys

* undercliff test

* update sand and ocean sprite

* Revert "undercliff test"

This reverts commit c484fe630a.

* more experiments

* Revert "more experiments"

This reverts commit a7f30fd608.

* Update default.yml

* Update debug.yml
 2024-10-29 11:48:52 +03:00
Ed
ae3cbd6092 Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
 2024-10-29 11:16:56 +03:00
PJBot
a8c512c769 Automatic changelog update 2024-10-29 05:09:03 +00:00
metalgearsloth
94e686ca9c Fix separated game screen bumping (#33046) 
I don't really understand why RecordedSplitContainer exists but removing it looks identical and fixes the panel bumping occasionally.
 2024-10-29 16:07:57 +11:00
PJBot
a5a5840ee0 Automatic changelog update 2024-10-29 05:01:37 +00:00
deltanedas
63f8aba359 fix lava expeds (#33042) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-10-29 00:00:28 -05:00
Moomoobeef
6236d1abb3 Updated an incorrect sprite in the smite menu (#33043) 
changed the synth sprite used in the icon for the instrumentify smite out for the more accurate supersynth sprite
 2024-10-28 23:35:48 +01:00
lzk
dc3a2f6d28 add StartDelay bool to actions (#33026) 
* add StartDelay bool to actions

* forgot summary
 2024-10-28 23:21:14 +01:00
joshepvodka
7ac2d9a8bd Adds beacon to core station's vox box (#33004) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon

* fixes messed up diff
 2024-10-28 16:05:01 -06:00
joshepvodka
dbef6cbecc Adds beacon to oasis station's vox box (#33003) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon
 2024-10-28 16:04:49 -06:00
joshepvodka
e900ad7742 Adds beacon to bagel station's vox box (#33002) 
* added vox beacon

* changed name to vox break room

* added voxbox station beacon
 2024-10-28 16:04:37 -06:00
joshepvodka
93315d4695 Adds beacon to box station's vox box (#33001) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon
 2024-10-28 16:04:10 -06:00
joshepvodka
30017bc2d8 Adds beacon to cog station vox box (#33000) 
* added vox beacon

* changed name to vox break room

* added vox box station beacon
 2024-10-28 16:03:13 -06:00
PJBot
1ef5b2226a Automatic changelog update 2024-10-28 21:26:41 +00:00
August Sun
67332502c1 Extends the minimum round time for meteor swarm events (#32876) 
* adjusted minimum timers in meteorswarms.yml

* Updated timer minimum from 20 to 15 minutes

* Reduced minimum timer to 10 minutes as a result of other meteor changes

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
 2024-10-28 22:25:33 +01:00
PJBot
f86798792b Automatic changelog update 2024-10-28 18:01:10 +00:00
Stalen
0468c0f6bb Fix playtime formatting (#32974) 2024-10-28 19:00:37 +01:00
Stalen
24f79c3ecc Fix playtime formatting (#32974) 2024-10-28 19:00:00 +01:00
BramvanZijp
a4717556e1 Fix loneop spawnrate by reverting it to not use the shuttle event system. (#32942) 
Fix loneop spawnrate by reverting it to not use the custom shuttle event system.
 2024-10-28 18:52:21 +01:00
Theodore Lukin
ee445c4938 make ai speak robotically (#33025) 2024-10-28 18:36:35 +01:00
FluffMe
08d0077719 Fix TestSuicideByHeldItem and TestSuicideByHeldItemSpreadDamage (#33030) 2024-10-28 11:52:49 +01:00
Ed
b14c75390c biological weapon (#518) 2024-10-28 13:05:01 +03:00
Vasilis
7e526da521 Fix Bug With Uppercase Radio Keys (#32997) (master) (#33031) 
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
 2024-10-28 00:35:23 +01:00
Thomas
4fbe50ab28 Fix Bug With Uppercase Radio Keys (#32997) 2024-10-27 11:41:29 -07:00
Ed
3e43d0695f Some tile update + dayflin resprite (#517) 
* foundtion update

* dirt from grass and seedbed craft rebalance

* crowbar, tile prying

* fix high fence

* yellow dayflin sprite update

* fix currency calculation bug

* Update sewing_table.yml
 2024-10-27 21:37:15 +03:00
Ed
2850665e33 Tavern map update (#516) 
* recursive currency calculation

* map update

* fix
 2024-10-27 17:09:06 +03:00
Nim
c2404d6c0c Zombies climbing in and other things (#515) 
* hehe

* tweak
 2024-10-27 14:42:11 +03:00
PJBot
a1c36dcb79 Automatic changelog update 2024-10-27 04:27:02 +00:00
slarticodefast
4252fdffb9 fix pie throwing sound not playing (#33017) 2024-10-27 15:25:54 +11:00
github-actions[bot]
6486cdf183 Update Credits (#33016) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2024-10-27 15:24:45 +11:00
Ed
546e1d8fa1 Tomatoes + farming trading (#513) 
* farm trading

* ruond prices

* add tomatoes sprites

* TOMATOES

* Update tomatoes.yml
 2024-10-27 01:26:22 +03:00
Moomoobeef
9d6e6257bd Removed the name "Hujsak" (#32998) 
removed hujsak
 2024-10-26 12:29:40 -05:00
PJBot
427817e237 Automatic changelog update 2024-10-26 17:23:15 +00:00
Saphire Lattice
a95c8baf28 Add health analyzer unrevivability warning (#32636) 
* Add health analyzer unrevivability warning

* Remove errornous comment
 2024-10-26 19:22:08 +02:00
Ed
08a4c4340d Bank implementation (#512) 
* get currency refactor

* bank work

* finish vault markers

* add bank doors

* map update

* loadouts

* Update CP14StationTravelingStoreShipTargetComponent.cs

* oopsie
 2024-10-26 18:18:30 +03:00
PJBot
dcb615d678 Automatic changelog update 2024-10-26 04:01:56 +00:00
Moomoobeef
97ef4637fd bowls now make drinking sounds (#32819) 2024-10-25 23:00:49 -05:00
Ilya246
5a10bf0954 add atmosia to devmap (#32460) 
change
 2024-10-25 22:04:27 -05:00
PJBot
988b62074f Automatic changelog update 2024-10-26 02:17:52 +00:00
BramvanZijp
66432c5cd8 Fix loneop spawnrate by reverting it to not use the shuttle event system. (#32942) 
Fix loneop spawnrate by reverting it to not use the custom shuttle event system.
 2024-10-26 13:16:45 +11:00
PJBot
6998fa83a4 Automatic changelog update 2024-10-25 22:48:20 +00:00
slarticodefast
e3f442e790 Add flash reaction effect (#32377) 
add flash reaction effect
 2024-10-26 00:47:11 +02:00
Vasilis The Pikachu
9b0ae98836 Merge branch 'staging' of ssh://github.com/space-wizards/space-station-14 into staging 2024-10-25 21:11:20 +02:00
Jezithyr
ae1c5572fc Applying Fix from #32764 to staging 2024-10-25 21:09:56 +02:00
Vasilis The Pikachu
c28665c7d3 Merge branch 'staging' of ssh://github.com/space-wizards/space-station-14 into staging 2024-10-25 20:33:08 +02:00
chromiumboy
1307733c4b Make atmos alert computer colors private variables (#32992) 2024-10-24 23:34:52 -07:00
chromiumboy
5ff5a72a7c Fix multiplying colors of differing nullabilities (#32991) 2024-10-24 21:06:38 -07:00
Ed
c31f1ad130 Banker and commandant outfit + fix purchase bugs (#509) 
* reaname QM to commandant, and merchant to banker

* Update game_presets.yml

* add bureaucracy crate

* fix buying

* bowler hats

* reorganize shirt folders

* cloak refactor, add commandant cloak

* Update battle_royale_temp.yml

* Update migration.yml
 2024-10-25 00:23:35 +03:00