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

9071 Commits

Author SHA1 Message Date
Ed
ebac4a2eec Spellcasting upgrade (#543) 
* 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

* some funny shit

* fix problems 1

* FIX

* more funny broken shit

* predict slowdown, fixes funny

* EntityTarget action

* fixes

* Update T1_sphere_of_light.yml

* fix demiplan loot centering

* predict movement!
 2024-11-07 16:04:49 +03:00
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
ae27cf7e08 Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream" 
This reverts commit 1579da881a, reversing
changes made to a9bdab0705.
 2024-11-06 16:52:08 +03:00
Ed
1579da881a Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream 2024-11-06 16:51:42 +03:00
slarticodefast
8ddc5435a6 remove wanted list cartridge from captain PDA (#33084) 
remove wanted list from captain PDA
 2024-11-06 14:20:05 +01:00
Ed
a9bdab0705 Magic types, magic clothing (#539) 
* magic types + auto magic spell description

* manacost calculation event

* manacost ffect clothing

* Update orbs.yml

* magic type not required
 2024-11-06 08:44:03 +03:00
slarticodefast
1ded8e7f03 fix artifact debug assert (#33171) 
* fix artifact debug assert

* do the same for EffectBigIron

* 1 tab less
 2024-11-05 23:12:35 +01: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
Nim
26cf6dc01a petting (#535) 2024-11-04 18:35:56 +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
c21dd891f3 Endscreen message + command objectives updadte (#533) 
* add simple end screen common goals

* finish common objectives endscreen

* personal objectives endscreen

* Update personal_objectives.yml

* new empire objectives
 2024-11-04 13:41:09 +03:00
Preston Smith
5b4f4237a3 Fix: Web Clothing Butcher Issues (#33121) 
* Make boot web cost equal to one cloth

* Make boots and coat butcher into web

* Remove unneeded default
 2024-11-03 21:33:51 -06:00
Boolean-Buckeye
ad78b30ca3 make emergency lights (de)constructable (#32945) 
* add an emergency light node to the LightFixture construction graph
* add a recipe entry to the construction menu for emergency light
* make emergency light entity at the emergency light node on the graph
* Make emergency light destroy to 1 steel and 1 glass shard to match
  the construction recipe

Co-authored-by: BooleanBuckeye <booleanbuckeye@gmail.com>
 2024-11-03 21:24:22 -06:00
Tr1bute
f5fac7c5f2 Made the SpeciesChange mutation no longer transfer with Sterile Swabs. (#33126) 
Made the SpeciesChange mutation no longer persist.

There was an issue where swabbing a mutated plant species: I.e Blood Tomato to a regular Tomato sapling would transfer the species mutation. It would not actually get the effect, which is probably why it went under the radar. This change makes it so that the SpeciesChange mutation cannot be transferred via swabbing.
 2024-11-03 21:09:07 -06:00
Michael Krebs
5d9acb7643 fix: Remove duplicate light blue towel from misc loadout (#33145) 
remove duplicate towel from misc loadout
 2024-11-03 21:06:52 -06: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
Ed
53df2848c4 Demiplan polishing v4 (#530) 
* 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!!!

* anchoring deletion

* trying fix caves

* Update RoomFillSystem.cs

* disable locations for test

* Update CP14SpawnRandomDemiplaneJob.cs

* Update required_layers.yml

* Revert "Update required_layers.yml"

This reverts commit 2dd33db282.

* finally

* Update ContentLocalizationManager.cs

* Update spawners.yml

* Update test.yml

* fix
 2024-11-03 14:40:21 +03: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
Milon
6f1eeba191 change ShowHealthBars and ShowHealthIcons to use protoId (#32355) 
use protoId
 2024-11-02 17:59:38 +01:00
Scribbles0
65462d8ca5 Cardboard Box Capacity 4 -> 5 (#32743) 
* capacity upgrade

* comment update
 2024-11-02 17:21:35 +01:00
joshepvodka
8c1281adf7 Adds headphones to loadouts (#33067) 
added headphones to trinkets
 2024-11-02 16:12:25 +01: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
deltanedas
11f0dc420f clean up tools lathe recipes (#31521) 
* clean up tools lathe recipes

* add medical and cooking tools

* add result

* add result to others

* review

* engine

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-11-02 14:24:08 +01:00
Ubaser
1c2fd6a11b Service workers antagonist fix. (#31359) 
* add

* Revert "add"

This reverts commit 25da34b0fead5812fe5800c9bf5dd7b10ef48d7d.

* antagonism allowed™️
 2024-11-02 05:07:51 -05:00
K-Dynamic
b000a3e387 Hasten handcraft gauze recipe & decrease techfab gauze cost (#32744) 
* med lathe gauze price reduction

* gauze craft doafter time

* 3 second doafter craft
 2024-11-02 10:53:18 +01:00
K-Dynamic
05ae40400c Pills are explosion resistant (partially reverts #15851) (#32458) 
* idk how to revert a pr so I just deleted some lines

* pill destructible with explosion resistance

* comment for explosion resist

* "and" to "but"

---------

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
 2024-11-02 20:51:44 +11: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
Minemoder5000
b8a98de784 Remove CargoPallet component from the cargo pallet (#33022) 
* Change cargo shuttle pallets to catwalks.

* Remove CargoPallet component from the cargo pallet.

* Undo cargo shuttle changes.
 2024-11-01 09:22:38 +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
SpaceLizard
1c2a96590b Fixed spelling mistake in water blaster description. (#33087) 
Fixed minor spelling mistake
 2024-10-31 19:07:29 +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
BramvanZijp
a08da9d31f More pda space (#32601) 
* Rebalance the max programs that a PDA can hold

* Give Caps PDA more programs too.

* Make the max programs a static 8

* I forgor sec and med

* CaseCase

* Empty commit to re-run checks

* The final change, I hope.
 2024-10-31 15:53:38 +01:00
Jarmer123
4261698371 Add a spare bible to PietyVend (#32363) 
Update chapel.yml
 2024-10-31 14:26:45 +01:00
Boaz1111
a3dc0eb75a Pill Bottles can only store pills now (#33074) 
* no longer absurd

* Update Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-31 11:56:07 +01: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
6834bc1fbd Add 3 bottle boxes to nanomed plus (#33018) 
three bottle boxes in nanomed plus
 2024-10-30 01:41:51 -06:00
Alzore
010638d0e9 Make the security belt contain more useful items by default (#32291) 
* replace tear gas and flashbang with holobarrier and sec radio

* holobarrier-belt-fix
 2024-10-30 01:40:33 -06: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
Milon
440da3c640 fix chameleon projector bot whitelist (#33055) 
fix
 2024-10-30 02:03:06 +01:00