Skip to content

Belt fill changes, remove wrench whitelist #34618

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

Closed
K-Dynamic wants to merge 15 commits into from
Closed

Belt fill changes, remove wrench whitelist #34618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5c7e76a
grenadier rig has two explosive grenades replaced with two shrapnel g…
K-Dynamic Jan 24, 2025
3c8dc0c
new belt fills and accepted items
K-Dynamic Jan 24, 2025
e2b0db6
new belt fills and accepted items
K-Dynamic Jan 24, 2025
9ceab15
Revert "new belt fills and accepted items"
K-Dynamic Jan 24, 2025
1c801fc
Merge branch 'engineer-loadout' of https://github.com/K-Dynamic/space…
K-Dynamic Jan 24, 2025
97975db
fucked up my branch and fixed it kinda
K-Dynamic Jan 24, 2025
35f4f50
belt whitelists in alphabetical order
K-Dynamic Feb 3, 2025
539a3f0
Merge branch 'master' into engineer-loadout
K-Dynamic Feb 5, 2025
1e20435
Merge branch 'master' into engineer-loadout
K-Dynamic Apr 22, 2025
43cebe3
whoops
K-Dynamic Apr 22, 2025
03e9d51
guh
K-Dynamic Apr 22, 2025
c9dda50
Merge branch 'master' into engineer-loadout
K-Dynamic Oct 10, 2025
3c142db
remove tray and gas analyzer
K-Dynamic Oct 10, 2025
781953b
remove seclite
K-Dynamic Oct 10, 2025
8a5ffd9
remove wrenches from belt whitelists
K-Dynamic Oct 10, 2025
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
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/store/uplink-catalog.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ uplink-c4-bundle-name = C-4 bundle
uplink-c4-bundle-desc = Because sometimes quantity is quality. Contains 8 C-4 plastic explosives.

uplink-grenadier-rig-name = grenadier chest rig
uplink-grenadier-rig-desc = All you need for a loud party: 4 explosive grenades, 2 EMP grenades and 2 minibombs in a chest rig.
uplink-grenadier-rig-desc = All you need for a loud party: 2 explosive grenades, 2 shrapnel grenades, 2 EMP grenades and 2 minibombs in a chest rig.

uplink-emp-grenade-name = EMP Grenade
uplink-emp-grenade-desc = A grenade designed to disrupt electronic systems. Useful for disrupting communications, security's energy weapons, and APCs when you're in a tight spot.
Expand Down
14 changes: 11 additions & 3 deletions Resources/Prototypes/Catalog/Fills/Items/belt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,8 @@
- id: Brutepack
amount: 2
- id: Ointment
amount: 1
amount: 2
- id: Bloodpack
amount: 1
- id: Gauze
- id: EmergencyMedipen #You never know what people are going to latejoin into

Expand All @@ -110,7 +109,9 @@
- type: StorageFill
contents:
- id: Brutepack
amount: 2
- id: Ointment
amount: 2
- id: Bloodpack
- id: Gauze
- id: EmergencyMedipen #You never know what people are going to latejoin into
Expand All @@ -126,6 +127,9 @@
- id: HydroponicsToolMiniHoe
- id: HydroponicsToolSpade
- id: HydroponicsToolClippers
- id: HydroponicsToolHatchet
- id: PlantBGoneSpray
- id: ChemistryBottleEZNutrient
- id: ChemistryBottleRobustHarvest

- type: entity
Expand Down Expand Up @@ -153,7 +157,9 @@
- type: StorageFill
contents:
- id: ExGrenade
amount: 4
amount: 2
- id: GrenadeShrapnel
amount: 2
- id: SyndieMiniBomb
amount: 2
- id: EmpGrenade
Expand Down Expand Up @@ -204,3 +210,5 @@
contents:
- id: FoodShakerSalt
- id: FoodShakerPepper
- id: KitchenKnife
- id: RollingPin
14 changes: 0 additions & 14 deletions Resources/Prototypes/Entities/Clothing/Belt/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@
maxItemSize: Large
whitelist:
tags:
- Wrench
- Bottle
- Spray
- Soap
Expand All @@ -151,10 +150,6 @@
whitelist:
tags:
- Spray
wrench:
whitelist:
tags:
- Wrench
- type: Appearance

- type: entity
Expand All @@ -170,7 +165,6 @@
- type: Storage
whitelist:
tags:
- Wrench
- Bottle
- Spray
- Brutepack
Expand Down Expand Up @@ -213,14 +207,6 @@
# whitelist:
# tags:
# - SprayMedical
# wrench_medical:
# whitelist:
# tags:
# - WrenchMedical
wrench:
whitelist:
tags:
- Wrench
- type: Appearance

- type: entity
Expand Down
Loading