Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

General tweaks (#2109)

Browse Source 
* Removes a bunch of old Eris shoes

* Changes the jackboots sprite to tgstation's

* Prototypes nuked

* Removes walk sound from jackboots, it was pretty annoying

* Adds wood table icon

* Adds wood plank and spawns it on wood table destroy. Also removes tg hand tele sprite.

* Removes weird mask png

* Removes bad pixel on security backpack

* Adds filled utility belt to engineer and ce roles

* Update Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
This commit is contained in:
Swept
2020-09-20 23:14:19 +00:00
committed by GitHub
parent da463097f0
commit 1638c366cf
75 changed files with 231 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Resources/Prototypes/Entities/Clothing/Shoes/jackboots.yml
View File

@@ -1,16 +0,0 @@
- type: entity
parent: ShoesBase
id: ShoesJackboots
name: jackboots
description: Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time.
components:
- type: Sprite
sprite: Clothing/Shoes/jackboots.rsi
- type: Icon
sprite: Clothing/Shoes/jackboots.rsi
- type: Clothing
sprite: Clothing/Shoes/jackboots.rsi
- type: LoopingSound
- type: FootstepModifier
footstepSoundCollection: footstep_heavy

150
Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml
View File

@@ -11,32 +11,6 @@
- type: Icon
state: icon
- type: entity
parent: ShoesBase
id: ShoesAtmosMagboots0
name: atmos magboots (off)
description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. Currently off.
components:
- type: Sprite
sprite: Clothing/Shoes/atmosmagboots0.rsi
- type: Icon
sprite: Clothing/Shoes/atmosmagboots0.rsi
- type: Clothing
sprite: Clothing/Shoes/atmosmagboots0.rsi
- type: entity
parent: ShoesBase
id: ShoesAtmosMagboots1
name: atmos magboots (on)
description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. Currently on.
components:
- type: Sprite
sprite: Clothing/Shoes/atmosmagboots1.rsi
- type: Icon
sprite: Clothing/Shoes/atmosmagboots1.rsi
- type: Clothing
sprite: Clothing/Shoes/atmosmagboots1.rsi
- type: entity
parent: ShoesBase
id: ShoesBlack
@@ -141,19 +115,6 @@
- type: Clothing
sprite: Clothing/Shoes/detective.rsi
- type: entity
parent: ShoesBase
id: ShoesDigiboots
name: digiboots
description: A pair of digi boots.
components:
- type: Sprite
sprite: Clothing/Shoes/digiboots.rsi
- type: Icon
sprite: Clothing/Shoes/digiboots.rsi
- type: Clothing
sprite: Clothing/Shoes/digiboots.rsi
- type: entity
parent: ShoesBase
id: ShoesFlippers
@@ -209,55 +170,16 @@
- type: entity
parent: ShoesBase
id: ShoesMagboots0
name: magboots (off)
description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. Currently off.
id: ShoesMagboots
name: magboots
description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
components:
- type: Sprite
sprite: Clothing/Shoes/magboots0.rsi
sprite: Clothing/Shoes/magboots.rsi
- type: Icon
sprite: Clothing/Shoes/magboots0.rsi
sprite: Clothing/Shoes/magboots.rsi
- type: Clothing
sprite: Clothing/Shoes/magboots0.rsi
- type: entity
parent: ShoesBase
id: ShoesMagboots1
name: magboots (on)
description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. Currently on.
components:
- type: Sprite
sprite: Clothing/Shoes/magboots1.rsi
- type: Icon
sprite: Clothing/Shoes/magboots1.rsi
- type: Clothing
sprite: Clothing/Shoes/magboots1.rsi
- type: entity
parent: ShoesBase
id: ShoesMercboots0
name: merc boots
description: A pair of boots with extra padding and armor.
components:
- type: Sprite
sprite: Clothing/Shoes/mercboots0.rsi
- type: Icon
sprite: Clothing/Shoes/mercboots0.rsi
- type: Clothing
sprite: Clothing/Shoes/mercboots0.rsi
- type: entity
parent: ShoesBase
id: ShoesMercboots1
name: merc boots
description: A pair of boots with extra padding and armor.
components:
- type: Sprite
sprite: Clothing/Shoes/mercboots1.rsi
- type: Icon
sprite: Clothing/Shoes/mercboots1.rsi
- type: Clothing
sprite: Clothing/Shoes/mercboots1.rsi
sprite: Clothing/Shoes/magboots.rsi
- type: entity
parent: ShoesBase
@@ -285,19 +207,6 @@
- type: Clothing
sprite: Clothing/Shoes/orange.rsi
- type: entity
parent: ShoesBase
id: ShoesOrange1
name: orange shoes
description: Stylish orange shoes.
components:
- type: Sprite
sprite: Clothing/Shoes/orange1.rsi
- type: Icon
sprite: Clothing/Shoes/orange1.rsi
- type: Clothing
sprite: Clothing/Shoes/orange1.rsi
- type: entity
parent: ShoesBase
id: ShoesPurple
@@ -318,17 +227,17 @@
description: A pair of rainbow shoes.
components:
- type: Sprite
sprite: Clothing/Shoes/rain_bow.rsi
sprite: Clothing/Shoes/rainbow.rsi
- type: Icon
sprite: Clothing/Shoes/rain_bow.rsi
sprite: Clothing/Shoes/rainbow.rsi
- type: Clothing
sprite: Clothing/Shoes/rain_bow.rsi
sprite: Clothing/Shoes/rainbow.rsi
- type: entity
parent: ShoesBase
id: ShoesRed
name: red shoes
description: Stylish purple shoes.
description: Stylish red shoes.
components:
- type: Sprite
sprite: Clothing/Shoes/red.rsi
@@ -337,19 +246,6 @@
- type: Clothing
sprite: Clothing/Shoes/red.rsi
- type: entity
parent: ShoesBase
id: ShoesReinforced
name: reinforced shoes
description: A pair of reinforced shoes.
components:
- type: Sprite
sprite: Clothing/Shoes/reinforced.rsi
- type: Icon
sprite: Clothing/Shoes/reinforced.rsi
- type: Clothing
sprite: Clothing/Shoes/reinforced.rsi
- type: entity
parent: ShoesBase
id: ShoesSlippers
@@ -363,19 +259,6 @@
- type: Clothing
sprite: Clothing/Shoes/slippers.rsi
- type: entity
parent: ShoesBase
id: ShoesSlippersWorn
name: slippers (worn)
description: Fluffy...
components:
- type: Sprite
sprite: Clothing/Shoes/slippers_worn.rsi
- type: Icon
sprite: Clothing/Shoes/slippers_worn.rsi
- type: Clothing
sprite: Clothing/Shoes/slippers_worn.rsi
- type: entity
parent: ShoesBase
id: ShoesSpringjacks
@@ -505,3 +388,16 @@
sprite: Clothing/Shoes/codersocks.rsi
- type: Clothing
sprite: Clothing/Shoes/codersocks.rsi
- type: entity
parent: ShoesBase
id: ShoesJackboots
name: jackboots
description: Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time.
components:
- type: Sprite
sprite: Clothing/Shoes/jackboots.rsi
- type: Icon
sprite: Clothing/Shoes/jackboots.rsi
- type: Clothing
sprite: Clothing/Shoes/jackboots.rsi

23
Resources/Prototypes/Entities/Constructible/Ground/table.yml
View File

@@ -1,7 +1,7 @@
- type: entity
id: Table
name: "table"
description: A square piece of metal standing on four metal legs. It can not move.
description: A square piece of metal standing on four metal legs.
components:
- type: Clickable
- type: InteractionOutline
@@ -27,18 +27,31 @@
deadThreshold: 50
spawnOnDestroy: SteelSheet1
# TODO: drop wood instead of steel when destroyed when that's added
- type: entity
id: TableWood
parent: Table
name: "wood table"
description: Do not apply fire to this. Rumour says it burns easily.
components:
- type: Clickable
- type: InteractionOutline
- type: PlaceableSurface
- type: Sprite
netsync: false
sprite: Constructible/Structures/Tables/wood.rsi
- type: Icon
sprite: Constructible/Structures/Tables/wood.rsi
state: icon
- type: Collidable
shapes:
- !type:PhysShapeAabb
layer:
- VaultImpassable
- type: SnapGrid
offset: Center
- type: IconSmooth
key: wood
base: wood_
- type: Climbable
- type: Destructible
deadThreshold: 50
spawnOnDestroy: SteelSheet1
deadThreshold: 15
spawnOnDestroy: WoodPlank

10
Resources/Prototypes/Entities/Objects/materials.yml
View File

@@ -201,3 +201,13 @@
components:
- type: Stack
count: 1
- type: entity
name: wood plank
id: WoodPlank
parent: BaseItem
components:
- type: Sprite
texture: Objects/Materials/wood.png
- type: Icon
texture: Objects/Materials/wood.png

1
Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
View File

@@ -22,3 +22,4 @@
backpack: BackpackEngineeringFilled
shoes: ShoesBrown
idcard: CEPDA
belt: UtilityBeltClothingFilled

1
Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
View File

@@ -20,3 +20,4 @@
shoes: ShoesWorkboots
outerclothing: OuterclothingHazard
idcard: EngineerPDA
belt: UtilityBeltClothingFilled