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

28958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stalen
0468c0f6bb Fix playtime formatting (#32974) 2024-10-28 19:00:37 +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
Ed
b14c75390c biological weapon (#518) 2024-10-28 13:05:01 +03: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
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
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
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
Ed
0f6dd2905d Bandit antag (#508) 
* remove default antags

* simple bandit antag

* greetings audio and gear

* fixes

* Update AntagPreferenceTest.cs

* gamemodes

* Update game_presets.yml
 2024-10-24 18:19:14 +03:00
Ed
f2b8713dc2 Clouds overlay fix + Syringe + Localization visuals (#506) 
* fix cloud

* add syringes to alchemist

* remove barrel crafting

* Revert "remove barrel crafting"

This reverts commit d3c5a26136.

* add localization visuals
 2024-10-24 14:11:15 +03:00
Ed
4e3c70a9d1 Iron doors (#505) 
* iron doors

* shirt desc partial fix

* fix
 2024-10-24 12:38:12 +03:00
Thomas
d4da9923ea Fix Emote Chat Sanitizer (#32940) 
* Fix bug?

* Fix :)

* aaaa

* AAAA!!!

* comment

* Nicer code

* What's a pull requestWhat's a pull request?
 2024-10-24 16:10:13 +11:00
PJBot
79c35e0a41 Automatic changelog update 2024-10-24 03:42:11 +00:00
hyphenationc
5a86b88f8f adds Meat Tag to FoodMeatSnake (#32965) 2024-10-23 22:41:03 -05:00
Spanky
92c49afcf2 Packed Update (#32971) 
Packed map update, significantly changes arrivals, perma, AI core, and misc other QOL.
 2024-10-23 16:19:35 -06:00
Ed
0652c3f0b4 Prazat jewelry stones (#504) 
* marble floor

* fix

* bank wallpaper, marble floor resprite

* marble window

* rename whitebrick wall to marble wall, delete iron walls

* job desc fix

* jewelry

* Update jewelry.yml
 2024-10-23 21:25:58 +03:00
Nim
1d43bad57f Dinosaur - Yumkaraptor (#492) 
* dino

* sprite

* fix

* ForkFiltered

* Yumkaraptor

* Update meta.json

* Update meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-10-23 21:25:49 +03:00
FN
1ebe48978e Fix (#503) 2024-10-23 19:44:07 +03:00
PJBot
05a00515ed Automatic changelog update 2024-10-23 12:51:06 +00:00
chromiumboy
d2216835d8 Visualized regions for NavMapControl (#31910) 
* Atmospheric alerts computer

* Moved components, restricted access to them

* Minor tweaks

* The screen will now turn off when the computer is not powered

* Bug fix

* Adjusted label

* Updated to latest master version

* Initial commit

* Tidy up

* Add firelocks to the nav map

* Add nav map regions to atmos alerts computer

* Added support for multiple region overlay sets per grid

* Fixed issue where console values were not updating correctly

* Fixing merge conflict

* Fixing merge conflicts

* Finished all major features

* Removed station map regions (to be re-added in a separate PR)

* Improved clarity

* Adjusted the color saturation of the regions displayed on the atmos alerts computer
 2024-10-23 14:49:58 +02:00
PJBot
3b0d8e63a1 Automatic changelog update 2024-10-22 23:52:55 +00:00
UBlueberry
c1d5e6fc4d In-hand apprasial tool sprite (#32849) 
* golden apprasial tool when

* thanks evan. very cool
 2024-10-23 10:51:49 +11:00
PJBot
445cad4955 Automatic changelog update 2024-10-22 23:37:58 +00:00
BramvanZijp
ee8dedea9c Several Ninja Suit power cell upgrade fixes. (#32902) 
* Fix several jank issues with space ninja cell upgrades.

* Rework the code to comply with maintainer request.

* Fix some naming convention & formatting errors.

* Change from a custom check to an item whitelist to avoid power cages from fitting.

* Make the EntityUid of GetCellScore non nullable.

* Remove a line from a previous solution to the above problem I forgot to remove.

* Fix the magic number issue.
 2024-10-23 10:36:51 +11:00
nikthechampiongr
2b02545f97 Hotfix server config changes for playercap and Levi bunker (#32925) 
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-23 00:34:11 +02:00
PJBot
8f52a3448e Automatic changelog update 2024-10-22 17:02:25 +00:00
Southbridge
5d6ec18b2a Add Nuclear Cola centrifuge recipe (#32441) 
* Initial implementation

* currently it crashes on load, don't know why, maybe changing the products will provide some insight

* I was overlooking part of the yaml formatting.
 2024-10-22 19:01:18 +02:00
PJBot
5e637aa7bf Automatic changelog update 2024-10-22 13:50:46 +00:00
ScarKy0
9873efd514 Adding intellicard functionality. (#32347) 
* init

* im so confused

* clean

* sprite update

* :|

* further attempts

* be blessed for it works

* Very prestigious pAI

* cleaning up

* Intellicard in RD locker

* PAIn't

* .Clear()n't

* .Clear()n't for real this time

* Cleaning up

* Whoopsie Daisy
 2024-10-22 15:49:39 +02:00
PJBot
fc2bb79ef3 Automatic changelog update 2024-10-22 13:04:49 +00:00
ScarKy0
62f5a31c4a Syringe gun! (#32112) 
* Init testing

* copyright

* oops

* Tracking the embed entity uid

* testing stuff for gradual injection

* work

* weh

* god save me

* bleh

* Yippee!

* Again

* Mini syringe ammo

* cleaning up

* mini syringes have a texture for fill amount

* -3 cool points :(

* hitboxes

* init cleanup

* much needed fixes

* Fixes
 2024-10-23 00:03:42 +11:00
PJBot
94bbf7262c Automatic changelog update 2024-10-22 09:01:37 +00:00
Moomoobeef
5f1b848c08 Ammo boxes now have sprites for being parially filled! (#32930) 
Initial Commit

Created new sprites for all the partial fills and modified the ammo-case ymls to accomodate the new stages
 2024-10-22 11:00:28 +02:00
Spessmann
8142ac007f Cog sec maints updated (#32948) 
updated sec maints
 2024-10-22 00:30:31 -06:00
PJBot
7d91bcba3e Automatic changelog update 2024-10-22 05:40:44 +00:00
Southbridge
a227c3bb42 Box Station - Resolved #32771, #32949, and #32921 (#32950) 
* Resolved #32771, #32949,  and #32921

* Resolved build issue
 2024-10-21 23:39:34 -06:00
Ed
dacac22663 Marble (#502) 
* marble floor

* fix

* bank wallpaper, marble floor resprite

* marble window

* rename whitebrick wall to marble wall, delete iron walls
 2024-10-21 23:35:06 +03:00
PJBot
afd4c73bec Automatic changelog update 2024-10-21 12:45:49 +00:00
No Elka
8a5d9a3321 Let station AI use long range fax machines (#32929) 
* Change stuff

* Gotcha boss
 2024-10-21 14:44:43 +02:00
Ed
41d3ccab8b Locks update (#501) 
* massive code refactor

* fix

* ftl fix

* rider pet pet

* hacking doAfter

* Update SharedCP14LockKeySystem.cs

* optimization

* Update migration.yml

* Update migration.yml
 2024-10-21 14:20:05 +03:00
PJBot
04e422bd3f Automatic changelog update 2024-10-21 03:51:13 +00:00
MendaxxDev
b5687e4c73 prevent typing sound from playing when AI interacts with consoles (#32906) 
* prevent typing sound from playing when AI interacts with consoles

* cleanup
 2024-10-20 22:50:05 -05:00