diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml index edbe6e6865..aa29a09f74 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml @@ -30,6 +30,9 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: fill + - type: Tag + tags: + - DrinkSpaceGlue - type: entity parent: DrinkBase @@ -62,4 +65,4 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: fill - - type: Lube + - type: Lube \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml index 9dfa4d9258..be1f4f65ee 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml @@ -27,6 +27,9 @@ - type: MachinePart part: Capacitor rating: 1 + - type: Tag + tags: + - CapacitorStockPart - type: entity id: MicroManipulatorStockPart diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 8ea097e479..4b1c910428 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -62,6 +62,9 @@ - type: Battery maxCharge: 360 startingCharge: 360 + - type: Tag + tags: + - PowerCellSmall - type: entity id: PowerCellSmallPrinted diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml new file mode 100644 index 0000000000..8ecd97827c --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml @@ -0,0 +1,47 @@ +- type: entity + name: stun prod + parent: BaseItem + id: Stunprod + description: A stun prod for illegal incapacitation. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/stunprod.rsi + layers: + - state: stunprod_off + map: [ "enum.ToggleVisuals.Layer" ] + - type: Stunbaton + energyPerUse: 70 + - type: MeleeWeapon + damage: + types: + Blunt: 9 + angle: 60 + animation: WeaponArcThrust + - type: StaminaDamageOnHit + damage: 20 + - type: Battery + maxCharge: 360 + startingCharge: 360 + - type: ItemCooldown + - type: Item + heldPrefix: off + size: 100 + - type: Clothing + sprite: Objects/Weapons/Melee/stunprod.rsi + quickEquip: false + slots: + - back + - type: DisarmMalus + malus: 0.225 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: stunprod_on} + False: {state: stunprod_off} + - type: StaticPrice + price: 100 + - type: Construction + graph: makeshiftstunprod + node: msstunprod \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml new file mode 100644 index 0000000000..fa006a938b --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: makeshiftstunprod + start: start + graph: + - node: start + edges: + - to: msstunprod + steps: + - material: MetalRod + amount: 1 + - material: Cable + amount: 15 + - tag: DrinkSpaceGlue + name: Drink Space Glue + icon: + sprite: Objects/Consumable/Drinks/glue-tube.rsi + state: icon + - tag: PowerCellSmall + name: Power Cell Small + icon: + sprite: Objects/Power/power_cells.rsi + state: small + - tag: CapacitorStockPart + name: Capacitor Stock Part + icon: + sprite: Objects/Misc/stock_parts.rsi + state: capacitor + doAfter: 20 + - node: msstunprod + entity: Stunprod + diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 277a67e283..2f3b34db2b 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -35,6 +35,17 @@ icon: { sprite: Objects/Misc/cablecuffs.rsi, state: cuff } objectType: Item +- type: construction + name: makeshift stunprod + id: makeshiftstunprod + graph: makeshiftstunprod + startNode: start + targetNode: msstunprod + category: construction-category-weapons + description: "Homemade stunprod." + icon: { sprite: Objects/Weapons/Melee/stunprod.rsi, state: stunprod_off } + objectType: Item + - type: construction name: muzzle id: muzzle diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 7926027eb1..df832a7793 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -97,6 +97,9 @@ - type: Tag id: CableCoil +- type: Tag + id: CapacitorStockPart + - type: Tag id: Carrot @@ -275,6 +278,9 @@ - type: Tag id: Donut +- type: Tag + id: DrinkSpaceGlue + - type: Tag id: DroneUsable @@ -663,6 +669,9 @@ id: PlushieGhost +- type: Tag + id: PowerCellSmall + - type: Tag id: Powerdrill diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..dd49c3dabc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/meta.json new file mode 100644 index 0000000000..d854da81c4 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/meta.json @@ -0,0 +1,82 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite by https://github.com/noudoit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stunprod_off" + }, + { + "name": "stunprod_nocell" + }, + { + "name": "stunprod_on", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/off-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/off-inhand-left.png new file mode 100644 index 0000000000..13354dd3ac Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/off-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/off-inhand-right.png new file mode 100644 index 0000000000..c8150efc14 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-left.png new file mode 100644 index 0000000000..e0fada6679 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-right.png new file mode 100644 index 0000000000..59c2796716 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_nocell.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_nocell.png new file mode 100644 index 0000000000..cd0f9f6480 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_nocell.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_off.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_off.png new file mode 100644 index 0000000000..32057f57a2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_off.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_on.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_on.png new file mode 100644 index 0000000000..8617954346 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_on.png differ