Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1758,6 +1758,7 @@
whitelist:
tags:
- BulletFoam
- BulletFoamTack # Den
capacity: 1
soundInsert:
path: /Audio/Weapons/drawbow2.ogg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
whitelist:
tags:
- BulletFoam
- BulletFoamTack
capacity: 40
proto: BulletFoam
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
whitelist:
tags:
- BulletFoam
- BulletFoamTack
proto: BulletFoam
capacity: 100
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,6 @@
- type: ThrowingAngle
angle: 180
- type: LandAtCursor
- type: Construction # Den
graph: BulletFoamTackConstruct
node: start
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@
whitelist:
tags:
- BulletFoam
- BulletFoamTack
capacity: 10
proto: BulletFoam
- type: GunRequiresWield #remove when inaccuracy on spreads is fixed
Expand Down
41 changes: 41 additions & 0 deletions Resources/Prototypes/_DEN/Entities/Objects/Fun/stationary.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
- type: entity
parent: BaseItem
id: ThumbTack
name: thumb tack
description: Miniature sword.
components:
- type: Sprite
sprite: _DEN/Objects/Fun/thumbtack.rsi
state: thumbtack
- type: CollisionWake
enabled: false
- type: Fixtures
fixtures:
slips:
shape: !type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
hard: false
layer:
- LowImpassable
fix1:
shape: !type:PhysShapeAabb
bounds: "-0.1,-0.1,0.1,0.1"
density: 3
mask:
- ItemMask
- type: Tag
tags:
- ThumbTack
- Trash
- type: StepTrigger
intersectRatio: 0.2
RequiredTriggeredSpeed: 1
- type: TriggerOnStepTrigger
- type: PreventableStepTrigger
- type: Slippery
launchForwardsMultiplier: 0
ParalyzeTime: 1
- type: DamageUserOnTrigger
damage:
types:
Piercing: 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Boxes
- type: entity
parent: BoxDonkSoftBase
id: BoxDonkSoftTackBox
name: box of thumb-tacked foam dart
components:
- type: BallisticAmmoProvider
whitelist:
tags:
- BulletFoam
- BulletFoamTack
capacity: 40
proto: BulletFoamTack

Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
- type: entity
parent: BulletFoam
id: BulletFoamTack
name: thumb-tacked foam dart
description: A weapon of mass destruction.
components:
- type: Construction
graph: BulletFoamTack
node: icon
- type: Fixtures
fixtures:
fix1:
shape: !type:PolygonShape
vertices:
- -0.05,-0.15
- -0.05,0.25
- 0.05,-0.15
- 0.05,0.25
density: 22
mask:
- ItemMask
restitution: 0.3
friction: 0.2
- type: Tag
tags:
- BulletFoamTack
- Trash
- type: Sprite
sprite: _DEN/Objects/Fun/toys.rsi
layers:
- state: foamdartthumbtack
- type: EmbeddableProjectile
removalTime: .1
- type: DamageOtherOnHit
damage:
types:
Piercing: 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
- type: constructionGraph
id: BulletFoamTackConstruct
start: start
graph:
- node: start
entity: BulletFoam
edges:
- to: icon
steps:
- tag: ThumbTack
doAfter: 0.25
- node: icon
entity: BulletFoamTack

- type: constructionGraph
id: BulletFoamTack
start: start
graph:
- node: start
edges:
- to: icon
steps:
- tag: BulletFoam
name: Foam Dart
icon:
sprite: Objects/Fun/toys.rsi
state: foamdart
doAfter: 0.25
- tag: ThumbTack
name: Thumb Tack
icon:
sprite: Objects/Fun/dice.rsi
state: d4_4
doAfter: 0.25
- node: icon
entity: BulletFoamTack
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: construction
name: thumb tack foam dart
id: BulletFoamTack
graph: BulletFoamTack
startNode: start
targetNode: icon
category: construction-category-weapons
description: A weapon of mass destruction.
icon: { sprite: Objects/Fun/toys.rsi, state: foamdart }
objectType: Item
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@
- ClothingOuterVestTank
- Ashtray
- BoxFolderFireproof
- ThumbTack

- type: latheRecipePack
id: AutolatheEmagStaticAwfulDen
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/_DEN/Recipes/Lathes/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,11 @@
materials:
Plastic: 300
Durathread: 300

- type: latheRecipe
id: ThumbTack
result: ThumbTack
completetime: 0.25
materials:
Steel: 5
Plastic: 5
5 changes: 5 additions & 0 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1903,3 +1903,8 @@
- type: Tag
id: BoxReamClassic

- type: Tag
id: ThumbTack

- type: Tag
id: BulletFoamTack
14 changes: 14 additions & 0 deletions Resources/Textures/_DEN/Objects/Fun/thumbtack.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Made by BlitzTheSquishy",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "thumbtack"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions Resources/Textures/_DEN/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, Edited by BlitzTheSquishy",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "foamdartthumbtack"
}
]
}
Loading