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

2831 Commits

Author SHA1 Message Date
Ed
7e4fb90e02 Spell T0 traits, recategorize magic (#540) 
* move to gurps magic types

* spell traits, categorize spells

* Update TraitSystem.cs

* magic spells item provider

* Update twoHandedStaffs.yml

* Update CP14MagicManacostModifySystem.cs

* Update CP14SpellStorageSystem.cs
 2024-11-06 18:02:37 +03:00
Ed
955145a9a5 Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream 
# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Credits/GitHub.txt
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
 2024-11-06 16:53:24 +03:00
Ed
b5df675187 Spellcaster slowdown, mole nerf, new shoulder slot, healing staff (#538) 
* healing staff sprite

* new back slot and move all big things to whis slot

* replace ring to staff

* caster sowdown! Mole rebalance

* loadouts fix

* fix weapon rotation

* Update spawners.yml
 2024-11-05 19:05:40 +03:00
Ed
c3d4303270 directional windows fix (#537) 2024-11-05 13:26:34 +03:00
Ed
120386bb2d Windows + weapon shiny (#536) 
* add wooden window crafting

* weapon resprite

* Update anvil.yml

* Update walls.yml
 2024-11-05 12:12:21 +03:00
Ed
54c7a40967 Blacksmith role (#534) 
* disable crowbar door prying

* blacksmith role

* finish role

* map update

* more recipes to anvil

* Update arenas.yml

* glass!

* ores rebalance
 2024-11-04 16:25:19 +03:00
Ed
16a0b99daf Magic crystal lanterns + Aftertest balance (#532) 
* lamp visual update

* deleete ice floor spell

* mana gift spell

* magic lantern

* wallmount crystal lamps

* QoL

* crafting

* Update StyleNano.cs

* examining simplify

* rings name

* remove snakes modifier

* trinkets update

* remove snakes, add boars and rabbits to demiplans

* Update flashlight.yml

* fix

* Update test.yml

* Update migration.yml

* ыы
 2024-11-04 00:55:15 +03:00
Nim
98854c01d7 Mole and small hydra (#527) 
* mobs

* fix sprite

* fix f
 2024-11-03 19:39:33 +03:00
Flareguy
d993582d00 Fix broken computer white shadows (#33103) 
fix broken computer white shadows
 2024-11-03 00:16:18 +01:00
Flareguy
4a39341e46 Delete conveyor_old.rsi (#33102) 2024-11-02 23:23:40 +01:00
RiceMar1244
0ba3350c7e Combat and survival knife storage/inhand sprites (#33111) 
* Adds storage sprites for combat knife and survival knife. Replaces inhand sprites.

* Fixes meta.json copyright
 2024-11-02 14:55:15 -05: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
ScarKy0
e17d152838 Borgs can no longer see mindshield + AI can no longer toggle off seeing job icons (#33069) 
* :(

* Removed the sprite + updated RSI
 2024-10-31 21:32:28 -05:00
RumiTiger
6ce80d914d Muffins (#29318) 
* Update meta.json

* Add files via upload

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Add files via upload

* Update plate.yml

* Update food_baked_single.yml

* Update dinnerware.yml

* Update cooking.yml

* Update misc.yml

* Add files via upload

* Delete Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png

* Add files via upload

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Fix meta.json

* Fix meta.json again

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update meta.json

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml

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

* Update dinnerware.yml

* Delete cherry

* Add files via upload

* Delete banana

* Add banana

* Delete chocolate

* Add chocolate

* lathe recipe fix

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-31 22:06:46 -04:00
SlamBamActionman
4626904fa8 [#20285 fix] Carp Plush and Rehydratables can now be put into mop bucket (#33079) 
* Make shark plush janitor-bucketable

* fix bucketed grey shark texture

* Make sprites less shiny and adapt copyright notice

* Made shark way way less shiny

* Allow carp plush and rehydratables in mop bucket.

* Remove old mop bucket shark sprites

* Fix post-merge bugs

* Fix errors

* Move ReactiveContainer stuff to shared

That should mean it is now predicted.

* Custom eject verb for the mop bucket

* Fixes OnSolutionChange, removes pop-up as there already is one.

* .ftl is not necessary as the custom pop-up was removed

* Review fixes

* Update Content.Shared/Chemistry/Components/ReactiveContainerComponent.cs

* Update Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs

---------

Co-authored-by: Psychpsyo <psychpsyo@gmail.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-31 19:46:19 +01: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
Alzore
4b467685b2 Nukie med bundle now costs 24 tc and contains a unique defibrillator (#32720) 
* a-few-injectors

* comment

* defib-ops-when
 2024-10-30 10:15:30 +01:00
Alzore
0aa46f6a2a Give proto-kinetic crushers, glaives, and daggers better inhands. Update the crusher and glaive icons. (#32212) 
* inhands

* better inhands

* indent
 2024-10-30 01:38:19 -06:00
Flareguy
3d70cdf23c Various Vaugely Connected Sprite Updates™: Encryption Keys, Station Map, Brig Timer (#32786) 
* various resprites (encryption keys + signal screens + station map)

* brig timer update

* fixes n shit
 2024-10-30 14:12:49 +11: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
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
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
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
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
UBlueberry
c1d5e6fc4d In-hand apprasial tool sprite (#32849) 
* golden apprasial tool when

* thanks evan. very cool
 2024-10-23 10:51:49 +11: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
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
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
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
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
IProduceWidgets
091e4c1cb0 Add Towels (#32235) 
* Towels

* make smoler

* Huh, wonder why that didnt fail locally. The curse of CaPiTaLiZaTiOn

* Teal swapped for LightBlue for medical.

* Appease the linter?

* magic?

* mimery

* lefthandedness
 2024-10-18 17:24:43 +02:00
Ilya246
fca95ef250 ghost locator maints loot (#32323) 
* implement

* react to revenants/AI eye

* rare maints loot

* sprite

* description

* review

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

* do changes

* stats

* networked

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-18 15:42:13 +02: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
Minemoder5000
17319c7fc0 New reptile sounds (#32064) 
* Adds emotes to the Reptilian species: Tailthump, Hiss
Todo: Huff

* Adds emotes to the Reptilian species: Tailthump, Hiss
Todo: Huff

* Added ReptilianBodyEmotes to speech_emote_sounds.yml, yada yada yada

* added sound and changed volume

* fix thingies

* fixed bug with reptilians not being able to do default emotes

* lowered the volume of the hiss and huff

* reformat the yml

* Add sigh keywords to the huff

* Undo changes to BuildChecker.csproj

* Add icons to the emotes

* Remove sigh triggers from the huff emote since it breaks normal sighing.

* Remove the Huff and Hiss since i cant find good audio for it

* i forgor

* Changed attribution

* Credit Sarahon for the tailslap

---------

Co-authored-by: nicho <nicholasnewsom577@gmail.com>
 2024-10-16 12:04:55 +02: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
mubururu_
6654e00411 organ sprite touch-ups (#32762) 
* does work?

* fix

* shrunk organs to normal size of small

* made brains and liver look better

* made stomach slightly less bright

* unique sprite for diona lungs + inhands

* unique sprite for vox lungs + inhands
 2024-10-14 13:32:32 +02:00
ScarKy0
5be82d2a7f Cyborg module action icons (#32505) 
* Init

* added jani and medical

* + sci and service modules

* + syndi modules

* fixing up

* geiger counter stuff
 2024-10-14 18:05:40 +11:00
TeaMaki
076c692878 Warden Hat Texture Change (#32253) 2024-10-14 00:36:56 +02:00
SlamBamActionman
9bf7c44585 Add poster about the SSD term (#32736) 
* moff

* Attribution
 2024-10-13 22:25:49 +11:00
Nim
40959cf422 fix resp (#488) 2024-10-13 02:09:41 +03:00
KingFroozy
214a20da8e Changes to CE's suits (#29850) 
* Changes to ce sprites

* Adjustments

* More changes i guess

* Love life, get skirt

* Bitlessdark

* fkingforcepush

* upd №?
 2024-10-12 21:13:39 +02:00
Nim
a6fc5e6ace Rabbit (#486) 
* rabbit

* meat

* гладить

* тоже гладить
 2024-10-12 20:01:13 +03:00