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

[Fix] i dont hate corvax #1032

Merged
merged 2 commits into from
Feb 7, 2025
Merged

[Fix] i dont hate corvax #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89b1264
summery
nomad0260 Feb 7, 2025
bebe328
revert "hate" to corvax
nomad0260 Feb 7, 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
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,9 +514,9 @@
id: UplinkMosinAmmo
name: uplink-mosin-ammo-name
description: uplink-mosin-ammo-desc
productEntity: MagazineBoxLightRifle
productEntity: MagazineBoxHeavyRifle762 #backmen-ammonation
cost:
Telecrystal: 1
Telecrystal: 4 #backmen-ammonation
categories:
- UplinkAmmo

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Corvax/Entities/Stations/nanotrasen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@
- /Maps/Corvax/Ruins/corvax_rnd_debris.yml
- /Maps/Corvax/Ruins/corvax_sanctus.yml
- /Maps/Corvax/Ruins/corvax_ussp_debris.yml
- /Maps/Corvax/Ruins/corvax_ussp_asteroid.yml
# - /Maps/Corvax/Ruins/corvax_ussp_asteroid.yml
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,7 @@
- MagazinePacketRifle762x39AP
- MagazinePacketRifle762x39AP
- MagazinePacketRifle762UEGAP
- MagazinePacketRifle556UEGAP
# Backmen-ammonation-end
- MagazineShotgunBeanbag
- MagazineShotgunIncendiary
Expand Down
2 changes: 1 addition & 1 deletion Resources/migration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ BulletAntiMaterial: BulletAntiMateriel
# 2023-05-10
FoodCondimentBottleSmallHotsauce: FoodCondimentBottleHotsauce
FoodBakedCookieFortune: FoodSnackCookieFortune
GunSafeSubMachineGunVector: GunSafeSubMachineGunDrozd
# GunSafeSubMachineGunVector: GunSafeSubMachineGunDrozd

# 2023-05-24
AMEController: AmeController
Expand Down
Loading