From b2792cf3adff9c9334288f56b09520f1e63a5163 Mon Sep 17 00:00:00 2001 From: ZeroDayDaemon <60460608+ZeroDayDaemon@users.noreply.github.com> Date: Thu, 12 May 2022 05:24:48 -0500 Subject: [PATCH] Salami Lid (#7813) Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../Prototypes/Catalog/Fills/Crates/food.yml | 1 + .../Prototypes/Catalog/Fills/Crates/salvage.yml | 2 ++ .../Markers/Spawners/Random/maintenance.yml | 1 + .../Entities/Objects/Decoration/lidsalami.yml | 12 ++++++++++++ .../LootTables/suspicion_loot_table.yml | 5 ++++- .../Objects/Decoration/lidsalami.rsi/icon.png | Bin 0 -> 215 bytes .../Objects/Decoration/lidsalami.rsi/meta.json | 14 ++++++++++++++ 7 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml create mode 100644 Resources/Textures/Objects/Decoration/lidsalami.rsi/icon.png create mode 100644 Resources/Textures/Objects/Decoration/lidsalami.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 403dd4522a..e01ee3353b 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -9,6 +9,7 @@ - id: FoodBoxPizzaFilled amount: 4 - id: KnifePlastic + - id: LidSalami - type: entity id: CrateFoodMRE diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 0a1c5f588c..2bb13f5454 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -57,6 +57,8 @@ # - Heh - id: SalvageHumanCorpse prob: 0.1 + - id: LidSalami + prob: 0.1 # Interesting (1%) # - Ammo - id: BoxMagnum diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 63cf603f99..6ddea19f76 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -100,5 +100,6 @@ - Welder - FlareGun - Spear + - LidSalami chance: 0.6 offset: 0.0 diff --git a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml new file mode 100644 index 0000000000..445aae35e1 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml @@ -0,0 +1,12 @@ +- type: entity + id: LidSalami + parent: BaseItem + name: salami lid + description: Ain't gon' fit, won't fit. + components: + - type: Sprite + sprite: Objects/Decoration/lidsalami.rsi + layers: + - state: icon + - type: Item + size: 1001 \ No newline at end of file diff --git a/Resources/Prototypes/LootTables/suspicion_loot_table.yml b/Resources/Prototypes/LootTables/suspicion_loot_table.yml index 2c40f90e92..08233d09ee 100644 --- a/Resources/Prototypes/LootTables/suspicion_loot_table.yml +++ b/Resources/Prototypes/LootTables/suspicion_loot_table.yml @@ -26,7 +26,6 @@ - id: RifleCalico amount: 0 maxAmount: 5 - - id: PistolClarissa amount: 0 maxAmount: 5 @@ -162,6 +161,10 @@ prob: 0.20 maxAmount: 3 + - id: LidSalami + amount: 0 + maxAmount: 10 + - id: ExGrenade prob: 0.10 amount: 0 diff --git a/Resources/Textures/Objects/Decoration/lidsalami.rsi/icon.png b/Resources/Textures/Objects/Decoration/lidsalami.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..574d1c0106497e395c90e763cfa76f6767fd7c21 GIT binary patch literal 215 zcmV;|04V>7P) z(G7qg3`Bu+Be%MNx|K8Gk1+&;u?4J}zJw1Y*t5q4LU0_%m{>mKoYzN+#<-jW6vcUR zeUu`on&hiR3b^s^_#WL=tmq8(ak-9!#Uc1}z9WJJZG@l;s6;eL)-fdEhC;{Y>lQF2 zqMx!LSX-b;!M`lfqyTS70ry$}