Uplink: Combat Bakery Kit (#31179)

* save

* sprites

* mime survival kit has baguette

* add weapon/uplink

* cherry-pick croissant changes

* uplink

* Switch baguette to slashing damage

* fixes

* update attribution

* fix typos

* review comments

* reduce TC cost

* switch to regular box

* fix regular baguette rotation

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index 84738eadec22a910c0792dd0d1b0ed4139ccdf07..b7e8616da23b8a945a8b3a857173b3c8d51daf05 100644 (file)
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -15,6 +15,7 @@ loadout-group-survival-syndicate = Github is forcing me to write text that is li
 loadout-group-breath-tool = Species-dependent breath tools
 loadout-group-tank-harness = Species-specific survival equipment
 loadout-group-EVA-tank = Species-specific gas tank
+loadout-group-survival-mime = Mime Survival Box
 
 # Command
 loadout-group-captain-head = Captain head

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 47eb671619367a9ee93fc6b7335c3c24d2d26e59..27ecdc98f03da39f111c140310dffa4fdce2624b 100644 (file)
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -439,3 +439,6 @@ uplink-barber-scissors-desc = A good tool to give your fellow agent a nice hairc
 
 uplink-backpack-syndicate-name = Syndicate backpack
 uplink-backpack-syndicate-desc = Lightweight explosion-proof а backpack for holding various traitor goods
+
+uplink-combat-bakery-name = Combat Bakery Kit
+uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette which a skilled mime could use as a sword and a pair of throwing croissants. Once the job is done, eat the evidence.
\ No newline at end of file

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index c2b0660dc07115a7a27f43287ae5e935906c43c6..540e05b453b78e0f5a55d65320d70ba5af1b4b36 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -189,6 +189,38 @@
   - type: Label
     currentLabel: reagent-name-nitrogen
 
+- type: entity
+  parent: BoxSurvival
+  id: BoxMime
+  name: survival box
+  description: It's a box with basic internals inside.
+  suffix: Emergency
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: EmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodBreadBaguette
+    - id: DrinkWaterBottleFull
+
+- type: entity
+  parent: BoxSurvivalNitrogen
+  id: BoxMimeNitrogen
+  suffix: Emergency N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodBreadBaguette
+    - id: DrinkWaterBottleFull
+  - type: Label
+    currentLabel: reagent-name-nitrogen
+
 - type: entity
   parent: BoxCardboard
   id: BoxSurvivalSyndicate

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 80c20a1a04d6d601ad812f3259dc97d3a7033e62..27df984f25d7472f6917fda1ee3425ddc6292cb5 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -67,3 +67,19 @@
     contents:
       - id: DeathRattleImplanter
         amount: 6
+
+- type: entity
+  parent: [BoxCardboard, BaseSyndicateContraband]
+  id: CombatBakeryKit
+  name: combat bakery kit
+  description: A kit of clandestine baked weapons.
+  components:
+  - type: Sprite
+    layers:
+      - state: box_of_doom
+      - state: france
+  - type: StorageFill
+    contents:
+      - id: WeaponCroissant
+        amount: 2
+      - id: WeaponBaguette
\ No newline at end of file

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 5a92bc77f81cf7b20cd703c2d59ac698b7a4c6ba..613b7bcdedb99e976352cb9147a1398532cd7279 100644 (file)
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1743,3 +1743,19 @@
     blacklist:
       components:
       - SurplusBundle
+
+- type: listing
+  id: UplinkCombatBakery
+  name: uplink-combat-bakery-name
+  description: uplink-combat-bakery-desc
+  icon: { sprite:  Objects/Consumable/Food/Baked/bread.rsi, state: baguette}
+  productEntity: CombatBakeryKit
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkJob
+  conditions:
+  - !type:BuyerJobCondition
+    whitelist:
+    - Chef
+    - Mime
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index 51d946507315e55933b34873a68eff9d819f756f..31e92931dbd0f14d2045f7a7ca9b4229140c2ecd 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -624,6 +624,21 @@
           Quantity: 1
         - ReagentId: Blackpepper
           Quantity: 1
+  - type: Clothing
+    slots: [ BELT ]
+    equippedPrefix: baguette
+    quickEquip: false
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: baguette-inhand-left
+      right:
+      - state: baguette-inhand-right
+  - type: MeleeWeapon
+    wideAnimationRotation: -120
+    damage:
+      types:
+        Blunt: 1 # bonk
 # Tastes like France.
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index 2f4b6009a9b24a365abd03477296cd99cd8a10f8..8b455fe872c5c03da7bb967f560638e6d78c905d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -682,3 +682,7 @@
           Quantity: 2
         - ReagentId: Vitamin
           Quantity: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml
new file mode 100644 (file)
index 0000000..46bd430
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml
@@ -0,0 +1,17 @@
+- type: entity
+  name: baguette
+  parent: FoodBreadBaguette
+  id: WeaponBaguette
+  description: Bon appétit!
+  suffix: Weapon
+  components:
+  - type: MeleeWeapon
+    wideAnimationRotation: -120
+    damage:
+      types:
+        Slash: 16
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: Reflect
+    reflectProb: 0.05
+    spread: 90
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml
new file mode 100644 (file)
index 0000000..8ae52f4
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml
@@ -0,0 +1,25 @@
+- type: entity
+  parent: FoodBakedCroissant
+  id: WeaponCroissant
+  name: croissant
+  description: Buttery, flaky goodness.
+  suffix: Weapon
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 5
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
+  - type: LandAtCursor
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 5
+        Piercing: 10
\ No newline at end of file

diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
index 2716310ecfbbb1f0fb1be73131243550b02d5d19..c84caeb99da8166d60813b36465d91843b83324e 100644 (file)
--- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
@@ -64,6 +64,26 @@
     back:
     - BoxHugNitrogen
 
+# Mime
+- type: loadout
+  id: EmergencyOxygenMime
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+  storage:
+    back:
+    - BoxMime
+
+- type: loadout
+  id: EmergencyNitrogenMime
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+  storage:
+    back:
+    - BoxMimeNitrogen
+
+
 # Engineering / Extended
 - type: loadout
   id: EmergencyOxygenExtended

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index da49a16ed278d3b7aa031527158988522b9016cc..685b0c784fa3dee668899e7efab56d07b8b8b2c4 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -479,6 +479,16 @@
   loadouts:
   - MimeWintercoat
 
+- type: loadoutGroup
+  id: SurvivalMime
+  name: loadout-group-survival-mime
+  minLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenMime
+  - EmergencyOxygenMime
+  - LoadoutSpeciesVoxNitrogen
+
 - type: loadoutGroup
   id: MusicianJumpsuit
   name: loadout-group-musician-jumpsuit

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 4a6ca604264cfb8cd333a0bc85391fc3b2ce506d..e4c5c0aafbdace05d5c9ea63a0c1e94b98aa9e80 100644 (file)
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -169,7 +169,7 @@
   - MimeBackpack
   - MimeOuterClothing
   - Glasses
-  - Survival
+  - SurvivalMime
   - Trinkets
 
 - type: roleLoadout

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png
new file mode 100644 (file)
index 0000000..93437dd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-left.png
new file mode 100644 (file)
index 0000000..085c8fa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-right.png
new file mode 100644 (file)
index 0000000..d737e6f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png
index de137b2a6268b491d92530e467a51b7ee386593f..e5de3c0bc09387457d0a15996b29c9b41c38c7c0 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
index 29bd53c9f0a7bf19415f5a9d736e383e9aedf30b..2761d79f9864b022b1ddabff66dfa221ddbd385c 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58",
+  "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
   "size": {
     "x": 32,
     "y": 32
@@ -34,6 +34,18 @@
     {
       "name": "baguette"
     },
+    {
+      "name": "baguette-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "baguette-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "baguette-inhand-right",
+      "directions": 4
+    },
     {
       "name": "banana"
     },

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/france.png b/Resources/Textures/Objects/Storage/boxes.rsi/france.png
new file mode 100644 (file)
index 0000000..f18dd0c
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/france.png differ

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index cdae38099d9d0fbd20d88f30590636db86ad8abd..32b23ef30a0bc9055b8b1ec3fe7970224e648948 100644 (file)
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -223,6 +223,9 @@
         },
         {
             "name": "envelope"
+        },
+        {
+            "name": "france"
         }
     ]
 }