New music (Теперь работает!) #58

saga3152 · 2024-08-19T17:52:38Z

О PR

В ЭТОТ раз я все починил и должно работать, также по просьбе @no_elka добавил трек cayava из rain world

Почему / Баланс

Технические детали

Медиа

Я добавил к этому PR скриншоты/видео, демонстрирующие его изменения в игре, или этот PR не требует демонстрации в игре

Changelog

Убедитесь, что вы убрали этот шаблон Changelog из блока комментариев, чтобы он отображался.
🆑

add: Добавлен трек "cayava"
fix: Новые треки для музыкального автомата теперь работают!

changed all the firelocks to glass firelocks

* Fixed bug with missing gas not getting reset * Fix bug with MutateInt not using min/max in prob calculation * Add divison by zero check * Fix styling

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

added a bunch of air alarms and fixed stuff

…ell Window Shutters (#31136)

* fix some salvage spawner oversights * adjust carp rates * more tweaks and some additions

* bagel update * variantize * fix nitrogen room air explosion * dumb

…-backed servers (#31154) Fixed IP bans causing server errors with SQLite DB

* Fixed typo: access --> accessed * Fixed typo: 'access restricted' --> 'access-restricted' * Fixed typo: added 'be' * Fixed typo: added 'a' * Fixed typo: 'Asssistants' --> 'Assistants' * Fixed typo: 'overpressure' --> 'overpressurize' * Fixed typo: 'outisde' --> 'outside' * Fixed typo: added a comma * Fixed typo: added a comma * Fixed typo: 'aformentioned' --> 'aforementioned' * Fixed typo: added a comma * Fixed typo: added a comma * Fixed typo: 'radition' --> 'radiation' * Fixed typo: 'turing' --> 'turning' * Fixed typo: 'appropiate' --> 'appropriate' * Fixed typo: added 'the' * Fixed typo: added a dot to ellipsis * Fixed typo: 'aswell' --> 'as well' * Fixed typo: 'permanant' --> 'permanent' * Fixed typo: 'flammmable' --> 'flammable' * Fixed typo: 'recommmended' --> 'recommended' * Fixed typo: 'recipies' --> 'recipes' * Fixed typo: 'pre-adminsitered' --> 'pre-administered' * Fixed typo: 'resusitated' --> 'resuscitated' * Fixed typo: 'types' --> 'type' * Fixed typo: `someones` --> `someone's` * Fixed typo: 'appy' --> 'apply' * Fixed typo: added 'to' * Fixed typo: 'CentCom' --> 'CentComm' (as per space-wizards/space-station-14#29217) * Fixed typo: 'emergencys' --> 'emergencies' * Fixed typo: removed a dash

* Xeno walls * Fix icon smoothing for the walls * Added a bunch of items, and the map/shuttle * Fixed construction graphs * Put the map in the right place gosh * Fix shuttle walls rusting, invalid IDs, latejoin cryo, deprecated properties * Fix APC names and stuff * Updated to v1.1

* Coughing * Merge branch 'space-wizards:master' into coughing * Coughing * Coughing

* Goliath mob * Update asteroid.yml * mcfuck yourself * add cloak * fixes * Update materials.yml

updated cog a ton

First commit

golden toiler

shark makes RAWR!

…(#31119)

fix raditation collectors gaslighting you

* Recycler overhaul * remove

clarify what is an important role

buffed cog atmos so now its massive

* Cheese tweaks * 22221241256247849`

First commit

…on-14 into upstream # Conflicts: # Resources/Prototypes/Voice/disease_emotes.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml # Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml # Resources/ServerInfo/Guidebook/Science/APE.xml # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json

saga3152 · 2024-08-19T17:54:38Z

В путь для трека надо было указывать Audio с большой буквы

saga3152 · 2024-08-19T23:43:42Z

Я смог повторить на локалке баг который происходил, присоединяясь к серверу из обычного клиента игры, после этого я все исправил

Merge pull request #56 from MetalSage/upstream

doublechest0 · 2024-08-20T11:35:39Z

Перенеси в Stories папки прототипы

github-actions · 2024-08-20T13:43:33Z

RSI Diff Bot; head commit 7982bfc merging into 9b84b72
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Head/Helmets/security.rsi

State	Old	New	Status
equipped-HELMET-vox			Modified

Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi

State	Old	New	Status
icon-1			Modified
icon-2			Modified
icon-3			Modified
icon-4			Modified
icon-5			Modified
icon-6			Modified
icon			Modified

Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi

State	Old	New	Status
pancakesbb1			Modified
pancakesbb2			Modified
pancakesbb3			Modified
pancakescc2			Modified
pancakescc3			Modified
pancakesbb4			Added
pancakesbb5			Added
pancakesbb6			Added
pancakesbb7			Added
pancakesbb8			Added
pancakesbb9			Added
pancakescc4			Added
pancakescc5			Added
pancakescc6			Added
pancakescc7			Added
pancakescc8			Added
pancakescc9			Added

Resources/Textures/Objects/Devices/gates.rsi

State	Old	New	Status
base			Modified
edge_detector			Modified
power_sensor			Modified
logic			Added
memory_cell			Added

Resources/Textures/Structures/Hydroponics/overlays.rsi

State	Old	New	Status
alert3			Modified

Resources/Textures/Structures/Machines/material_reclaimer.rsi

State	Old	New	Status
fill-1			Removed
fill-2			Removed
fill-3			Removed
fill-4			Removed
fill-5			Removed
fill-6			Removed
gear-active			Removed
gear-idle			Removed

Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi

State	Old	New	Status
goliath			Added
goliath_alert			Added
goliath_dead			Added
goliath_preattack			Added
goliath_tentacle_retract			Added
goliath_tentacle_spawn			Added
goliath_tentacle_wiggle			Added

Resources/Textures/Mobs/Customization/vox_facial_hair.rsi

State	Old	New	Status
manesmall_s			Added
tuft_s			Added

Resources/Textures/Mobs/Customization/vox_hair.rsi

State	Old	New	Status
spotty_s			Added
wise_braid_s			Added

Resources/Textures/Objects/Materials/Mob/carptooth.rsi

State	Old	New	Status
tooth			Added
tooth_2			Added
tooth_3			Added

Resources/Textures/Objects/Materials/Mob/sharktooth.rsi

State	Old	New	Status
inhand-left			Added
inhand-right			Added
tooth			Added
tooth_2			Added
tooth_3			Added

Resources/Textures/Objects/Materials/hide.rsi

State	Old	New	Status
goliath_hide			Added
goliath_hide_2			Added
goliath_hide_3			Added

Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi

State	Old	New	Status
dead			Added
harvest			Added
produce			Added
seed			Added
stage-1			Added
stage-2			Added
stage-3			Added

Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi

State	Old	New	Status
dead			Added
dried			Added
harvest			Added
produce			Added
seed			Added
stage-1			Added
stage-2			Added
stage-3			Added
stage-4			Added
stage-5			Added

saga3152 · 2024-08-20T13:45:37Z

Я же не синхронизировал, блин я просто щас с другого компа, щас разберусь как все лишние коммиты убрать

saga3152 · 2024-08-20T13:53:16Z

Или это ты сделал я не понимаю, так надо? По сути должны быть только мои коммиты, почему тут апстрим?

doublechest0 · 2024-08-20T13:56:54Z

Или это ты сделал я не понимаю, так надо? По сути должны быть только мои коммиты, почему тут апстрим?

Это нормально. Как я понимаю, ты замерджил мастер в свою ветку, поэтому у тебя коммиты появились.
Они уже есть в мастере, поэтому изменения будут лишь от твоих коммитов.

saga3152 · 2024-08-20T14:01:45Z

Точно, я же с другого ПК сейчас, и я подтянул автоматически с основной ветки, вот оно все и перекинулось

saga3152 · 2024-08-22T14:01:35Z

#60

saga3152 and others added 30 commits August 15, 2024 21:03

added space cruiser track

a23c122

Cog update (#31129)

1f62232

changed all the firelocks to glass firelocks

Replace obsolete map functions in disposals code (#31133)

ad4d36f

Fix botany bugs (#27210)

9c9bfda

* Fixed bug with missing gas not getting reset * Fix bug with MutateInt not using min/max in prob calculation * Add divison by zero check * Fix styling

Update Credits (#31141)

16e1c23

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

Cog update (#31148)

f09dd46

added a bunch of air alarms and fixed stuff

fix(fland): Connect the Cell Window Shutters remote signaler to the C…

1545fd5

…ell Window Shutters (#31136)

fix some salvage spawner oversights (#31114)

047a7a4

* fix some salvage spawner oversights * adjust carp rates * more tweaks and some additions

bagel update (#31150)

77a60bd

* bagel update * variantize * fix nitrogen room air explosion * dumb

Fixed IP bans preventing non-banned players from connecting to SQLite…

517f7ad

…-backed servers (#31154) Fixed IP bans causing server errors with SQLite DB

Automatic changelog update

0d969f6

Coughing and coughing changes (#30893)

7333141

* Coughing * Merge branch 'space-wizards:master' into coughing * Coughing * Coughing

Automatic changelog update

d673bdf

Goliath mob (#30839)

a540b88

* Goliath mob * Update asteroid.yml * mcfuck yourself * add cloak * fixes * Update materials.yml

Automatic changelog update

0c078f6

Cog updates (#31169)

f7fd991

updated cog a ton

bagel update (#31172)

529f4da

Cutting food now moves the food a little bit. (#31166)

78b3e32

First commit

Automatic changelog update

d38d497

Update Oasis (#31174)

c636b3b

golden toiler

pizza and pizza box tweaks (#31171)

d0bd26d

small figurines voicelines update (#31167)

8830e26

Automatic changelog update

2dfcd5c

Sharks Go RAWR! (#31142)

878384d

shark makes RAWR!

Automatic changelog update

b4ef1e9

Fix collidable held entities blocking themselves while being dropped …

4fcbb99

…(#31119)

Fix raditation collectors gaslighting you (#31175)

86b358b

fix raditation collectors gaslighting you

Added LV power cables to Marathon library (#31131)

900e57c

PJBot and others added 12 commits August 19, 2024 03:33

Automatic changelog update

1fa447f

Recycler Overhaul (#30802)

476c775

* Recycler overhaul * remove

clarify what is an important role in rule 12 (#30818)

2c98d0a

clarify what is an important role

Automatic changelog update

e85ab91

Cog update (#31188)

8486b24

buffed cog atmos so now its massive

Cheese tweaks (#31168)

c3f4243

* Cheese tweaks * 22221241256247849`

Automatic changelog update

61f756d

Seed vend restock price increase (Fix test fails) (#31185)

d297852

First commit

Automatic changelog update

972bd56

Fixed, everything works now

80323f7

Added Cayava from rainworld

9736a32

github-actions bot added the No C# label Aug 19, 2024

Doublechest and others added 3 commits August 20, 2024 05:47

fix lightsaber connect

aea90bd

fix SithSpawn

b556487

Upstream 19.08.2024

ee5a7b3

Merge pull request #56 from MetalSage/upstream

saga3152 added 2 commits August 20, 2024 15:32

Merge branch 'new-music' of https://github.com/saga3152/space-station-14

0ce89fd

moved prototype and music into stories folder

7982bfc

github-actions bot added Changes: Sprites Changes: Map labels Aug 20, 2024

saga3152 closed this Aug 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New music (Теперь работает!) #58

New music (Теперь работает!) #58

saga3152 commented Aug 19, 2024

saga3152 commented Aug 19, 2024

saga3152 commented Aug 19, 2024

doublechest0 commented Aug 20, 2024

github-actions bot commented Aug 20, 2024

saga3152 commented Aug 20, 2024

saga3152 commented Aug 20, 2024

doublechest0 commented Aug 20, 2024

saga3152 commented Aug 20, 2024

saga3152 commented Aug 22, 2024

New music (Теперь работает!) #58

New music (Теперь работает!) #58

Conversation

saga3152 commented Aug 19, 2024

О PR

Почему / Баланс

Технические детали

Медиа

saga3152 commented Aug 19, 2024

saga3152 commented Aug 19, 2024

doublechest0 commented Aug 20, 2024

github-actions bot commented Aug 20, 2024

saga3152 commented Aug 20, 2024

saga3152 commented Aug 20, 2024

doublechest0 commented Aug 20, 2024

saga3152 commented Aug 20, 2024

saga3152 commented Aug 22, 2024