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

9380 Commits

Author SHA1 Message Date
Nim
732bc267f7 Bench (#751) 
* bench

* anchored
 2025-01-13 22:59:57 +03:00
Viator-MV
ddd61df7b8 изменение текстуры книги законов 
текстура книги законов изменена на подходящую к новым книгам
 2025-01-13 21:37:30 +03:00
Ed
368839dd68 Bugixes (#750) 
* fix #746

* fix #745

* fix #747

* fix #744

* fix #743

* fix #741

* fix #722
 2025-01-13 12:54:46 +03:00
vladimir.s
f5edf03bf6 double hp and mana alerts (#749) 
* double hp and mana alerts

* Update alerts.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-01-12 23:05:19 +03:00
Ed
b5f70616c3 New lobby art (#748) 
* lobby

* back to rus
 2025-01-12 22:39:33 +03:00
Nim
e11d8a1c1a fix (#736) 2025-01-12 17:22:19 +03:00
Nim
93c4e6068f Balance and fixes (#733) 
* issue

* mosquitoes

* 👽
 2025-01-12 17:00:35 +03:00
MetalSage
89b9a5c1fe Additive lighting (#685) 
* Additive lighting

* adds options for all your optional needs

* one last tiny adjustment before we hit the create pr button

* spaghetti condensing

* add ccvar

* overlight correction

* fix requested changes

* cvar fix

* last fix

* nice

---------

Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
Co-authored-by: MetalSage <metalsage.official@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-01-12 13:33:06 +03:00
MetalSage
a6847c08e8 Add "Mana Wasting" trait (#732) 
* add trait

* Update Resources/Locale/ru-RU/_CP14/magicEnergy/magic-spells.ftl

* fix magic item using

---------

Co-authored-by: MetalSage <metalsage.official@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-01-12 13:10:45 +03:00
Ed
f2ef46d90e New apprentice role / Новая роль подмастерья (#731) 
* new role

* Update role_loadouts.yml

* Update jobs.yml

* Delete g.png
 2025-01-12 03:05:47 +03:00
Nim
61897eae4f target (#730) 2025-01-12 02:01:53 +03:00
Ed
0af7a7ec64 Alchemist content (#718) 
* reinforced vials

* glass recipes

* roundstart alchemist potions
 2025-01-10 16:17:32 +03:00
Ed
c41927cdf2 Bugfixes (#716) 
* job localization fix

* Update job.ftl

* metall scraps

* tomato seeds craft

* fix #105

* health alerts fixed

* bucket size fix

* hat fix
 2025-01-09 22:28:39 +03:00
Nim
1af112aeb2 candle (#713) 2025-01-09 21:26:14 +03:00
Ed
9ab34417f4 More Bank positions (#715) 
* add bank positions

* Update sell.yml
 2025-01-09 17:23:35 +03:00
Nim
005a6012be sound (#714) 2025-01-09 16:40:18 +03:00
Ed
2b0fa46857 david balance pass (#712) 2025-01-09 13:13:35 +03:00
Nim
4366e940cb armor (#710) 2025-01-09 00:46:53 +03:00
Nim
76d828e9fd Мелочи фидбека (#709) 
* things

* chees

* hmm

* tag

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-01-09 00:46:27 +03:00
Ed
00ecf1f4b6 Health alerts + Modular tools labeling renaming (#708) 
* fix health alert

* grips label

* Update grips.yml
 2025-01-08 23:22:58 +03:00
Ed
815c031a16 localization sync 2025-01-08 15:31:17 +03:00
Ed
8248fcb07e Events tweaks (#707) 
* mosquito + outbreak markers

* Update comoss.yml

* Update monster.yml
 2025-01-08 14:16:38 +03:00
Ed
228a7226ff Random events (#706) 
* first game event! Closet skeleton!

* demiplane outbreak gamerules

* Update game_presets.yml

* d
 2025-01-08 02:55:54 +03:00
Ed
5c21ec2774 fix 2025-01-07 23:41:42 +03:00
Ed
35eb0c48c1 Graves and Tombstones (#705) 
* dirt grave

* Update grave.yml

* tombstone

* Update grave.yml
 2025-01-07 18:08:47 +03:00
Ed
5f2583fab0 Goblin gameplay (#704) 
* silva fix

* goblinoids
 2025-01-06 23:10:42 +03:00
Ed
8892d3913d Tiefling gameplay (#703) 
* tiefling damage mana

* tiefling spell

* tweaks
 2025-01-06 17:08:49 +03:00
Ed
71e6bd4f24 Elf (#702) 2025-01-06 14:05:46 +03:00
Ed
b647583b7b Silva species gameplay difference (#701) 
* plant growth spell, silva photosyntesis

* playable species guidebook

* fixes
 2025-01-06 03:31:59 +03:00
Ed
ed75beb0fb New species: Silva (#700) 
* base silva species

* markings

* Update silva.yml
 2025-01-05 23:23:18 +03:00
Ed
fe43e51930 Elves are skinny now (#699) 
* elf THICC

* Update elf.yml
 2025-01-05 20:17:25 +03:00
Nim
9ea8111d9e angel statue (#696) 2025-01-05 19:10:33 +03:00
Ed
639db84a0b dayCycle prototipization (#694) 2025-01-05 19:08:35 +03:00
Ed
9f798b4f6c Sprint loadout action (#698) 
* SpellStorage restruct

* Update CP14SpellStorageSystem.cs

* Sprint
 2025-01-05 17:46:54 +03:00
Ed
be3064b99c Modular sprites auto coloring (#697) 
* axe and dagger update

* more blade processing

* shovel and sickle

* sword

* gardes

* grips

* modular presets

* blade material modifiers

* modular spear blade

* balance sharp garde, add sturdy garde

* Update sturdy.yml
 2025-01-05 04:01:31 +03:00
Nim
945e74b690 Holiday Gob (#691) 
* gob

* festive system
 2025-01-04 23:42:09 +03:00
Nim
fc1e9d2638 christmas hat (#695) 2025-01-04 23:34:59 +03:00
Ed
36d02fdf6e Magic spells code expansion (#692) 
* split manacost in separate component

* stamina spells

* toggleable actions

* swap activeCasting on ActiveDoAfter

* remove dublication

* Update CP14SharedMagicSystem.ToggleableActions.cs

* EntityWoldTarget

* mana glove done

* fix spell scrolls interrupting

* fix cooldown problem

* clean up, edit stamina system
 2025-01-04 21:35:59 +03:00
Ed
86e74a0fc2 Merge branch 'ed-22-12-2024-upstream' of https://github.com/crystallpunk-14/crystall-punk-14 into ed-22-12-2024-upstream 2024-12-30 15:06:39 +03:00
Ed
a75ac73c70 Merge remote-tracking branch 'upstream/master' into ed-22-12-2024-upstream 2024-12-30 15:05:05 +03:00
Ed
4011de828f Merge branch 'master' into ed-22-12-2024-upstream 2024-12-30 15:01:14 +03:00
Ed
5c9ea3f428 fix (#690) 2024-12-30 15:00:02 +03:00
Ed
de6ddb52be pulato (#689) 2024-12-30 13:58:53 +03:00
Southbridge
4acfec8e36 Amber Station Overhaul (#34113) 
* Step 01: Remade arrivals

* Nearly finished, also added new beacons and a holopad

* Wrapped up all changes, also added a beacon for the docking arm
 2024-12-30 00:37:05 -07:00
Velcroboy
c2ffc25970 Adds kitchen/botany-locked maints airlock (#34116) 
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
 2024-12-29 21:14:36 +03:00
lzk
072b973f3b fix interdimensional teleporter desc (#34108) 
Update hand_teleporter.yml
 2024-12-28 22:28:58 -05:00
Velcroboy
d6a9fe1c84 Rolling joints no longer requires a filter (#34106) 
* Remove filters from joint crafting

* err

* hmmm

* guhhh

* yyyy

* whitespace

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
 2024-12-28 22:25:39 -05:00
ArtisticRoomba
e07609b3b3 New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs (#33508) 
* A looooooooot of new cotton foods for the moffs

* address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs)

* alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png

* update requested sprites

* change requested sprites

* address part of sloth's review, awaiting response

* address second half of review, fix magical food nutriment mitosis bug
 2024-12-29 03:02:24 +01:00
SolStar
bfb256f0ba Add a guaranteed cotton pizza to pizza crates (#33997) 
* add guaranteed cotton pizza to pizza crates

* saner parenting

* Use clearer suffix on cotton pizza box
 2024-12-29 02:50:49 +01:00
zHonys
5d0d37161d Added support so that smile can use hats (#33924) 
* Added support so that smile can use hats

Changed Prototypes/Entities/Mobs/NPCs/pets.yml
Added smile_inventory_template.yml in Resources/Prototypes/inventoryTemplates
Added dir smile_displacement.rsi inside Resources/Textures/Mobs/Pets/smile.rsi
Added smile_displacement.rsi/meta.json
Added smile_displacement.rsi/head.png

* Fixed sprite path in ProtoTypes/Entities/Mobs/NPCs/pets.yml mapping to wrong smile_displacement.rsi
Fixed smile_inventory_template.yml using uiWindowPos as 1,2 instead of 0,1

Moved Resources/Textures/Mobs/Pets/smile.rsi/ to .../Pets/smile/smile.rsi/
Moved Resources/Textures/Mobs/Pets/smile.rsi/smile_displacement.rsi to .../Pets/smile/smile_displacement.rsi

* Minor fixes: removing comments and change naming

Renamed Resources/Textures/Mobs/Pets/smile/smile.rsi To .../Mobs/Pets/Smile/smile.rsi

* Removed smile_inventory_template.yml and used head_inventory_template.yml instead
 2024-12-29 02:49:05 +01:00