juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,292 Commits 57 Branches 0 Tags
1220b8c4c7841daaefba50a22d5374ecf1c19b21
Commit Graph

21055 Commits

Author SHA1 Message Date
UBlueberry
1220b8c4c7 Adds beanies to the WinterDrobe! (#32946) 
* sprites

* messing with the ymls

* new sprites

* that's a lotta yaml

* make the sprites gooder

* color adjustment

* to the winterdrobe with you

* layering fix
 2025-04-20 17:15:34 -04:00
PJBot
1fadb31f47 Automatic changelog update 2025-04-20 21:10:07 +00:00
Booblesnoot42
b7dfd60517 Resprite main altars (#35685) 
* resprite main altars

* updated meta.json
 2025-04-20 17:09:00 -04:00
PJBot
5fa93d6974 Automatic changelog update 2025-04-20 21:02:56 +00:00
Ed
f6a29e24a2 Markings overhaul (#35938) 
* markings displacement setup

* ok i got it!

* fix map updating

* remove trackingLayers

* markings clean up and modernizize

* marking disabling displacements

* markings restriction

* dehihienize

* dehihiniezize 2

* aa

* nice
 2025-04-20 17:01:50 -04:00
PJBot
f3a33fefc2 Automatic changelog update 2025-04-20 20:56:49 +00:00
RedBookcase
aea474d4a9 Pirate Gear Tweaks. (#35986) 
* Tweaked pirate gear to be in-line with similar items.

* Added attribution for flashlight sprites, made hardsuits Major Contraband

* Added empty versions of the pirate revolver and flintlock.

* Test fail fix hopefully?

* Test fail fix hopefully V2.0

* Test fail fix hopefully V3.0

* Test fail fix hopefully V4.0

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
 2025-04-20 16:55:42 -04:00
Prole
58fb282023 The Beverage Jug Can Now Look Open (#36070) 
* GenJug-Changes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Guh

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Support For the Rest

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* New Sprites

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Newest Sprites

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
 2025-04-20 16:36:22 -04:00
lzk
63350853f0 change MV cable outline (#36751) 
* change MV cable outline

* zamn
 2025-04-20 16:30:37 -04:00
YoungThug
d8ea0a39fe Wizard Figure Voiceline Fix #36771 (#36779) 
DA WIZARDgit add -A
 2025-04-20 16:30:04 -04:00
PJBot
314ced1bf9 Automatic changelog update 2025-04-20 19:09:47 +00:00
PJBot
ae41b6547e Automatic changelog update 2025-04-20 14:09:09 +00:00
K-Dynamic
d11a10d5ea Nonlethal throwables crate (#35808) 2025-04-20 07:08:02 -07:00
PJBot
17cdb4393f Automatic changelog update 2025-04-20 14:07:21 +00:00
Hyper B
cd6130ce22 Fire protection for ERT engineering hardsuit (#34949) 2025-04-20 07:06:14 -07:00
PJBot
0d0ac82484 Automatic changelog update 2025-04-20 13:56:30 +00:00
ScarKy0
2d94045995 Decrease amount of mail, increase profits (#36767) 
init
 2025-04-20 15:55:23 +02:00
PJBot
d35c9ac17c Automatic changelog update 2025-04-20 12:20:18 +00:00
Hyper B
09f3d7f5eb Departmental shelves whitelist expansion (Attempt №3) (#34292) 
* Expand-Shelves-Whitelist

Made departmental shelves hold a wider variety of items.

* Accidentally included "Packet" twice
 2025-04-20 14:19:11 +02:00
PJBot
006f1aea3b Automatic changelog update 2025-04-20 12:04:52 +00:00
TakoDragon
056b25d01a Salvage Airlock (#36375) 
* Salvage

* atmos a

* more muted colours

* Mapping Related to AI

* Fixed small naming inconsistency

* Revert "Fixed small naming inconsistency"

This reverts commit 985e1fd46a09e521c11dc345f470228e7907fbb9.

* Revert "Mapping Related to AI"

This reverts commit 5d5ae4feb819396c5c2a7413399ab5ce34f8683b.

* Revert "atmos a"

This reverts commit 529831e2584df27fa102ee1c970948fa3b6bab56.

* indent

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-04-20 14:03:46 +02:00
Pgriha
097aff5e58 Heterochromia for Moth (#36061) 
* 1

* Fix local

* formatting

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-04-20 14:03:37 +02:00
PJBot
2bd3f6ce20 Automatic changelog update 2025-04-20 12:02:14 +00:00
Alice4267
a8b954fb0c Fix glass duplication with beakers (#34441) 
Update chemistry.yml

Fixing glass dupe.
 2025-04-20 14:01:08 +02:00
PJBot
c063f98f22 Automatic changelog update 2025-04-20 11:54:49 +00:00
PJBot
3f8e3f70b0 Automatic changelog update 2025-04-20 11:53:43 +00:00
RedBookcase
05d79667bb Makes more items recyclable. (#35800) 
* Makes more items recyclable.

* Added newlines

* Fixed material issues which were NOT MY FAULT

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
 2025-04-20 13:53:37 +02:00
PJBot
6622dcafb5 Automatic changelog update 2025-04-20 11:52:37 +00:00
Pgriha
8be4abc3fc Fix head markings under some helmets (#36074) 
* 1

* 2
 2025-04-20 13:52:31 +02:00
Nox
f4e7601dc9 Descriptions for .35 auto (#36085) 
* Initial commit.

* added SMG descriptions

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Updated descriptions to incorporate Roomba's feedback.

* Slightly changed Viper description

* Minor formatting change

* Updated Atreides description

* Fixed a minor convention mistake in magazines

* Slightly changed the Viper's description to not reveal its manufacturer.

* Updated Drozd description.

* Rerun test

* Updated descriptions in accordance with Roomba's suggestions!

* Updated Viper description!

* Shit I forgot to remove the cartridge length, did it now!

* More smart changes by Roomba

* Tests gaslighting me

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Updated WT550 description

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-20 13:51:27 +02:00
Nox
9d4c97701d Fix some SMG magazines fitting 35 rounds (#34782) 
All SMG magazines are now 30 round, rather than half being 35 round.
 2025-04-20 13:33:31 +02:00
PJBot
d46c54bde0 Automatic changelog update 2025-04-20 09:33:09 +00:00
Helm
edc57cab16 Fix soup (#34633) 
Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com>
 2025-04-20 11:32:02 +02:00
Spessmann
1c3bdd5ba5 Small ruin fixes (#36763) 2025-04-20 01:54:01 -07:00
PJBot
79a76e418c Automatic changelog update 2025-04-20 07:01:40 +00:00
Cass
39bf2469ad Plurality pin addition (now not on master branch) (#36744) 2025-04-20 00:00:33 -07:00
PJBot
0768f1f33f Automatic changelog update 2025-04-20 06:02:34 +00:00
ArtisticRoomba
8d8398e60d kill filing cabinet heisentests (#36757) 2025-04-20 02:01:28 -04:00
PJBot
99364dc4de Automatic changelog update 2025-04-20 05:59:48 +00:00
PJBot
d5252d9808 Automatic changelog update 2025-04-20 05:58:08 +00:00
Alzore
d7c244293c Aquatic tail and back fin markings for lizards (#33219) 
* shark tail and back fin for lizards

* credit me
 2025-04-20 15:57:01 +10:00
TytosB
394c0c5414 loop lairlock lattice fix (#36758) 
* sinful

* funeralofdeadbutterflies

* butterfly

* lattice fix
 2025-04-19 23:51:13 -06:00
TytosB
5ad02a0844 New salv ruin- butterfly funeral (#36755) 2025-04-19 22:22:04 -07:00
TytosB
739917641d Salvage ruins- the deadly sins (#36754) 2025-04-19 21:32:19 -07:00
Spessmann
1aa397bcd6 Add More Ruins (#36752) 2025-04-19 21:27:20 -07:00
Tayrtahn
31cf0505c9 Convert NameIdentifier to use NameModifierSystem (#36736) 
Convert NameIdentifier to use NameModifierSystem
 2025-04-20 14:16:59 +10:00
Emisse
a6d2b1f0b8 Terrarium ruin (#36739) 2025-04-19 21:03:34 -06:00
PJBot
89d0eb140e Automatic changelog update 2025-04-20 02:42:30 +00:00
ArtisticRoomba
44925b9be7 Fix spray nozzle not cleaning reagents properly (#35950) 
* init, god help us all

* further refining

* final round of bugfixes

* whoopsies

* To file scoped namespace

* first review

* oopsie

* oopsie woopsie

* pie is on my face

* persistence

* datafieldn't

* make PreviousTileRef nullable

* change component to file scoped namespace

* Minor tweaks:

- We clamp the reaction amount to a minimum value because when working with percentages and dividing, we approach numbers like 0.01 and never actually properly delete the entity (because we check for zero). This allows us to react with a minimum amount and cleans things up nicely.
- Minor clarification to comments.
- Rebalancing of the spray nozzle projectile.

* the scug lies!!!!

* undo file scoped namespace in system

* kid named warning

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
 2025-04-19 22:41:24 -04:00
shibe
a90c16b8d1 Add one word to the dragon summon announcement (#36749) 
terror!!!!
 2025-04-20 12:26:10 +10:00