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

28803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b14c75390c biological weapon (#518) 2024-10-28 13:05:01 +03: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
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
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
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
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
Ed
8c06677ff4 Ru localization update (#500) 
* Update entities.ftl

* fix

* Update entities.ftl
 2024-10-20 23:27:33 +03:00
Ed
85463d380f Bank preparation (#499) 
* TownSend condition

* personal objectives update

* add common objectives

* add common objectives

* tweaks

* quartermaster and merchant

* job spawner icons

* add merchants to tavern map
 2024-10-20 21:20:16 +03:00
Ed
78e94b1623 Airship + Unittest (#496) 
* wings

* update cargo shuttle

* update goblin sound

* add new unit test

* Update CP14EntityTest.cs

* Update CP14RitualTest.cs

* add buy and sell hints

* paper reading

* hardwork

* clean task

* body forkfiltered

* Update crystal.yml

* more fork flitered

* Update basic.yml

* Update wild.yml

* Update CP14EntityTest.cs

* realise pusharing

* pusharing alchemical vials

* coin disappear works

* Fix
 2024-10-19 01:09:15 +03:00
Ed
f14177bf86 Alchemist update (#497) 
* rebalance alchemy resource

* lockers alternative

* map update
 2024-10-18 14:56:01 +03:00
Ed
9a8d30022a Wallpaper update + paper folder (#495) 
* paper folders

* Update CP14WorkbenchSystem.cs

* wallpaper update

* Update walls.yml

* remove cable sprites

* Update migration.yml
 2024-10-17 13:08:36 +03:00
Ed
ebca84d28f Minor fixes (#494) 
* minor loadout tweaks

* wooden counter

* fix parry predicting

* tables crafting simplify
 2024-10-16 17:32:41 +03:00
Ed
5b4a7f6edc Ed 15 10 2024 entity hided (#493) 
* test

* hide ss14 ents

* Update basic_cloak.yml
 2024-10-15 16:53:54 +03:00
Ed
a83d6f0d87 locale (#491) 
* locale

* delete ss14 items generated locales
 2024-10-15 16:21:07 +03:00
Ed
5d89812abc Merge pull request #490 from crystallpunk-14/ed-15-10-2024-upstream 
Ed 15 10 2024 upstream
 2024-10-15 15:41:02 +03:00
Ed
31d39b36ae Update CP14ExpeditionSystem.cs 2024-10-15 15:28:16 +03:00
Ed
dc47bb2283 Merge remote-tracking branch 'upstream/stable' into ed-15-10-2024-upstream 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
 2024-10-15 15:25:44 +03:00
Ed
d259191d3d Cargo system (#487) 
* simple storeship arriving

* pupu

* ship cycling

* buy positions prototypes

* i hate UI

* PriceControl

* second tab ui

* baloon! pallets!

* update shop in town

* setup billboard timer

* split to sell and buy categories

* renaming gaming

* actually selling

* fix infinity selling

* improve timer

* move description too rigt part UI

* bar selling

* iron cabinet

* purge currency categories

* remove town balance, add money box

* special proposal, FTLImmune anchor

* fix UI

* remove tests buying

* Update CP14StoreWindow.xaml.cs

* currency converter

* currency clean up

* Update CP14CargoSystem.cs

* clean up part 2

* rider petpet

* coins audio

* coin improvment

* Update coins.yml

* translate

* more coins roundstart

* Update wallet.yml

* Update wallet.yml

* generate coin problem fix

* refactor proto reading

* fixes

* huh

* shuttle logshit fix, add to tavern map

* Update CP14StationTravelingStoreShipTargetComponent.cs
 2024-10-15 15:22:06 +03:00
Errant
519a6b2474 HOTFIX: Fix tech anomaly nexttimer (#32805) (#32807) 
Fix tech anomaly nexttimer (#32805)

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-10-14 11:41:31 +02:00
Ed
4425b77c90 Return RU lang 2024-10-14 11:39:12 +03:00
Pieter-Jan Briers
796764d755 Fix some rounds failing to end due to mind roles (#32792) (#32793) 
* Fix some rounds failing to end due to mind roles

Fixes #32791

This is caused by ShowRoundEndScoreboard running into a bug trying to display antags: some player is showing up as antag with MindIsAntagonist(), but has no antag roles listed in MindGetAllRoleInfo().

This was caused by one of the roles of the player having the Antag boolean set, but having no AntagPrototype set.

The responsible mind role appeared to be MindRoleSubvertedSilicon which is missing a set for the SubvertedSilicon antag prototype.

I also added resilience to the round-end code to make it so that an exception showing the scoreboard (and sending the Discord message) would not cause the round end logic to completely abort from an exception.

I am planning to add an integration test to cover this bug (no prototype in mind roles), but I'll leave that for not-the-immediate-hotfix.

* At least one maintainer approved this tiny PR without reading it, not naming names.
 2024-10-13 23:00:40 +02:00
Errant
e5ad32fe93 Fix random test fail in DeleteAllThenGhost (#32753) 
It's simple. We kill the heisentest
 2024-10-13 17:31:38 +02:00
Ed
648505dc15 Switch to ENG language 2024-10-13 15:02:57 +03:00
Jezithyr
af72f2e17c Applying Fix from #32764 to staging 2024-10-12 22:21:44 -07:00
Nim
40959cf422 fix resp (#488) 2024-10-13 02:09:41 +03:00
Nim
a6fc5e6ace Rabbit (#486) 
* rabbit

* meat

* гладить

* тоже гладить
 2024-10-12 20:01:13 +03:00
scrivoy
e98af125dc Fixed capitalization in Interface description (#32739) 2024-10-10 21:40:41 +02:00
PJBot
bc64676747 Automatic changelog update 2024-10-10 14:36:43 +00:00
nikthechampiongr
e7b7e2270d Fix bounties(and potentially other things) running out of ids (#32700) 
* Make NameIdentifier Ids get refreshed after round restarts

Before this commit the existing values would just get shuffled.
This means that eventually the server would run out of ids to give to
new entities for different groups. As a result everything would get id 0

* Comply with what seemingly is the convention for sawmills

* Make it impossible to insert a bounty with a duplicate id

* Reduce duplication

* Remove unused sawmill

* Fix rustbrain and skill issue

* Aaaa

* Apply suggestions from code review

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2024-10-10 16:35:35 +02:00
PJBot
740288eb96 Automatic changelog update 2024-10-10 08:50:05 +00:00
Errant
93c7bdc134 Mind Role Entities (#31318) 
* Mind Role Entities wip

* headrev count fix

* silicon stuff, cleanup

* exclusive antag config, cleanup

* jobroleadd overwerite

* logging stuff

* MindHasRole cleanup, admin log stuff

* last second cleanup

* ocd

* minor cleanup

* remove createdTime datafield

* now actually using the event replacement I made for role time tracking

* weh
 2024-10-10 10:48:56 +02:00
Pieter-Jan Briers
3e078ab3e0 Fix error log when recycling something with small material counts. (#32723) 
* Fix error log when recycling something with small material counts.

MaterialStorageSystem.SpawnMultipleFromMaterial now doesn't call StackSystem.SpawnMultiple if it tries to spawn zero. This happens because the recycler calls SpawnMultipleFromMaterial for everything recycled, even if the amount it has stored is < the amount for one sheet.

* Update Content.Server/Materials/MaterialStorageSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-10 03:29:26 +02:00
PJBot
ac16a05fef Automatic changelog update 2024-10-09 18:02:38 +00:00
beck-thompson
327466a6e2 Plushies can now have pAIs stuffed into them (v2)! (#30805) 
* First commit

* I forgot silly me

* Actually added comments

* spellin

* fixes

* more blacklists

* Minor fixes

* Speech Verb also changes now

* Simple name stuff

* Other fixes

* remove one line of whitespace

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-09 20:01:32 +02:00
chavonadelal
6d99597349 Job title localization (#32338) 
* Job title localization

* Correcting fields
 2024-10-09 17:05:36 +02:00
Ed
844b4d4616 underworld (#485) 2024-10-09 16:19:38 +03:00
PJBot
fc1c709d44 Automatic changelog update 2024-10-09 12:45:45 +00:00
beck-thompson
5a41cc81b3 Decrease price of radio jammer from 4 tc -> 3 tc (#32472) 
* First commit

* increase price by one tc
 2024-10-09 14:44:38 +02:00
lzk
d450b613d6 fix typo (#32712) 2024-10-09 14:41:07 +02:00
PJBot
b657aba2e1 Automatic changelog update 2024-10-09 11:56:57 +00:00