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

LPPHammer & C4Low Removal #175

Merged
merged 4 commits into from
Sep 21, 2024
Merged

LPPHammer & C4Low Removal #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c39fab5
LPPHammer & C4Low Removal
Hqlle Sep 21, 2024
223acbe
catalogs tweak
Hqlle Sep 21, 2024
9029535
forgot some stuff
Hqlle Sep 21, 2024
e6316cf
Update LostParadiseMigrations.yml
Evgencheg Sep 21, 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
2 changes: 0 additions & 2 deletions Resources/Locale/ru-RU/_LostParadise/update20.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ ent-LPParbitermask = Трофейная маска
.desc = Трофейная маска одного из известных охотников. От неё так и веет отчаянием
ent-LPPBrasMat = Раздатчик бюстгальтеров
.desc = Раздатчик, что дополняет образ пользователя и делает его неотразимым!
ent-LPPC4Low = C4Low
.desc = Взрывпакет предназначенный для быстрого выламывания шлюзов или стен, но его взрыв довольно слабый в плане радиуса. Виднеется этикетка (ставьте прямо на объект)
ent-LPPCargodrobeVard = Раздатчик продвинутой одежды снабжения
.desc = Красивая одежда для персонала снабжения!
ent-LPPClothingMaskGasIIC = Противогаз Delta
Expand Down
2 changes: 2 additions & 0 deletions Resources/Migrations/LostParadiseMigrations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ LPPFlagPoleSYND: null
LPPLockerElectricalSuppliesSynFilled: null
LPPRusUnder: null
PlastitaniumPwindow: WindowReinforcedDirectional
LPPC4Low: BreachingCharge
LPPHammer: SecBreachingHammer
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
ClothingOuterArmorPlateCarrier: 2 # DeltaV - moved body armour from SecDrobe to SecTech
ClothingOuterArmorDuraVest: 2
ClothingHeadHelmetBasic: 2 # DeltaV - added helmets to the SecTech. Another line of defense between the tide and your grey matter.
# BreachingCharge: 8
BreachingCharge: 8
LPPWeaponEnergyGunSoleil: 2 #LPP
LPPTelebaton: 3 #LPP
# security officers need to follow a diet regimen!
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,6 @@
idleState: icon
runningState: icon
staticRecipes:
- LPPC4Low
- ClothingEyesHudSecurity
- CombatKnife
- Flash
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
- id: ToolboxMechanicalFilled
- id: ClothingHandsGlovesCombat
- id: LPPClothingOuterHardsuitSecurityEng
- id: LPPC4Low
- id: LPPHammer
- id: BreachingCharge
- id: SecBreachingHammer
- id: RCD
- id: RCDAmmo
4 changes: 2 additions & 2 deletions Resources/Prototypes/_LostParadise/Catalog/Hos_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@
id: LPPHosCatalogHammer
name: штурмовой молот
description: Молот предназначенный для быстрого проникновения сквозь стены, шлюзы, а также для крушения чьих то черепов. Он явно более робастный, чем обычные молоты.
productEntity: LPPHammer
productEntity: SecBreachingHammer
cost:
LPPCentcoin: 5
categories:
Expand Down Expand Up @@ -1221,7 +1221,7 @@
id: LPPHosC4Low
name: Слабая C4
description: Взрывпакет предназначенный для быстрого выламывания шлюзов или стен, но его взрыв довольно слабый в плане радиуса. Виднеется этикетка (ставьте прямо на объект).
productEntity: LPPC4Low
productEntity: BreachingCharge
cost:
LPPCentcoin: 1
categories:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_LostParadise/Catalog/cburn_defence_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
# id: LPPCBURNCatalogEngineeringHammer
# name: cburn-catalog-engineering-hammer-name
# description: cburn-catalog-engineering-hammer-desc
# productEntity: LPPHammer
# productEntity: SecBreachingHammer
# cost:
# Telecrystal: 5
# categories:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_LostParadise/Catalog/delta_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@
# id: LPPDeltaCatalogEngineeringHammer
# name: delta-catalog-engineering-hammer-name
# description: delta-catalog-engineering-hammer-desc
# productEntity: LPPHammer
# productEntity: SecBreachingHammer
# cost:
# Telecrystal: 3
# categories:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_LostParadise/Catalog/ert_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@
# id: LPPERTCatalogEngineeringHammer
# name: ert-catalog-engineering-hammer-name
# description: ert-catalog-engineering-hammer-desc
# productEntity: LPPHammer
# productEntity: SecBreachingHammer
# cost:
# Telecrystal: 5
# categories:
Expand Down
30 changes: 0 additions & 30 deletions Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Bombs/C4Low.yml
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/hammer.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/HammerCabinet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
# ejectOnInteract: true
# whitelist:
# tags:
# - LPPHammer
# - SecBreachingHammer
# - type: Lock
# - type: AccessReader
# access: [["Engineering"], ["Salvage"], ["Security"]]
Expand All @@ -107,4 +107,4 @@
# - type: ContainerFill
# containers:
# ItemCabinet:
# - LPPHammer
# - SecBreachingHammer
8 changes: 0 additions & 8 deletions Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,3 @@
completetime: 5
materials:
Steel: 1150

- type: latheRecipe
id: LPPC4Low
result: LPPC4Low
completetime: 10
materials:
Plastic: 375
Plasma: 375
2 changes: 1 addition & 1 deletion Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@
back:
- SheetSteel10
- SheetGlass10
- LPPC4Low
- BreachingCharge
2 changes: 0 additions & 2 deletions Resources/Prototypes/_LostParadise/tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,6 @@
- type: Tag
id: LPPDrinkBottleAlko

- type: Tag
id: LPPHammer
# [Обоема для M41-A]

- type: Tag
Expand Down
Loading