juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added restrictions for what can be inserted into most belts (#4367)

Browse Source 
* Belts now restrict what can be inserted into them

* Bandolier now only holds shotgun shells

* Tiny typo

* Another tiny typo
This commit is contained in:
Swept
2021-08-10 13:36:00 -07:00
committed by GitHub
parent b2322864e9
commit b16a044a2b
29 changed files with 560 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
View File

@@ -13,23 +13,25 @@
- type: Storage
capacity: 40
# TODO: Fill this out more.
# whitelist:
# tags:
# - Wirecutter
# - Crowbar
# - CrowbarRed
# - Screwdriver
# - Flashlight
# - Welder
# - Wrench
# - Painter
# - GeigerCounter
# - Flare
# - Coilsofwire
# -
# -
# components:
# - SignalLinker
whitelist:
tags:
- Wirecutter
- Crowbar
- Screwdriver
- Flashlight
- Wrench
# - Painter
# - GeigerCounter
- Flare
- CableCoil
- CigPack
components:
- SignalLinker
- RCD
- RCDAmmo
- Welder
- Radio
- PowerCell
- type: ItemCounter
mapLayers:
cutters_red:
@@ -72,25 +74,31 @@
- type: Clothing
sprite: Clothing/Belt/ce.rsi
- type: Storage
# TODO: Fill this out more.
# whitelist:
# tags:
# - Wirecutter
# - Crowbar
# - CrowbarRed
# - Screwdriver
# - Flashlight
# - Welder
# - Wrench
# - Painter
# - GeigerCounter
# - Flare
# - Coilsofwire
# -
# -
# components:
# - SignalLinker
capacity: 100
# TODO: Fill this out more.
whitelist:
tags:
- Wirecutter
- Crowbar
- Screwdriver
- Flashlight
- Wrench
# - Painter
# - GeigerCounter
- Flare
- CableCoil
- Powerdrill
- JawsOfLife
- CigPack
components:
- SignalLinker
- RCD
- RCDAmmo
- Welder
- Flash
- Radio
- Handcuff
- PowerCell
- type: ItemCounter
mapLayers:
drill:
@@ -142,6 +150,17 @@
sprite: Clothing/Belt/assault.rsi
- type: Storage
capacity: 40
whitelist:
tags:
- CigPack
- Taser
components:
- Stunbaton
- FlashOnTrigger
- Flash
- Handcuff
- RangedMagazine
- Ammo
- type: ItemCounter
mapLayers:
flashbang:
@@ -169,6 +188,14 @@
sprite: Clothing/Belt/janitor.rsi
- type: Storage
capacity: 40
whitelist:
tags:
- Wrench
- Bottle
- Spray
- Soap
- Flashlight
- CigPack
- type: ItemCounter
mapLayers:
bottle:
@@ -179,6 +206,10 @@
whitelist:
tags:
- Spray
wrench:
whitelist:
tags:
- Wrench
- type: Appearance
visuals:
- type: MappedItemVisualizer
@@ -196,6 +227,20 @@
sprite: Clothing/Belt/medical.rsi
- type: Storage
capacity: 40
whitelist:
tags:
- Wrench
- Bottle
- Spray
- Brutepack
- Gauze
- Ointment
- CigPack
components:
- Hypospray
- Pill
- SurgeryTool
- Radio
- type: ItemCounter
mapLayers:
bottle:
@@ -242,27 +287,29 @@
- type: Clothing
sprite: Clothing/Belt/plant.rsi
- type: Storage
# whitelist:
# tags:
# - BotanyHoe
# - PlantAnalyzer
# - BotanyHoe
# - BotanyShovel
# - PlantBGone
# - Bottle
# components:
# - Seed
capacity: 40
whitelist:
tags:
- BotanyHoe
# - PlantAnalyzer
- BotanyHoe
- BotanyShovel
- PlantBGone
- Bottle
- CigPack
components:
- Seed
- Smoking
- type: ItemCounter
mapLayers:
hatchet:
whitelist:
tags:
- BotanyHatchet
hydro:
whitelist:
tags:
- PlantAnalyzer # Dunno what to put here, should be aight.
# hydro:
# whitelist:
# tags:
# - PlantAnalyzer # Dunno what to put here, should be aight.
hoe:
whitelist:
tags:
@@ -296,6 +343,15 @@
sprite: Clothing/Belt/security.rsi
- type: Storage
capacity: 40
whitelist:
tags:
- CigPack
- Taser
components:
- Stunbaton
- FlashOnTrigger
- Flash
- Handcuff
- type: ItemCounter
mapLayers:
flashbang:
@@ -324,11 +380,58 @@
sprite: Clothing/Belt/sheath.rsi
- type: Storage
capacity: 15
whitelist:
tags:
- CaptainSabre
- Baguette
- Carrot
- Crowbar
- Katana
- Machete
- CombatKnife
- RodMetal1
- Spear
components:
- Mop
- type: StorageFill
contents:
- id: CaptainSabre
- type: ItemCounter
mapLayers:
sheath-bag:
whitelist:
tags:
- Baguette
sheath-carrot:
whitelist:
tags:
- Carrot
sheath-crowbar:
whitelist:
tags:
- Crowbar
sheath-crowbarr:
whitelist:
tags:
- CrowbarRed
sheath-katana:
whitelist:
tags:
- Katana
sheath-knife:
whitelist:
tags:
- Machete
- CombatKnife
sheath-mop:
whitelist:
components:
- Mop
sheath-rod:
whitelist:
tags:
- RodMetal1
- Spear
sheath-sabre:
whitelist:
tags:
@@ -350,7 +453,10 @@
- type: Clothing
sprite: Clothing/Belt/bandolier.rsi
- type: Storage
capacity: 40
capacity: 60
whitelist:
tags:
- ShotgunShell
- type: entity
parent: ClothingBeltBase

3
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
View File

@@ -317,6 +317,9 @@
id: FoodBreadBaguette
description: Bon appétit!
components:
- type: Tag
tags:
- Baguette
- type: Sprite
state: baguette
# Tastes like France.

3
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
View File

@@ -142,6 +142,9 @@
id: FoodCarrot
description: It's good for the eyes!
components:
- type: Tag
tags:
- Carrot
- type: Food
- type: SolutionContainer
contents:

123
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
View File

@@ -4,87 +4,90 @@
name: cigarette pack
abstract: true
components:
- type: Storage
capacity: 6
- type: Item
size: 6
- type: StorageFill
contents:
- id: Cigarette
amount: 6
- type: StorageCounter
countTag: Cigarette
- type: Appearance
visuals:
- type: BagOpenCloseVisualizer
openIcon: open
- type: StackVisualizer
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
composite: true
stackLayers:
- cig1
- cig2
- cig3
- cig4
- cig5
- cig6
- type: Tag
tags:
- CigPack
- type: Storage
capacity: 6
- type: Item
size: 6
- type: StorageFill
contents:
- id: Cigarette
amount: 6
- type: StorageCounter
countTag: Cigarette
- type: Appearance
visuals:
- type: BagOpenCloseVisualizer
openIcon: open
- type: StackVisualizer
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
composite: true
stackLayers:
- cig1
- cig2
- cig3
- cig4
- cig5
- cig6
- type: entity
id: CigPackGreen
parent: CigPackBase
name: Spessman's Smokes packet
description: "A label on the packaging reads, 'Wouldn't a slow death make a change?'"
description: A label on the packaging reads, Wouldn't a slow death make a change?
components:
- type: Sprite
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
layers:
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
size: 6
- type: Sprite
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
layers:
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
size: 6
- type: entity
id: CigPackRed
parent: CigPackBase
name: DromedaryCo packet
description: "The most popular brand of Space Cigarettes, sponsors of the Space Olympics."
description: The most popular brand of Space Cigarettes, sponsors of the Space Olympics.
components:
- type: Sprite
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
layers:
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
size: 6
- type: Sprite
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
layers:
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
size: 6
- type: entity
id: CigPackBlue
parent: CigPackBase
name: AcmeCo packet
description: "For those who somehow want to obtain the record for the most amount of cancerous tumors."
description: For those who somehow want to obtain the record for the most amount of cancerous tumors.
components:
- type: Sprite
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
layers:
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
size: 6
- type: Sprite
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
layers:
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
size: 6
- type: entity
id: CigPackBlack
parent: CigPackBase
name: Nomads packet
description: "Nomads's extra strong, for when your life is more extra hard."
description: Nomads's extra strong, for when your life is more extra hard.
components:
- type: Sprite
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
layers:
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
size: 6
- type: Sprite
netsync: false
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
layers:
- state: closed
- type: Item
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
size: 6

46
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
View File

@@ -7,20 +7,20 @@
name: cigar
description: "A brown roll of tobacco and... well, you're not quite sure."
components:
- type: Smoking
duration: 70
- type: Sprite
sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
netsync: false
state: unlit-icon
- type: Tag
tags:
- Cigar
- type: Clothing
sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
Slots: [ mask ]
HeldPrefix: unlit
size: 1
- type: Smoking
duration: 70
- type: Sprite
sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
netsync: false
state: unlit-icon
- type: Tag
tags:
- Cigar
- type: Clothing
sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
Slots: [ mask ]
HeldPrefix: unlit
size: 1
- type: entity
id: CigarGold
@@ -28,12 +28,12 @@
name: premium Havanian cigar
description: "A cigar fit for only the best of the best."
components:
- type: Sprite
sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
netsync: false
state: unlit-icon
- type: Clothing
sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
Slots: [ mask ]
HeldPrefix: unlit
size: 1
- type: Sprite
sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
netsync: false
state: unlit-icon
- type: Clothing
sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
Slots: [ mask ]
HeldPrefix: unlit
size: 1

3
Resources/Prototypes/Entities/Objects/Materials/parts.yml
View File

@@ -46,6 +46,9 @@
name: metal rod
suffix: Single
components:
- type: Tag
tags:
- RodMetal1
- type: Sprite
state: rods
- type: Stack

1
Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
View File

@@ -14,7 +14,6 @@
- type: Sprite
sprite: Objects/Misc/handcuffs.rsi
state: handcuff
- type: Clothing
sprite: Objects/Misc/handcuffs.rsi
Slots: [belt]

3
Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
View File

@@ -4,6 +4,9 @@
parent: BaseItem
description: A cheap bar of soap. Doesn't smell.
components:
- type: Tag
tags:
- Soap
- type: Sprite
sprite: Objects/Specific/Janitorial/soap.rsi
state: soap

29
Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
View File

@@ -1,9 +1,12 @@
- type: entity
name: ointment
description: "Used to treat those nasty burns."
description: Used to treat those nasty burns.
parent: BaseItem
id: Ointment
components:
- type: Tag
tags:
- Ointment
- type: Sprite
sprite: Objects/Specific/Medical/medical.rsi
state: ointment
@@ -17,24 +20,30 @@
- type: entity
name: bruise pack
description: "A therapeutic gel pack and bandages designed to treat blunt-force trauma."
description: A therapeutic gel pack and bandages designed to treat blunt-force trauma.
parent: Ointment
id: Brutepack
components:
- type: Sprite
state: brutepack
- type: Healing
heal:
Blunt: 10
- type: Stack
stackType: Brutepack
- type: Tag
tags:
- Brutepack
- type: Sprite
state: brutepack
- type: Healing
heal:
Blunt: 10
- type: Stack
stackType: Brutepack
- type: entity
name: roll of gauze
description: "Some sterile gauze to wrap around bloody stumps."
description: Some sterile gauze to wrap around bloody stumps.
parent: Ointment
id: Gauze
components:
- type: Tag
tags:
- Gauze
- type: Sprite
state: gauze
- type: Healing

156
Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
View File

@@ -9,16 +9,18 @@
name: cable stack
suffix: Full
components:
- type: Stack
stackType: Cable
- type: Sprite
sprite: Objects/Tools/cable-coils.rsi
netsync: false
- type: Item
sprite: Objects/Tools/cable-coils.rsi
- type: CablePlacer
- type: Clickable
- type: Tag
tags:
- CableCoil
- type: Stack
stackType: Cable
- type: Sprite
sprite: Objects/Tools/cable-coils.rsi
netsync: false
- type: Item
sprite: Objects/Tools/cable-coils.rsi
- type: CablePlacer
- type: Clickable
- type: entity
id: CableHVStack
@@ -26,35 +28,35 @@
name: HV cable coil
suffix: Full
components:
- type: Stack
stackType: CableHV
- type: Sprite
state: coilhv-30
- type: Item
size: 10
HeldPrefix: coilhv
- type: CablePlacer
cablePrototypeID: CableHV
blockingCableType: HighVoltage
- type: Appearance
visuals:
- type: StackVisualizer
stackLayers:
- coilhv-10
- coilhv-20
- coilhv-30
- type: Stack
stackType: CableHV
- type: Sprite
state: coilhv-30
- type: Item
size: 10
HeldPrefix: coilhv
- type: CablePlacer
cablePrototypeID: CableHV
blockingCableType: HighVoltage
- type: Appearance
visuals:
- type: StackVisualizer
stackLayers:
- coilhv-10
- coilhv-20
- coilhv-30
- type: entity
parent: CableHVStack
id: CableHVStack1
suffix: 1
components:
- type: Sprite
state: coilhv-10
- type: Item
size: 3
- type: Stack
count: 1
- type: Sprite
state: coilhv-10
- type: Item
size: 3
- type: Stack
count: 1
- type: entity
parent: CableStack
@@ -63,33 +65,33 @@
description: Low-Voltage stack of wires for connecting APCs to machines and other purposes.
suffix: Full
components:
- type: Sprite
state: coillv-30
- type: Item
size: 10
HeldPrefix: coillv
- type: CablePlacer
cablePrototypeID: CableApcExtension
blockingCableType: Apc
- type: Appearance
visuals:
- type: StackVisualizer
stackLayers:
- coillv-10
- coillv-20
- coillv-30
- type: Sprite
state: coillv-30
- type: Item
size: 10
HeldPrefix: coillv
- type: CablePlacer
cablePrototypeID: CableApcExtension
blockingCableType: Apc
- type: Appearance
visuals:
- type: StackVisualizer
stackLayers:
- coillv-10
- coillv-20
- coillv-30
- type: entity
parent: CableApcStack
id: CableApcStack1
suffix: 1
components:
- type: Sprite
state: coillv-10
- type: Item
size: 3
- type: Stack
count: 1
- type: Sprite
state: coillv-10
- type: Item
size: 3
- type: Stack
count: 1
- type: entity
parent: CableStack
@@ -97,32 +99,32 @@
name: MV cable coil
suffix: Full
components:
- type: Stack
stackType: CableMV
- type: Sprite
state: coilmv-30
- type: Item
size: 10
HeldPrefix: coilmv
- type: CablePlacer
cablePrototypeID: CableMV
blockingCableType: MediumVoltage
- type: Appearance
visuals:
- type: StackVisualizer
stackLayers:
- coilmv-10
- coilmv-20
- coilmv-30
- type: Stack
stackType: CableMV
- type: Sprite
state: coilmv-30
- type: Item
size: 10
HeldPrefix: coilmv
- type: CablePlacer
cablePrototypeID: CableMV
blockingCableType: MediumVoltage
- type: Appearance
visuals:
- type: StackVisualizer
stackLayers:
- coilmv-10
- coilmv-20
- coilmv-30
- type: entity
parent: CableMVStack
id: CableMVStack1
suffix: 1
components:
- type: Sprite
state: coilmv-10
- type: Item
size: 3
- type: Stack
count: 1
- type: Sprite
state: coilmv-10
- type: Item
size: 3
- type: Stack
count: 1

145
Resources/Prototypes/Entities/Objects/Tools/flare.yml
View File

@@ -1,76 +1,79 @@
- type: entity
name: emergency flare # todo: we need some sort of IgnitionSourceComponent we can add to this, so when it's lit it will cause fires when touching fuel
parent: BaseItem
id: FlareBase
id: Flare
description: A flare that produces a very bright light for a short while. Point the flame away from yourself.
components:
- type: ExpendableLight
spentName: spent flare
spentDesc: It looks like this flare has burnt out. What a bummer.
glowDuration: 150
fadeOutDuration: 4
iconStateOn: flare_unlit
iconStateSpent: flare_spent
turnOnBehaviourID: turn_on
fadeOutBehaviourID: fade_out
litSound: /Audio/Items/Flare/flare_on.ogg
loopedSound: /Audio/Items/Flare/flare_burn.ogg
- type: Sprite
sprite: Objects/Misc/flare.rsi
layers:
- state: flare_base
- state: flare_burn
color: "#FFFFFF"
visible: false
shader: unshaded
- state: flare_unlit
color: "#FF0000"
- type: Icon
sprite: Objects/Misc/flare.rsi
state: icon
- type: Item
sprite: Objects/Misc/flare.rsi
color: "#FF0000"
HeldPrefix: unlit
- type: Appearance
visuals:
- type: ExpendableLightVisualizer
- type: PointLight
enabled: false
color: "#FF8080"
radius: 1.0
energy: 9.0
- type: LightBehaviour
behaviours:
- !type:RandomizeBehaviour # immediately make it bright and flickery
id: turn_on
interpolate: Nearest
minDuration: 0.02
maxDuration: 0.06
startValue: 6.0
endValue: 9.0
property: Energy
isLooped: true
- !type:FadeBehaviour # have the radius start small and get larger as it starts to burn
id: turn_on
interpolate: Linear
maxDuration: 8.0
startValue: 1.0
endValue: 6.0
property: Radius
- !type:RandomizeBehaviour # weaker flicker as it fades out
id: fade_out
interpolate: Nearest
minDuration: 0.02
maxDuration: 0.06
startValue: 4.0
endValue: 8.0
property: Energy
isLooped: true
- !type:FadeBehaviour # fade out radius as it burns out
id: fade_out
interpolate: Linear
maxDuration: 4.0
startValue: 6.0
endValue: 1.0
property: Radius
- type: Tag
tags:
- Flare
- type: ExpendableLight
spentName: spent flare
spentDesc: It looks like this flare has burnt out. What a bummer.
glowDuration: 150
fadeOutDuration: 4
iconStateOn: flare_unlit
iconStateSpent: flare_spent
turnOnBehaviourID: turn_on
fadeOutBehaviourID: fade_out
litSound: /Audio/Items/Flare/flare_on.ogg
loopedSound: /Audio/Items/Flare/flare_burn.ogg
- type: Sprite
sprite: Objects/Misc/flare.rsi
layers:
- state: flare_base
- state: flare_burn
color: "#FFFFFF"
visible: false
shader: unshaded
- state: flare_unlit
color: "#FF0000"
- type: Icon
sprite: Objects/Misc/flare.rsi
state: icon
- type: Item
sprite: Objects/Misc/flare.rsi
color: "#FF0000"
HeldPrefix: unlit
- type: Appearance
visuals:
- type: ExpendableLightVisualizer
- type: PointLight
enabled: false
color: "#FF8080"
radius: 1.0
energy: 9.0
- type: LightBehaviour
behaviours:
- !type:RandomizeBehaviour # immediately make it bright and flickery
id: turn_on
interpolate: Nearest
minDuration: 0.02
maxDuration: 0.06
startValue: 6.0
endValue: 9.0
property: Energy
isLooped: true
- !type:FadeBehaviour # have the radius start small and get larger as it starts to burn
id: turn_on
interpolate: Linear
maxDuration: 8.0
startValue: 1.0
endValue: 6.0
property: Radius
- !type:RandomizeBehaviour # weaker flicker as it fades out
id: fade_out
interpolate: Nearest
minDuration: 0.02
maxDuration: 0.06
startValue: 4.0
endValue: 8.0
property: Energy
isLooped: true
- !type:FadeBehaviour # fade out radius as it burns out
id: fade_out
interpolate: Linear
maxDuration: 4.0
startValue: 6.0
endValue: 1.0
property: Radius

47
Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
View File

@@ -4,25 +4,28 @@
id: FlashlightLantern
description: It lights the way to freedom.
components:
- type: HandheldLight
- type: ItemActions
actions:
- actionType: ToggleLight
- type: PowerCellSlot
startingCellType: PowerCellSmallHigh
- type: Sprite
sprite: Objects/Tools/flashlight.rsi
layers:
- state: lantern_off
- state: HandheldLightOnOverlay
shader: unshaded
visible: false
- type: Item
sprite: Objects/Tools/flashlight.rsi
HeldPrefix: off
- type: PointLight
enabled: false
radius: 3
- type: Appearance
visuals:
- type: FlashLightVisualizer
- type: Tag
tags:
- Flashlight
- type: HandheldLight
- type: ItemActions
actions:
- actionType: ToggleLight
- type: PowerCellSlot
startingCellType: PowerCellSmallHigh
- type: Sprite
sprite: Objects/Tools/flashlight.rsi
layers:
- state: lantern_off
- state: HandheldLightOnOverlay
shader: unshaded
visible: false
- type: Item
sprite: Objects/Tools/flashlight.rsi
HeldPrefix: off
- type: PointLight
enabled: false
radius: 3
- type: Appearance
visuals:
- type: FlashLightVisualizer

1
Resources/Prototypes/Entities/Objects/Tools/tools.yml
View File

@@ -119,6 +119,7 @@
components:
- type: Tag
tags:
- Crowbar
- CrowbarRed
- type: Sprite
sprite: Objects/Tools/crowbar_red.rsi

3
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
View File

@@ -4,6 +4,9 @@
parent: BaseItem
abstract: true
components:
- type: Tag
tags:
- ShotgunShell
- type: Ammo
caliber: Shotgun
ammoSpread: 40

3
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View File

@@ -123,6 +123,9 @@
id: TaserGun
description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range.
components:
- type: Tag
tags:
- Taser
- type: Sprite
netsync: false
sprite: Objects/Weapons/Guns/Battery/taser.rsi

15
Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
View File

@@ -3,6 +3,9 @@
id: BaseKnife
abstract: true
components:
- type: Tag
tags:
- Knife
- type: Utensil
types:
- Knife
@@ -20,11 +23,13 @@
id: KitchenKnife
description: A general purpose Chef's Knife made by Asters Merchant Guild. Guaranteed to stay sharp for years to come..
components:
- type: Tag
tags:
- Knife
- type: Sprite
sprite: Objects/Weapons/Melee/kitchen_knife.rsi
size: 2
state: icon
- type: Item
size: 10
sprite: Objects/Weapons/Melee/kitchen_knife.rsi
@@ -37,11 +42,13 @@
id: ButchCleaver
description: A huge blade used for chopping and chopping up meat. This includes clowns and clown-by-products.
components:
- type: Tag
tags:
- Knife
- type: Sprite
sprite: Objects/Weapons/Melee/cleaver.rsi
size: 4
state: butch
- type: MeleeWeapon
damage: 15
- type: Item
@@ -55,6 +62,10 @@
id: CombatKnife
description: A deadly knife intended for melee confrontations.
components:
- type: Tag
tags:
- CombatKnife
- Knife
- type: Sprite
sprite: Objects/Weapons/Melee/combat_knife.rsi
size: 2

3
Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
View File

@@ -4,6 +4,9 @@
id: Spear
description: Definition of a Classic. Keeping murder affordable since 200,000 BCE.
components:
- type: Tag
tags:
- Spear
- type: Sprite
sprite: Objects/Weapons/Melee/spear.rsi
state: spear

6
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
View File

@@ -23,6 +23,9 @@
id: Katana
description: Ancient craftwork made with not so ancient plasteel.
components:
- type: Tag
tags:
- Katana
- type: Sprite
sprite: Objects/Weapons/Melee/katana.rsi
state: icon
@@ -39,6 +42,9 @@
id: Machete
description: A large, vicious looking blade.
components:
- type: Tag
tags:
- Machete
- type: Sprite
sprite: Objects/Weapons/Melee/machete.rsi
state: icon

4
Resources/Prototypes/Recipes/Lathes/misc.yml
View File

@@ -34,9 +34,9 @@
Plastic: 50
- type: latheRecipe
id: FlareBase
id: Flare
icon: Objects/Misc/flare.rsi
result: FlareBase
result: Flare
completetime: 500
materials:
Plastic: 50

54
Resources/Prototypes/tags.yml
View File

@@ -1,3 +1,9 @@
- type: Tag
id: Baguette
- type: Tag
id: Brutepack
- type: Tag
id: BotanyHatchet
@@ -13,12 +19,21 @@
- type: Tag
id: Bottle
- type: Tag
id: CableCoil
- type: Tag
id: Carrot
- type: Tag
id: CanPilot
- type: Tag
id: CaptainSabre
- type: Tag
id: CigPack
- type: Tag
id: Crayon
@@ -55,6 +70,9 @@
- type: Tag
id: ConveyorAssembly
- type: Tag
id: CombatKnife
- type: Tag
id: DoorElectronics
@@ -73,9 +91,18 @@
- type: Tag
id: FirelockElectronics
- type: Tag
id: Flare
- type: Tag
id: Flashlight
- type: Tag
id: FootstepSound
- type: Tag
id: Gauze
- type: Tag
id: GlassBeaker
@@ -91,12 +118,24 @@
- type: Tag
id: JawsOfLife
- type: Tag
id: Katana
- type: Tag
id: Knife
- type: Tag
id: Machete
- type: Tag
id: MonkeyCube
- type: Tag
id: NoSpinOnThrow
- type: Tag
id: Ointment
- type: Tag
id: Ore
@@ -115,6 +154,9 @@
- type: Tag
id: Powerdrill
- type: Tag
id: RodMetal1
- type: Tag
id: RollingPaper
@@ -124,12 +166,24 @@
- type: Tag
id: Sheet
- type: Tag
id: ShotgunShell
- type: Tag
id: Shovel
- type: Tag
id: Soap
- type: Tag
id: Spray
- type: Tag
id: Spear
- type: Tag
id: Taser
- type: Tag
id: Wall

24
Resources/Textures/Clothing/Belt/sheath.rsi/meta.json
View File

@@ -15,6 +15,30 @@
"name": "sheath-sabre-equipped-BELT",
"directions": 4
},
{
"name": "sheath-bag"
},
{
"name": "sheath-carrot"
},
{
"name": "sheath-crowbar"
},
{
"name": "sheath-crowbarr"
},
{
"name": "sheath-katana"
},
{
"name": "sheath-knife"
},
{
"name": "sheath-mop"
},
{
"name": "sheath-rod"
},
{
"name": "sheath-sabre"
},

BIN
Resources/Textures/Clothing/Belt/sheath.rsi/sheath-bag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 202 B

BIN
Resources/Textures/Clothing/Belt/sheath.rsi/sheath-carrot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 250 B

BIN
Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 241 B

BIN
Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbarr.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 263 B

BIN
Resources/Textures/Clothing/Belt/sheath.rsi/sheath-katana.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 202 B

BIN
Resources/Textures/Clothing/Belt/sheath.rsi/sheath-knife.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 149 B

BIN
Resources/Textures/Clothing/Belt/sheath.rsi/sheath-mop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 304 B

BIN
Resources/Textures/Clothing/Belt/sheath.rsi/sheath-rod.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 B