Candles Crate #29736
Merged
Candles Crate #29736
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
Changes: No C#
|
Thank you for your first PR! Codewise it looks good! I think that candles are available in the Chaplain's vending machine and may be restockable that way? That being said, there is an argument to be made to have them directly orderable via Cargo instead of needing the restock box. Either way you may want to stock the crate with the candle boxes instead of having them be lying freely in the crate. |
|
Hello, thank you for the quick review! I didn't know about the candle boxes, and they do certainly look like the better implementation. I did a test and seems like the Chaplain vendor can't be restocked currently (tested the generic wardrobe refill box to no effect). But I'll probably save looking at the PietyVend and restocking that for another PR. |
|
500 for a few candles seems pricy(You can get 5 weh plushies for the same price). Maybe 2-3 boxes instead because candles tend to not last that long in comparison to the length of a shift. |
|
I think it all looks good; I would probably change the description slightly (it can be interpreted as 2 boxes total, rather than 2 large boxes & 2 small boxes) but that's all I can think of.
|
SlamBamActionman
approved these changes
Jul 8, 2024
github-actions
bot
added
the
S: Needs Review
|
I believe the check also needs to be rerun. I'm not sure if I can rerun tests myself. |
SlamBamActionman
approved these changes
Jul 17, 2024
Schrodinger71
added a commit
to AdventureTimeSS14/space_station_ADT
that referenced
this pull request
Aug 7, 2024
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это
комментарии - они не будут видны в PR. -->
## Описание PR
<!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это
может повлиять? Постарайтесь описать все внесённые вами изменения! -->
## Admin.yml
<details><summary>Лист чейнжлогов, смотреть подробнее..</summary>
```yml
- author: Repo
changes:
- message: Added aHelp player pinning.
type: Add
- message: Added disconnection, reconnection, banning notice on relay and ahelp.
type: Add
- message: Fixed search clears on aHelp close.
type: Fix
id: 46
time: '2024-07-30T08:28:32.0000000+00:00'
url: space-wizards/space-station-14#28639
- author: Repo
changes:
- message: Fixed Ahelp Sorting
type: Fix
id: 47
time: '2024-07-31T01:58:31.0000000+00:00'
url: space-wizards/space-station-14#30518
Name: Admin
Order: 1
```
</details>
## Changelog.yml
<details><summary>Лист чейнжлогов, смотреть подробнее..</summary>
```yml
- author: Plykiya
changes:
- message: Syndicate traitor reinforcements are now specialized to be medics, spies,
or thieves.
type: Add
- message: Reinforcement radios with options now have a radial menu, similar to
RCDs.
type: Tweak
id: 6956
time: '2024-07-21T10:32:25.0000000+00:00'
url: space-wizards/space-station-14#29853
- author: Cojoke-dot
changes:
- message: Dead Space Dragons no long despawn
type: Fix
id: 6957
time: '2024-07-21T10:46:33.0000000+00:00'
url: space-wizards/space-station-14#29842
- author: slarticodefast
changes:
- message: Fixed microwave construction.
type: Fix
id: 6958
time: '2024-07-21T16:20:09.0000000+00:00'
url: space-wizards/space-station-14#30232
- author: Sphiral&Kezu
changes:
- message: 'Added a variety of new wall based storages: Shelfs! Build some today!'
type: Add
id: 6959
time: '2024-07-21T17:16:58.0000000+00:00'
url: space-wizards/space-station-14#27858
- author: valquaint, slarticodefast
changes:
- message: Fixed borgs being unable to state laws with an activated flashlight.
type: Fix
id: 6960
time: '2024-07-22T03:55:35.0000000+00:00'
url: space-wizards/space-station-14#30183
- author: Lank
changes:
- message: Darts can now pop balloons. Keep them away from any monkeys.
type: Add
id: 6961
time: '2024-07-22T05:38:56.0000000+00:00'
url: space-wizards/space-station-14#30088
- author: Plykiya
changes:
- message: You can now eat or drink and swap hands without it being interrupted.
type: Tweak
id: 6962
time: '2024-07-22T09:17:57.0000000+00:00'
url: space-wizards/space-station-14#30060
- author: IProduceWidgets
changes:
- message: Zookeepers can now possess Nonlethal shotguns according to spacelaw.
type: Tweak
id: 6963
time: '2024-07-22T09:33:03.0000000+00:00'
url: space-wizards/space-station-14#30237
- author: Plykiya
changes:
- message: Bag sounds can now only be heard from half the distance and is quieter
in general.
type: Tweak
id: 6964
time: '2024-07-22T09:54:15.0000000+00:00'
url: space-wizards/space-station-14#30225
- author: osjarw
changes:
- message: Syringes are now 0.5 seconds faster.
type: Tweak
id: 6965
time: '2024-07-22T10:20:36.0000000+00:00'
url: space-wizards/space-station-14#29825
- author: Errant
changes:
- message: Replay observers now always spawn on the station.
type: Fix
id: 6966
time: '2024-07-22T19:32:30.0000000+00:00'
url: space-wizards/space-station-14#30252
- author: Cojoke-dot
changes:
- message: You can now read the volume of a gas tank in its examine text
type: Tweak
id: 6967
time: '2024-07-22T21:41:42.0000000+00:00'
url: space-wizards/space-station-14#29771
- author: Cojoke-dot
changes:
- message: Throwing a jetpack mid-flight will no longer freeze your character
type: Fix
id: 6968
time: '2024-07-22T22:24:26.0000000+00:00'
url: space-wizards/space-station-14#30223
- author: Flareguy
changes:
- message: Added vox sprites for a few headwear items, including radiation suits
and the paramedic helmet.
type: Add
id: 6969
time: '2024-07-23T02:18:33.0000000+00:00'
url: space-wizards/space-station-14#30150
- author: Cojoke-dot
changes:
- message: You can no longer use telescreens and televisions while blind or asleep.
type: Fix
id: 6970
time: '2024-07-23T02:33:41.0000000+00:00'
url: space-wizards/space-station-14#30260
- author: Cojoke-dot
changes:
- message: Fix one of the QSI popups
type: Fix
id: 6971
time: '2024-07-23T03:23:04.0000000+00:00'
url: space-wizards/space-station-14#30265
- author: Errant
changes:
- message: Players are now notified when trying to insert an incompatible magazine
into a gun.
type: Add
id: 6972
time: '2024-07-23T06:36:06.0000000+00:00'
url: space-wizards/space-station-14#29046
- author: TheKittehJesus
changes:
- message: The Syndicate Assault Borg can now wield their double esword
type: Fix
id: 6973
time: '2024-07-23T08:13:18.0000000+00:00'
url: space-wizards/space-station-14#30229
- author: Scribbles0
changes:
- message: Handless mobs can no longer wipe devices like positronic brains or pAIs.
type: Fix
id: 6974
time: '2024-07-23T17:47:08.0000000+00:00'
url: space-wizards/space-station-14#30149
- author: Quantus
changes:
- message: Reagent grinders can no longer auto-grind when unpowered.
type: Fix
id: 6975
time: '2024-07-23T21:02:07.0000000+00:00'
url: space-wizards/space-station-14#30267
- author: BombasterDS
changes:
- message: Fixed items disappearing after shelfs and mannequin disassembling
type: Fix
id: 6976
time: '2024-07-24T08:57:03.0000000+00:00'
url: space-wizards/space-station-14#30313
- author: Cojoke-dot
changes:
- message: Fix infinite QSI linking range
type: Fix
id: 6977
time: '2024-07-24T20:57:45.0000000+00:00'
url: space-wizards/space-station-14#30332
- author: deltanedas
changes:
- message: Borgs can no longer unlock the robotics console or other borgs.
type: Tweak
id: 6978
time: '2024-07-25T03:54:52.0000000+00:00'
url: space-wizards/space-station-14#27888
- author: themias
changes:
- message: Fixed the ripley control panel not loading
type: Fix
id: 6979
time: '2024-07-25T05:23:53.0000000+00:00'
url: space-wizards/space-station-14#30325
- author: Timur2011
changes:
- message: Space adders are now butcherable.
type: Add
- message: Snakes now drop snake meat when butchered.
type: Fix
- message: Snakes now appear lying when in critical state.
type: Tweak
id: 6980
time: '2024-07-25T10:52:18.0000000+00:00'
url: space-wizards/space-station-14#29629
- author: Plykiya
changes:
- message: You can now build atmos gas pipes through things like walls.
type: Tweak
id: 6981
time: '2024-07-25T23:26:06.0000000+00:00'
url: space-wizards/space-station-14#28707
- author: Ilya246
changes:
- message: Nuclear operative reinforcements now come with full nuclear operative
gear (and a toy carp) at no additional cost.
type: Tweak
- message: Nuclear operative reinforcements now get nuclear operative names.
type: Tweak
id: 6982
time: '2024-07-25T23:37:54.0000000+00:00'
url: space-wizards/space-station-14#30173
- author: Cojoke-dot
changes:
- message: Engineering goggles and other similar-looking eyewear now help block
identity.
type: Tweak
- message: Radiation suit's hood now blocks identity.
type: Fix
id: 6983
time: '2024-07-26T05:26:05.0000000+00:00'
url: space-wizards/space-station-14#30305
- author: Moomoobeef
changes:
- message: Some radio channel colors have been tweaked in order to be more easily
distinguishable.
type: Tweak
id: 6984
time: '2024-07-26T06:47:20.0000000+00:00'
url: space-wizards/space-station-14#30133
- author: Errant
changes:
- message: Replay ghosts now actually spawn on the proper station, take two.
type: Fix
id: 6985
time: '2024-07-26T12:59:43.0000000+00:00'
url: space-wizards/space-station-14#30273
- author: themias
changes:
- message: Arcade machines are functional again
type: Fix
id: 6986
time: '2024-07-26T17:30:50.0000000+00:00'
url: space-wizards/space-station-14#30376
- author: themias
changes:
- message: Zombies now get uncuffed upon transformation
type: Fix
id: 6987
time: '2024-07-26T18:48:03.0000000+00:00'
url: space-wizards/space-station-14#30321
- author: metalgearsloth
changes:
- message: Fix grid labels getting spammed from VGRoid.
type: Fix
id: 6988
time: '2024-07-27T01:54:38.0000000+00:00'
url: space-wizards/space-station-14#29946
- author: GoldenCan
changes:
- message: Added a Security Clown Mask which is obtainable by hacking a SecDrobe.
type: Add
id: 6989
time: '2024-07-27T04:09:24.0000000+00:00'
url: space-wizards/space-station-14#30249
- author: Plykiya
changes:
- message: Thief game rule now properly selects more than one thief.
type: Fix
id: 6990
time: '2024-07-27T07:27:21.0000000+00:00'
url: space-wizards/space-station-14#30393
- author: BombasterDS
changes:
- message: Added new plant mutations for apple, sugarcane and galaxythistle
type: Add
id: 6991
time: '2024-07-27T15:08:49.0000000+00:00'
url: space-wizards/space-station-14#28993
- author: Spessmann
changes:
- message: Thief objectives for figurines and stamps now require less items
type: Tweak
id: 6992
time: '2024-07-27T23:11:27.0000000+00:00'
url: space-wizards/space-station-14#30390
- author: metalgearsloth
changes:
- message: Moved VGRoid from 1,000m away to ~500m.
type: Tweak
id: 6993
time: '2024-07-28T03:14:18.0000000+00:00'
url: space-wizards/space-station-14#29943
- author: lzk228
changes:
- message: Fixed pancakes stacks. Before it, splitting not default pancakes stacks
would give you default pancakes.
type: Fix
id: 6994
time: '2024-07-28T03:49:06.0000000+00:00'
url: space-wizards/space-station-14#30270
- author: Plykiya
changes:
- message: Fixed the client mispredicting people slipping with their magboots turned
on
type: Fix
id: 6995
time: '2024-07-28T06:17:06.0000000+00:00'
url: space-wizards/space-station-14#30425
- author: Katzenminer
changes:
- message: Pun and similar pets are no longer firemune
type: Fix
id: 6996
time: '2024-07-28T08:32:27.0000000+00:00'
url: space-wizards/space-station-14#30424
- author: lzk228
changes:
- message: Fixed permanent absence of the approver string in cargo invoice.
type: Fix
id: 6997
time: '2024-07-29T06:19:43.0000000+00:00'
url: space-wizards/space-station-14#29690
- author: JIPDawg
changes:
- message: F9 is correctly bound to the Round End Summary window by default now.
type: Fix
id: 6998
time: '2024-07-29T06:49:28.0000000+00:00'
url: space-wizards/space-station-14#30438
- author: githubuser508
changes:
- message: Candles crate and the ability for Cargo to order it.
type: Add
id: 6999
time: '2024-07-29T08:29:27.0000000+00:00'
url: space-wizards/space-station-14#29736
- author: Blackern5000
changes:
- message: Emergency oxygen and fire lockers now generally contain more supplies
type: Tweak
id: 7000
time: '2024-07-29T09:57:04.0000000+00:00'
url: space-wizards/space-station-14#29230
- author: Moomoobeef
changes:
- message: Added the ability to wear lizard plushies on your head!
type: Add
id: 7001
time: '2024-07-29T12:52:40.0000000+00:00'
url: space-wizards/space-station-14#30400
- author: TurboTrackerss14
changes:
- message: Reduced Kobold ghostrole chance to mirror Monkey
type: Tweak
id: 7002
time: '2024-07-29T15:16:54.0000000+00:00'
url: space-wizards/space-station-14#30450
- author: Ian321
changes:
- message: The Courser now comes with a defibrillator.
type: Tweak
id: 7003
time: '2024-07-30T01:05:27.0000000+00:00'
url: space-wizards/space-station-14#30471
- author: slarticodefast
changes:
- message: Fixed puppy Ian not counting as a thief steal target.
type: Fix
id: 7004
time: '2024-07-30T01:22:17.0000000+00:00'
url: space-wizards/space-station-14#30474
- author: themias
changes:
- message: Added envelopes to the PTech and bureaucracy crate
type: Add
id: 7005
time: '2024-07-30T01:49:05.0000000+00:00'
url: space-wizards/space-station-14#30298
- author: TheKittehJesus
changes:
- message: The recipe for chow mein, egg-fried rice, and both brownies now use liquid
egg instead of a whole egg.
type: Tweak
- message: Cake batter now also requires 5u of milk
type: Tweak
id: 7006
time: '2024-07-30T02:14:11.0000000+00:00'
url: space-wizards/space-station-14#30262
- author: Plykiya
changes:
- message: Wearing something that covers your head will prevent your hair from being
cut.
type: Add
- message: You now see a popup when your hair is being altered.
type: Add
- message: The doafter for altering other people's hair now takes seven seconds.
type: Tweak
id: 7007
time: '2024-07-30T02:17:28.0000000+00:00'
url: space-wizards/space-station-14#30366
- author: Cojoke-dot
changes:
- message: Hamlet and other ghost rolls can now spin when they enter combat mode
type: Fix
id: 7008
time: '2024-07-30T02:48:28.0000000+00:00'
url: space-wizards/space-station-14#30478
- author: themias
changes:
- message: Fixed the ACC wire not appearing in vending machine wire layouts
type: Fix
id: 7009
time: '2024-07-30T03:04:17.0000000+00:00'
url: space-wizards/space-station-14#30453
- author: Blackern5000
changes:
- message: The defibrillator has been recolored slightly
type: Tweak
id: 7010
time: '2024-07-30T04:41:21.0000000+00:00'
url: space-wizards/space-station-14#29964
- author: themias
changes:
- message: Fixed victim's fingerprints transferring onto an attacker's weapon
type: Fix
id: 7011
time: '2024-07-30T08:35:30.0000000+00:00'
url: space-wizards/space-station-14#30257
- author: to4no_fix
changes:
- message: Now engineering access is needed to interact with the particle accelerator
type: Tweak
id: 7012
time: '2024-07-30T11:29:32.0000000+00:00'
url: space-wizards/space-station-14#30394
- author: Cojoke-dot
changes:
- message: You can no longer get out of a disposal chute or container while knocked
over by trying to walk
type: Fix
id: 7013
time: '2024-07-30T13:53:44.0000000+00:00'
url: space-wizards/space-station-14#30391
- author: Cojoke-dot
changes:
- message: QSI now swaps the top most valid container instead of QSI when placed
in an anchored container
type: Fix
id: 7014
time: '2024-07-30T14:07:35.0000000+00:00'
url: space-wizards/space-station-14#30241
- author: TheShuEd
changes:
- message: industrial ore processor can now process diamonds
type: Fix
id: 7015
time: '2024-07-30T14:41:15.0000000+00:00'
url: space-wizards/space-station-14#30499
- author: PJB3005
changes:
- message: CLF3 is now called "chlorine trifluoride"
type: Tweak
id: 7016
time: '2024-07-31T00:14:23.0000000+00:00'
url: space-wizards/space-station-14#30510
- author: slarticodefast
changes:
- message: Fixed the mouse position when it is over a singularity distortion effect
while zoomed in or out.
type: Fix
id: 7017
time: '2024-07-31T00:14:49.0000000+00:00'
url: space-wizards/space-station-14#30509
- author: metalgearsloth
changes:
- message: Add a button to the lobby so you can export a .png of your characters
type: Add
id: 7018
time: '2024-07-31T15:14:20.0000000+00:00'
url: space-wizards/space-station-14#29874
- author: slarticodefast
changes:
- message: Skeletons no longer have fingerprints.
type: Tweak
id: 7019
time: '2024-07-31T16:08:20.0000000+00:00'
url: space-wizards/space-station-14#30530
- author: themias
changes:
- message: Pens can be clicked cathartically
type: Tweak
id: 7020
time: '2024-07-31T17:57:41.0000000+00:00'
url: space-wizards/space-station-14#30531
- author: Plykiya
changes:
- message: Meteors now leave behind asteroid rocks on impact.
type: Add
id: 7021
time: '2024-08-01T02:55:02.0000000+00:00'
url: space-wizards/space-station-14#30419
- author: PixelTheAertist
changes:
- message: The Social Anxiety trait is now renamed to "Stutter"
type: Tweak
id: 7022
time: '2024-08-01T02:58:16.0000000+00:00'
url: space-wizards/space-station-14#29898
- author: Plykiya
changes:
- message: Adds hand labelers to the PTech, ChemDrobe, and LawDrobe.
type: Add
id: 7023
time: '2024-08-01T02:59:54.0000000+00:00'
url: space-wizards/space-station-14#29958
- author: Ko4erga
changes:
- message: Added a cutter machine for crafting patterned steel tiles, concrete and
wooden tiles.
type: Add
- message: After rip off patterned tiles you get current pattern, not just steel
tile.
type: Tweak
id: 7024
time: '2024-08-01T10:26:32.0000000+00:00'
url: space-wizards/space-station-14#30431
- author: NakataRin
changes:
- message: Added paramedic to the train station.
type: Add
id: 7025
time: '2024-08-01T19:59:43.0000000+00:00'
url: space-wizards/space-station-14#30556
- author: marbow
changes:
- message: Rejoice, detectives! Hand labeler has been added to your closet!
type: Add
id: 7026
time: '2024-08-01T20:01:05.0000000+00:00'
url: space-wizards/space-station-14#30501
- author: metalgearsloth
changes:
- message: Fix some popups playing twice.
type: Fix
id: 7027
time: '2024-08-02T01:33:20.0000000+00:00'
url: space-wizards/space-station-14#30452
- author: WarMechanic
changes:
- message: Adjusted meteors to have less lethal blast fragments.
type: Tweak
id: 7028
time: '2024-08-02T05:43:41.0000000+00:00'
url: space-wizards/space-station-14#29199
- author: slarticodefast
changes:
- message: Fixed borgs not being able to state laws or open other UIs without an
active module.
type: Fix
id: 7029
time: '2024-08-02T05:44:59.0000000+00:00'
url: space-wizards/space-station-14#30299
- author: TropicalHibi
changes:
- message: Now fs (for sure) and wru (where are you) are changed to their full version
in text
type: Add
id: 7030
time: '2024-08-02T05:57:50.0000000+00:00'
url: space-wizards/space-station-14#30508
- author: Plykiya
changes:
- message: Rechargers now show the percent charged of the item it is charging.
type: Add
id: 7031
time: '2024-08-02T06:05:38.0000000+00:00'
url: space-wizards/space-station-14#28500
- author: ShadowCommander
changes:
- message: Rollerbeds now deploy when holding them in hand and clicking on the ground.
type: Add
id: 7032
time: '2024-08-02T07:05:12.0000000+00:00'
url: space-wizards/space-station-14#30000
```
</details>
**Проверки**
<!-- Выполнение всех следующих действий, если это приемлемо для вида
изменений сильно ускорит разбор вашего PR -->
- [x] PR полностью завершён и мне не нужна помощь чтобы его закончить.
- [x] Я внимательно просмотрел все свои изменения и багов в них не
нашёл.
- [x] Я запускал локальный сервер со своими изменениями и всё
протестировал.
- [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR
этого не требует.
**Изменения**
:cl: Шрёдька
- tweak: Подтянуты коммиты с Корвакса, 07.08.24
themias
pushed a commit
to themias/space-station-14
that referenced
this pull request
Aug 9, 2024
* First attempt at adding crate * Changed loose candles to candle boxes * Corrected minor typo * Removed a change to the development preset * Buffed crate to 2 of each box * Hopefully removes strange not-change in the repo * Updated description to be clearer. --------- Co-authored-by: elee-github <elee2020@yahoo.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Added a crate for candles that Cargo can order. 2 BoxCandle and 2 BoxCandleSmall for 500 spesos.
Why / Balance
Candles are a fun little item that can be useful for Chaplain RP and just general vibes. They are consumable and, as far as I am aware, unrenewable at the moment. Reselling is a big loss; the entire crate would sell for 70 spesos.
Technical details
yaml changes
Resources/Prototypes/Catalog/Cargo/cargo_service.yml(added crate and price to Cargo's service list)Resources/Prototypes/Catalog/Fills/Boxes/security.yml(added crate fill for the candles crate)Media
Breaking changes
There should not be any breaking changes. Hopefully.
Changelog
🆑