Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mecha resprite and Vim rework #1252

Merged
merged 9 commits into from
Jan 7, 2025
Merged
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
4 changes: 4 additions & 0 deletions Resources/Audio/_Impstation/Mecha/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["mechmove_1.ogg"]
license: "CC-BY-4.0"
copyright: "by jdpstar"
source: "https://freesound.org/s/538402/"
Binary file added Resources/Audio/_Impstation/Mecha/mechmove_1.ogg
Binary file not shown.
25 changes: 18 additions & 7 deletions Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
- type: Sprite
drawdepth: Mobs
noRot: true
sprite: Objects/Specific/Mech/mecha.rsi
sprite: _Impstation/Objects/Specific/Mech/mecha.rsi #imp edit
layers:
- map: [ "enum.MechVisualLayers.Base" ]
state: ripley
Expand All @@ -132,10 +132,13 @@
- HumanoidAppearance
- type: MeleeWeapon
hidden: true
attackRate: 1
attackRate: 0.7 #imp change
damage:
types:
Blunt: 14 #intentionally shit so people realize that going into combat with the ripley is usually a bad idea.
Blunt: 14 #intentionally shit so people realize that going into combat with the ripley is usually a bad idea. #<- PUSSY #imp edit
Piercing: 6
soundHit:
collection: GreatWrench
- type: MovementSpeedModifier
baseWalkSpeed: 2.25
baseSprintSpeed: 3.6
Expand Down Expand Up @@ -249,10 +252,13 @@
- type: Sprite
drawdepth: Mobs
noRot: true
sprite: Objects/Specific/Mech/mecha.rsi
sprite: _Impstation/Objects/Specific/Mech/mecha.rsi
layers:
- map: [ "enum.MechVisualLayers.Base" ]
state: vim
- state: vim_lights #imp edit
shader: unshaded
visible: true
- type: Fixtures
fixtures:
fix1:
Expand All @@ -266,7 +272,7 @@
- MobLayer
- type: FootstepModifier
footstepSoundCollection:
path: /Audio/Mecha/mechmove03.ogg
path: /Audio/_Impstation/Mecha/mechmove_1.ogg #imp edit
params:
volume: -10
- type: Mech
Expand All @@ -286,15 +292,20 @@
damage:
types:
Blunt: 10 #thwack
Structural: 2
- type: MovementSpeedModifier
baseWalkSpeed: 2.25
baseSprintSpeed: 3.6
- type: Access
tags:
- Maintenance
# TOOD: buzz / chime actions
# TODO: builtin flashlight
- type: PointLight #imp edit
enabled: true
mask: /Textures/Effects/LightMasks/cone.png
autoRot: true
radius: 1.5
netsync: false
color: "#d5fcff"

- type: entity
parent: MechVim
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
speedModifierThresholds:
60: 0.85 # 0.7 is base speed.
80: 0.75 # 0.5 is base speed.
- type: Tag
tags:
- VimPilot
- type: Reactive
groups:
Flammable: [ Touch ]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"copyright" : "Taken from TGstation's wallening patch, VIM resprite by kipdotnet (github)",
"license" : "CC-BY-SA-3.0",
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "ripley",
"directions": 4
},
{
"name": "ripley-empty",
"directions": 4
},
{
"name": "ripley-open"
},
{
"name": "ripley-broken"
},
{
"name": "ripley-g",
"directions": 4
},
{
"name": "ripley-g-open"
},
{
"name": "ripley-g-full",
"directions": 4
},
{
"name": "ripley-g-full-open"
},
{
"name": "ripleymkii",
"directions": 4
},
{
"name": "ripleymkii-open"
},
{
"name": "ripleymkii-broken"
},
{
"name": "vim",
"directions": 4
},
{
"name": "vim-open",
"directions": 4
},
{
"name": "vim-broken",
"directions": 4
},
{
"name": "vim_lights",
"directions": 4
}
]
}
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.
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.
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.
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.
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading