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

9092 Commits

Author SHA1 Message Date
Ed
ef6f23e4b8 Remove demiplan fun (#587) 
* disable roomfills

* demiplan examination random disable
 2024-11-16 17:37:06 +03:00
Ed
06308961ed Revert "Revert "Added personal signature system"" (#586) 
* Revert "Revert "Added personal signature system (#382)" (#471)"

This reverts commit 9f93931057.

* Update pen.yml
 2024-11-16 17:30:38 +03:00
Ed
5bcc378bbe Clean up, increase build stability (#583) 
* Update base.yml

* bandit -> sociopath

* some fixes

* syringe

* vaults

* Update ContentAudioSystem.CP14AmbientLoop.cs
 2024-11-13 17:56:07 +03:00
Ed
df4900e148 Demiplan examination (#578) 
* demiplan examining

* cargo demiplanes update

* Update positions_buy.ftl

* Update crates.yml
 2024-11-12 13:33:19 +03:00
Ed
b106554cfe Prototypes work (#579) 
* wrench

* station crates

* bottles

* barrel openable

* Update crates.yml

* mop fix

* broom fix

* crossbolt size fix

* bottles fix

* Update closets.yml

* Update anvil.yml

* Update crates.yml
 2024-11-12 12:42:45 +03:00
Ed
0196f6158a update (#577) 2024-11-11 12:05:23 +03:00
Ed
ae4fa34b90 New demiplan location, MORE ZOMBIES (#576) 
* new location, increase zombie spawnrate

* new caves demiplan location
 2024-11-10 22:59:02 +03:00
Psycrow
45dc4739fd Update drinks_cups.yml (#570) 
* Update drinks_cups.yml

* Testing

* Revert "не то жмал"

* Пришлось мне пройти через это

* mug -> vial

* test

* Делаем мир легче
 2024-11-10 22:08:24 +03:00
Jaraten
caee7c1f97 stone & wooden decals (#574) 
* stone & wooden decals

* typo

* fucken github
 2024-11-10 22:07:13 +03:00
Ed
6f0bb473d2 Simple resurrection spell (#575) 
* resurrection spell

* Update spawners.yml
 2024-11-10 19:17:04 +03:00
Ed
84e07c1ded Next spellStorage experiment (#572) 
* scroll spells

* refactor magic system

* Update spawners.yml

* safe use

* Update magic-spells.ftl

* fix magic containers

* fix mole

* all scrolls

* remove shadow step ring

* fix scrolls
 2024-11-10 16:15:08 +03:00
Ed
c8ab937cf0 Spell scrolls (#571) 
* scroll spells

* refactor magic system

* Update spawners.yml

* safe use

* Update magic-spells.ftl
 2024-11-09 17:55:16 +03:00
Ed
6147740f3e Try fix master constantly fails (#567) 
* try to fix

* Update entities.ftl

* Update entities.ftl

* Update entities.ftl

* Update entities.ftl

* Update entities.ftl

* Update entities.ftl
 2024-11-09 13:07:12 +03:00
Psycrow
2f91247fa2 Fix stone breeds (#559) 
* Fix Stone Breeds

* Fix 1

* FIx 2

* Fix 3

* Round 4

* Final Fix
 2024-11-08 21:33:19 +03:00
Psycrow
8013b883c1 Add throwing tomatoes and fix (#548) 
* Add throwing tomatoes and fix

Tomatoes like in real life

* Update produce.yml

* Update produce.yml
 2024-11-08 14:15:45 +03:00
Psycrow
682b0f7b78 Delete structures on workbench (#549) 
* Transfer of crafting barrels

* Sorry, error fix

* Come on, Work!
 2024-11-08 13:29:02 +03:00
Nim
c7b230857f Royal pumpkin (#547) 
* royal pumpkin

* Secret zombie fix

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-11-08 10:26:08 +03:00
Nim
e062d386fc Herbal bandages and gauze (#545) 
* gauze and bandage

* fix

* spawn

* dele

* doAfter buff

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-11-08 09:26:31 +03:00
Ed
87dc3f9fa5 Order board (#546) 
* orders board! work for the Witcher

* stamps

* wtf

* Update closets.yml
 2024-11-08 00:10:59 +03:00
Nim
12a838ac8e Zombies on style (#531) 
* zombie styl

* random

* randomrandom

* random3

* random4

* random5

* Random6

* random7

* mega zombie nerf

* Update zombie.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-11-07 23:20:03 +03:00
Ed
ab7296ff4a Demiplan ruins (#544) 
* ruins

* Update spawners.yml
 2024-11-07 17:45:21 +03:00
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