Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream Merge 08/05/2024 #77

Merged
merged 85 commits into from
Aug 6, 2024
+7,165 −2,436
Merged

Upstream Merge 08/05/2024 #77

Changes from 1 commit
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
c92ea10
Update Credits (#602)
github-actions[bot] Jul 28, 2024
a0d7f7d
Box Retexture (#597)
CilliePaint Jul 29, 2024
4b9c598
Automatic Changelog Update (#597)
SimpleStation14 Jul 29, 2024
faa239a
Fix 125 Toolshed Commands Being Unusable for Anyone without +HOST (#572)
Mnemotechnician Jul 29, 2024
41a5e8e
Automatic Changelog Update (#572)
SimpleStation14 Jul 29, 2024
a9e28ee
Radiation Doesn't Prevent DoAfters (#606)
VMSolidus Jul 29, 2024
7c5625b
Automatic Changelog Update (#606)
SimpleStation14 Jul 29, 2024
54c119e
Make Jobs & Antags Use CharacterRequirements (#596)
DEATHB4DEFEAT Jul 29, 2024
56d039c
Add Cybernetic Limb Markings (#613)
angelofallars Jul 30, 2024
055ad75
Automatic Changelog Update (#613)
SimpleStation14 Jul 30, 2024
08dde02
Add Makeup (#614)
angelofallars Jul 30, 2024
b744818
Automatic Changelog Update (#614)
SimpleStation14 Jul 30, 2024
29cb1b0
Hotfix Late Joins (#612)
VMSolidus Jul 31, 2024
d38c7d4
Hotfix Playtime Requirements (#621)
Mnemotechnician Jul 31, 2024
9527936
Remove Cargo Pallet From Request Console (#626)
Tmanzxd Jul 31, 2024
3a9c337
Use Correct Changelog Name (#627)
angelofallars Jul 31, 2024
d39c990
Fix Sound Params (#624)
VMSolidus Jul 31, 2024
5f73a5a
Automatic Changelog Update (#624)
SimpleStation14 Jul 31, 2024
c0114c0
Lasers Have No Recoil (#603)
VMSolidus Jul 31, 2024
8a3abcb
Automatic Changelog Update (#603)
SimpleStation14 Jul 31, 2024
fa2abfa
Fix the Uncategorized Category Not Being Hidden (#628)
DEATHB4DEFEAT Jul 31, 2024
5335dce
Automatic Changelog Update (#628)
SimpleStation14 Jul 31, 2024
b15d096
Minor Language Fixes (#618)
Mnemotechnician Jul 31, 2024
80eb456
Comms Console Announcer Fixes (#610)
VMSolidus Jul 31, 2024
3da588f
Automatic Changelog Update (#618)
SimpleStation14 Jul 31, 2024
6d1ae15
More Loadout Items: Wave 2 (#616)
angelofallars Aug 1, 2024
b3c3647
Automatic Changelog Update (#616)
SimpleStation14 Aug 1, 2024
7fb089d
Replace and Fix MedHud Icons (#631)
Tmanzxd Aug 1, 2024
5f2cae0
Manual Removal of easy_pry.yml (#632)
Tmanzxd Aug 1, 2024
00a74a2
Revert "Mirror: Restrict Door Remotes to only Being Able to Manipulat…
stellar-novas Aug 1, 2024
ac2fc06
Invert the Running/Walking States (#485)
DEATHB4DEFEAT Aug 1, 2024
a6237f3
Automatic Changelog Update (#485)
SimpleStation14 Aug 1, 2024
94098c6
Move Survival Boxes To Loadouts (#634)
VMSolidus Aug 1, 2024
11524d8
Automatic Changelog Update (#634)
SimpleStation14 Aug 1, 2024
dfdae62
Make Boxes Not Useless (#635)
VMSolidus Aug 1, 2024
437ac5a
Automatic Changelog Update (#635)
SimpleStation14 Aug 1, 2024
6bc8b60
"Buff" Vision Traits (#636)
VMSolidus Aug 1, 2024
0d1c931
Automatic Changelog Update (#636)
SimpleStation14 Aug 1, 2024
c96cfcc
More Loadout Items: Wave 3 (#633)
angelofallars Aug 1, 2024
adafe4a
Automatic Changelog Update (#633)
SimpleStation14 Aug 1, 2024
1481146
Vulpkanin Tail Wagging (#588)
FoxxoTrystan Aug 1, 2024
8ccbf7e
Automatic Changelog Update (#588)
SimpleStation14 Aug 1, 2024
172e036
Increase Combat Knife Availability (#640)
angelofallars Aug 2, 2024
3a27ee8
Automatic Changelog Update (#640)
SimpleStation14 Aug 2, 2024
9b3f1f5
Add Breaching Charges (#638)
angelofallars Aug 2, 2024
aa9664d
Automatic Changelog Update (#638)
SimpleStation14 Aug 2, 2024
6b86a6d
AHelp Sound Improvements (#585)
DEATHB4DEFEAT Aug 2, 2024
49c944d
Automatic Changelog Update (#585)
SimpleStation14 Aug 2, 2024
d25a25c
Fix Stinky Anomaly Announcement (#646)
Mnemotechnician Aug 2, 2024
58a1f88
Revert "Refactor Ramping Event Scheduler (#592)" (#644)
Mnemotechnician Aug 2, 2024
b9b3868
Automatic Changelog Update (#644)
SimpleStation14 Aug 2, 2024
80e48a5
Supermatter Engine (Port From White Dream) (#341)
VMSolidus Aug 3, 2024
d5d3942
Automatic Changelog Update (#341)
SimpleStation14 Aug 3, 2024
d2e976e
Fix NoMaterialArbitrage Test Fail (#653)
VMSolidus Aug 3, 2024
9d25d0f
Fix for Failed to Cherry-Pick PR #26217: Fix Pressure Damage Calculat…
Tmanzxd Aug 3, 2024
7e822be
Changed Rouny Sprite (#649)
SleepyScarecrow Aug 3, 2024
b5bc583
Automatic Changelog Update (#649)
SimpleStation14 Aug 3, 2024
d2fd3c3
Merge remote-tracking branch 'EE/master' into upstream-merge
FoxxoTrystan Aug 3, 2024
75b36bf
Fix Event Manager Allowing to Start Multiple Events of the Same Type …
Mnemotechnician Aug 3, 2024
dd2a0cf
Remove Clothesmate Bloat (#637)
VMSolidus Aug 4, 2024
62045ff
Automatic Changelog Update (#637)
SimpleStation14 Aug 4, 2024
fb7c4d9
Fixes Failed to Cherry-Pick PR #25986: Return Detective to Security #…
Tmanzxd Aug 4, 2024
1509caa
Update Credits (#667)
github-actions[bot] Aug 4, 2024
f6a5a2f
Add 4 Missing Vendors To Vendor Spawners (#639)
VMSolidus Aug 4, 2024
1c26a10
Automatic Changelog Update (#639)
SimpleStation14 Aug 4, 2024
23fc467
New Trait: Voracious (#668)
angelofallars Aug 4, 2024
09e11de
Automatic Changelog Update (#668)
SimpleStation14 Aug 4, 2024
0b0e5f3
Zombie Improvements Take 2 (#652)
VMSolidus Aug 4, 2024
4a6ad8c
Automatic Changelog Update (#652)
SimpleStation14 Aug 4, 2024
7f784b0
Rename Trait "Heavyweight Drunk" To "Alcohol Tolerance" (#669)
angelofallars Aug 5, 2024
812a303
Automatic Changelog Update (#669)
SimpleStation14 Aug 5, 2024
0acb879
New Trait: Light Step (#658)
angelofallars Aug 5, 2024
27c2c35
Automatic Changelog Update (#658)
SimpleStation14 Aug 5, 2024
17aca3c
New Trait: Sign Language (#677)
angelofallars Aug 5, 2024
1bd9cd8
Automatic Changelog Update (#677)
SimpleStation14 Aug 5, 2024
c976bfa
Oracle Refactor (#549)
Mnemotechnician Aug 5, 2024
22c979c
Automatic Changelog Update (#549)
SimpleStation14 Aug 5, 2024
664f482
Carrying System Refactor (#580)
VMSolidus Aug 5, 2024
636f7f5
Automatic Changelog Update (#580)
SimpleStation14 Aug 5, 2024
f177d7d
Automatic Changelog Update (#673)
SimpleStation14 Aug 5, 2024
b7384e8
Merge remote-tracking branch 'EE/master' into upstream-merge
FoxxoTrystan Aug 5, 2024
fa4c669
fixes
FoxxoTrystan Aug 5, 2024
3920adc
Revert role timers
FoxxoTrystan Aug 5, 2024
6009872
Merge branch 'master' into upstream-merge
FoxxoTrystan Aug 5, 2024
99c8c22
update playtime requirements to 4 hours
Fansana Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove Cargo Pallet From Request Console (#626) 
Fixes #108
@Tmanzxd
Tmanzxd authored Jul 31, 2024
commit 95279363a8202a708db3a973fca26c165dc568f6
10 changes: 0 additions & 10 deletions Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
- type: cargoProduct
id: CargoPallet
icon:
sprite: Structures/catwalk.rsi
state: catwalk_preview
product: CargoPallet
cost: 250
category: Logistics # DeltaV - Logistics Department replacing Cargo
group: market

- type: cargoProduct
id: CargoOreBox
icon: