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

28992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
2dd33db282 Update required_layers.yml 2024-11-03 13:21:33 +03:00
Ed
9770e6d7e2 Update CP14SpawnRandomDemiplaneJob.cs 2024-11-03 13:21:25 +03:00
Ed
d5274ade91 disable locations for test 2024-11-03 13:21:15 +03:00
Ed
11e9d4ed09 Update RoomFillSystem.cs 2024-11-03 13:20:52 +03:00
Ed
49d471894e trying fix caves 2024-11-03 13:20:45 +03:00
Ed
22e5b58db0 anchoring deletion 2024-11-03 11:50:45 +03:00
Ed
79eeef713a Merge branch 'master' into ed-02-11-2024-demiplan-biomes-async 2024-11-02 22:40:51 +03:00
Ed
51f4ec84d5 Demiplan polishing v3 (#529) 
* Wizden PR copy

* sync

* Update DungeonJob.PostGenBiome.cs

* Update DungeonJob.PostGenBiome.cs

* some rebalance

* required exits and enters!

* room fill fix

* snakes nerf

* enable En-US localization for playtest

* guidebook update

* hotfix!!!
 2024-11-02 17:46:19 +03:00
Ed
03066caf8a hotfix!!! 2024-11-02 17:33:51 +03:00
Ed
e44c49d9f6 guidebook update 2024-11-02 16:55:34 +03:00
Ed
d1696cb5d8 enable En-US localization for playtest 2024-11-02 15:25:09 +03:00
Ed
258b3131f7 snakes nerf 2024-11-02 14:59:25 +03:00
Ed
512c7dc051 room fill fix 2024-11-02 14:30:38 +03:00
Ed
889116a953 required exits and enters! 2024-11-02 14:14:49 +03:00
Ed
5af6624e62 some rebalance 2024-11-02 12:48:10 +03:00
Ed
90f6ac9b54 Update DungeonJob.PostGenBiome.cs 2024-11-02 12:34:14 +03:00
Ed
baf3099a0c Update DungeonJob.PostGenBiome.cs 2024-11-02 11:34:57 +03:00
Ed
1c0f1d552e sync 2024-11-02 11:34:17 +03:00
Ed
93aacb3b20 Wizden PR copy 2024-11-02 11:11:29 +03:00
Ed
2b9d949eea Demiplan polishing 2 (#528) 
* wizden PR copy

* starter rooms

* grass geode location, new modifiers
 2024-11-02 00:59:55 +03:00
Ed
3b520ac69c Demiplan modifiers (#526) 
* simple modifiers

* modifier tag filtering

* Update CP14DemiplanSystem.Generation.cs

* Update rocks.yml

* move loot to modifier

* move enemies to modificators

* fix filtering

* modifier rariry

* reward and difficulty limits

* rebalance and optimize calculation

* Update test.yml

* wizden PR copy

* move all alchemy reagents to modifiers
 2024-11-01 18:08:57 +03:00
Jaraten
7124eb5335 galasass (#525) 2024-11-01 14:45:53 +03:00
Nim
ac732c6180 Pig and boar (#507) 
* pig and boar

* boar

* speed

* tweak
 2024-11-01 10:48:50 +03:00
Ed
f9fea9e6ed Demiplan polishing (#524) 
* 10 -> 20 sharpening stone durability

* auto destroy demiplans try 2 (better)

* start demiplan protection time

* buying demiplan key

* increase island size
 2024-11-01 09:23:22 +03:00
Ed
5c4b5d1572 Demiplans expeditions (#523) 
* simple expedition generation

* add simple test key

* expedition map component

* some funny procedural testing

* refactor expeditions from planetbiome to islanddungeons

* some work

* fix: grid dungeon, not map planet dungeon

* unhardcode map components

* finish T1 expedition generation

* Update preset.yml

* indestructable stone

* mob water occlusion

* caves T1 expedition

* Update CP14SpawnExpeditionJob.cs

* Delete shared MissionParams

* rename to demiplans

* pass mapid into job

* demiplan connections

* demiplan exits

* random entry points

* Update config.yml

* some cleanup and renaming

* radius one-time teleport

* rename connections to exitPoint

* merge entry and exit point into rift component

* demipan closing - all rifts deletion

* demiplanEEEEEE

* fixes

* delete floating visuals

* Update CP14DemiplaneTravelingSystem.cs

* intro and outro demiplan music

* rift cores and flashing

* pulling support

* pulling fix + generatordata fix?

* auto destrot demiplans??
 2024-10-31 19:13:44 +03:00
Ed
16e23098db Merge pull request #520 from crystallpunk-14/ed-29-10-2024-upstream 
Stable upstream sync
 2024-10-29 15:15:14 +03:00
Ed
4e2af32ebe Merge pull request #522 from crystallpunk-14/ed-29-10-2024-guides-and-skills 
Ed 29 10 2024 guides and skills
 2024-10-29 14:55:50 +03:00
Ed
60f8c2c56f remove cvar! 2024-10-29 14:41:41 +03:00
Ed
df53f9a01f remove ship target point 2024-10-29 14:18:27 +03:00
Ed
2f57f11771 Cargo namespace 2024-10-29 12:18:35 +03:00
Ed
e6bbc3900f Delete CP14ExpeditionSystem 2024-10-29 12:15:16 +03:00
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
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