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

29141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
d67f7619c4 Edgefication (#590) 
* bloat

* bloat 2

* bloat 3

* final bloat

* Update icon.ico

* Create integration_test_run.bat

* Arggh

* Disable some tests

* revert roomfill clearexisting changes
 2024-11-18 14:40:52 +03:00
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
7a0fb9fc15 fix wallmounted (#585) 2024-11-15 23:54:58 +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
0f091b4cdf Merge pull request #542 from crystallpunk-14/ed-06-11-2024-upstream 
Ed 06 11 2024 upstream
 2024-11-06 17:06:40 +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
PJBot
24e6b9f42c Automatic changelog update 2024-11-06 13:21:12 +00: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
PJBot
d18dba982b Automatic changelog update 2024-11-06 03:30:07 +00:00
Baptr0b0t
bcfacec287 Fix AI in Intelicard can see through walls (#33177) 
setdrawfov added
 2024-11-05 21:28:58 -06: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
PJBot
2382162d72 Automatic changelog update 2024-11-05 18:19:35 +00:00
Errant
da19abdc76 Don't show Reinforcement codewords on round end (#33181) 
Don't show unused codeword sets
 2024-11-05 19:18:28 +01:00
PJBot
564606a532 Automatic changelog update 2024-11-05 16:59:31 +00:00
Kirus59
cb59826dcb Hunger and thirst huds fix (#32832) 
* Hunger and thirst huds fix

* delete poor caching
 2024-11-05 17:58:23 +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
PJBot
aef7dd514b Automatic changelog update 2024-11-05 00:13:37 +00:00
DrSmugleaf
8f87bad83c Fix DisplayVotes doing nothing for a vote (#33170) 2024-11-05 01:12:29 +01: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
PJBot
01ac967640 Automatic changelog update 2024-11-04 11:24:18 +00:00
Zachary Higgs
a3f10ccfbb Add Silicon Law cues to Every method a Silicon can have their laws change (#32887) 
* Silicon Law Sound cue refactor

- Added CueEntityMind to Silicon Law system to more uniformally
send sounds to minds

- Switch all previous MindPlaySound to instead call to the new method

* Change SiliconLawEui to cue the mind

* CR: TryGetComponent and Change the Documentation

- Remove GetComponentOrNull for  _entityManager.TryGetComponent

- Change SiliconLawProviderComponent.LawUploadSound to be more general
rather than just referencing lawboards

* Update Content.Server/Silicons/Laws/SiliconLawEui.cs

* Update Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs

* Silicon-law-cue-refactor - CR:

- Roll the cuing into NotifyLawsChanged via an optional variable for the
cue

- Modify "SetLaws" to take in an optional soundProvider for the cue

- modify Emagged, Ion, Eui and SetLaws to instead send the sound cue via
NotifyLawsChanged

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-11-04 12:23:12 +01: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
PJBot
4ba8e351fe Automatic changelog update 2024-11-04 03:34:57 +00:00