juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,373 Commits 57 Branches 0 Tags
26f91c3a5ab5e6d5cef83347e97c3eacaa25d970
Commit Graph

16604 Commits

Author SHA1 Message Date
Jaraten
26f91c3a5a resprite tiles (#163) 2024-05-21 15:50:37 +03:00
Jaraten
82013c2be1 Wooden Window Fix (#162) 2024-05-21 11:54:45 +03:00
Ed
18e4e86b21 Ed 19 05 2024 building2 (#161) 
* added wooden planks from wooden logs

* update construction crafts from new wood planks

* Update simple.yml

* add wall frame and wall construction graph

* noSpawn old planks, fix wooden frame layering

* update Jaraten sprites

* add wooden window and restruct files

* fix

* Update wall.yml

* add new walls!

* restruct wallmounts, fix bugs

* door fix

* Update walls.yml

* Update simple.yml
 2024-05-21 00:07:51 +03:00
Ed
1dbb4e7e94 Merge branch 'master' into ed-19-05-2024-upstream 2024-05-19 15:57:20 +03:00
Ed
6a639107b3 Merge remote-tracking branch 'space-station-14/master' into ed-19-05-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
 2024-05-19 15:43:25 +03:00
Ed
1ce32bd1c7 Logs + fireplace fix + Trees (#158) 
* add wooden log stacks

* setup wood material

* update trees

* fix fireplaces

* stack now properly works in fireplace system

* bonfire fix

* Update materials.yml

* Update base.yml
 2024-05-19 15:40:28 +03:00
PJBot
e5f30b12d2 Automatic changelog update 2024-05-19 01:36:52 +00:00
DrSmugleaf
3d41d5f2bc Make wielding automatically drop the item on your other hand (#27975) 
* Make wielding automatically drop the item on your other hand

* Fix docs

* Remove redundant parameter

* Fix not deleting virtuals on fail

* Make count freeable hands method

* Add popup when dropping item
 2024-05-18 18:35:46 -07:00
github-actions[bot]
676fc22eb4 Update Credits (#28124) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2024-05-19 03:33:41 +02:00
PJBot
74e853ee7d Automatic changelog update 2024-05-19 00:24:50 +00:00
Ed
13d104c0de update ladder color 2024-05-19 00:44:37 +03:00
Ed
b66ce952af Minecraft update (#157) 
* add shovel and digging tool quality

* dirt digging effect

* variantize deconstructed tile

* added dirt tile borders

* revert variantize tiles, add dirt blocks entity

* add dirt stack

* Update simple.yml
 2024-05-19 00:26:52 +03:00
Tayrtahn
bad3bb4a89 Random book story generator refactor (#28082) 
* Randomized book overhaul

* Fix prototype names

* Improved setting paper content

* Praise Ratvar
 2024-05-18 12:20:00 -04:00
Ed
225a05ecdb Nuke spaceshroom ore (#28110) 
nuke spaceshroom ore
 2024-05-18 12:17:46 -04:00
Ed
8c7f26f860 Overworld biome overhaul (#156) 
* decals filter adding

* add planet generation!

* Update biomes_template_grasslands.yml
 2024-05-18 18:06:53 +03:00
Tornado Tech
0aa0abb949 New tiefling hue (#155) 
* Добавлен отдельный тип цвета кожи для тифлингов

* Немного чистки

* Автоматом поправил, будет мешать при мердже
 2024-05-18 17:46:19 +03:00
PJBot
8bbd2394ef Automatic changelog update 2024-05-18 14:24:24 +00:00
Ed
9690077532 Bloodgrass gatherable entity + gatherable system cleanup + bugfix (#154) 
* added 4 basic reagent effects

* entrance bugfixes

* add bloodgrass world sprites

* preuso cherry pick

* add planet bloodgrass and sickle gathering

* +1 gather sound
 2024-05-18 15:16:20 +03:00
lzk
37382b3186 Move pens out of paper.yml mess (#28044) 
* Move pens out of paper.yml mess

* forgor

* fix tests

* fux

* fix 2
 2024-05-18 12:51:02 +03:00
PJBot
ca96a27c31 Automatic changelog update 2024-05-17 19:47:51 +00:00
YuNii
99072341eb Add keybind option for the Emote Menu (#28083) 
* Add keybind option for the Emote Menu

* Update .editorconfig

oopsies
 2024-05-17 21:46:45 +02:00
PJBot
6082df7eac Automatic changelog update 2024-05-17 16:34:28 +00:00
lzk
b08f79fb38 Move replacement chance from ReplacementAccentComponent to ReplacementAccentPrototype (#28049) 
Move replacement chance to ReplacementAccentPrototype
 2024-05-17 19:33:22 +03:00
Ed
a29034a133 tile filter (#153) 2024-05-17 18:16:14 +03:00
Ed
811cc8a41d Underworld + Overworld (#151) 
* Setup new dungeon system (v2)

* add custom basic generation

* add maps linking

shitcode, boo

* add auto linking sub-world portal

* fix deleted component

* clearing otherside of the tiles manually (im stuck in wall, brother!)

* Upgrade cave biome generation

* add TODO

* add ladder and hole sprites

* add dungeon entrance prototypes

* clean up, add docs

* add many ambient sounds

* Update CP14StationDungeonMapSystem.cs

* remove bugs
 2024-05-17 17:07:29 +03:00
Ed
918ba35ccb Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-17-05-2024-upstream 2024-05-17 12:57:04 +03:00
PJBot
fd8b195c4e Automatic changelog update 2024-05-17 07:52:35 +00:00
Emisse
157c57a94f bagel update (#28080) 2024-05-17 00:15:52 -06:00
PJBot
0a9ac37fcc Automatic changelog update 2024-05-16 20:52:13 +00:00
Errant
6c5b84a346 Remove throngler lottery mention from Tips (#28073) 
You sit on a throne of lies
 2024-05-16 13:53:46 +03:00
PJBot
91afb12993 Automatic changelog update 2024-05-15 21:04:04 +00:00
EdenTheLiznerd
f3910d3410 Remove The Throngler from Grand Lottery (#28060) 
Peace and Quiet
 2024-05-15 23:02:58 +02:00
PJBot
6fd5015940 Automatic changelog update 2024-05-15 10:32:00 +00:00
Verm
2be4287193 Fix Shuttle Roles spawning without PDAs and Headsets (#28045) 
* Move to starting gear, define a bunch of stuff

* Spacing
 2024-05-15 13:30:53 +03:00
Flareguy
3243afbb03 Makes bullet casings destructible by explosions (#27910) 
makes casings destructible
 2024-05-14 20:23:24 -04:00
PJBot
13ba3fc4da Automatic changelog update 2024-05-15 00:00:52 +00:00
Nairod
f1260dae00 Replace Chef Ship Helmet (#28036) 
Replace Chef Ship EVA Helm
 2024-05-14 19:59:06 -04:00
PJBot
3d2f3c174b Automatic changelog update 2024-05-14 23:58:30 +00:00
Tunguso4ka
9e8920c9aa Renamed old snake_case IDs to PascalCase IDs (#28014) 
* Renamed soda_dispenser to SodaDispenser

* oops, wrong time

* oops

* guidebook

* chem_master
 2024-05-14 19:57:42 -04:00
lzk
26747be232 Make hotplate and grill anchorable on table (#28026) 
Make hotplate and grill anchorable
 2024-05-14 19:57:23 -04:00
PJBot
0edc9218d6 Automatic changelog update 2024-05-14 04:54:53 +00:00
Nemanja
950adc8fde Revert "Stop Toilets crushing you into walls" (#27994) 
Revert "Stop Toilets crushing you into walls (#27778)"

This reverts commit 24e227660a.
 2024-05-14 10:29:50 +10:00
PJBot
f78da7da33 Automatic changelog update 2024-05-13 21:50:50 +00:00
PJBot
d68186ff5c Automatic changelog update 2024-05-13 21:47:23 +00:00
PJBot
1a9766bd67 Automatic changelog update 2024-05-13 19:27:06 +00:00
lzk
74020abc91 Fix skirts femalemask (#27984) 
Fix skirts
 2024-05-13 13:25:58 -06:00
Ed
0a449d64d6 Remove station ambient (#149) 
* Update audio.yml

* setup ambience rule
 2024-05-13 18:56:39 +03:00
Ed
dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream 
# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml
 2024-05-13 18:32:59 +03:00
PJBot
efc430f651 Automatic changelog update 2024-05-13 00:04:13 +00:00
PJBot
c325ca8566 Automatic changelog update 2024-05-12 22:15:41 +00:00