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.

Sign up for GitHub

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

Rename shields #34794

Merged
merged 4 commits into from
Jan 31, 2025
+4 −4
Merged

Rename shields #34794

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf86d30
Changed name and description of bullet shield
Nox38 Jan 31, 2025
2535935
changed laser shield
Nox38 Jan 31, 2025
912c88e
Added Keron's suggestions
Nox38 Jan 31, 2025
d8fee4e
Update Resources/Prototypes/Entities/Objects/Shields/shields.yml
Nox38 Jan 31, 2025
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
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Objects/Shields/shields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
Slash: 1

- type: entity
name: riot laser shield
name: ablative shield
parent: [ BaseShield, BaseRestrictedContraband ]
id: RiotLaserShield
description: A riot shield built for withstanding lasers, but not much else.
description: A ablative shield built for withstanding lasers, but not much else.
Nox38 marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: Sprite
state: riot_laser-icon
Expand All @@ -104,10 +104,10 @@
Heat: 1

- type: entity
name: riot bullet shield
name: ballistic shield
parent: [ BaseShield, BaseRestrictedContraband ]
id: RiotBulletShield
description: A ballistic riot shield built for withstanding bullets, but not much else.
description: A ballistic shield built for protecting against firearms, but not much else.
components:
- type: Sprite
state: riot_bullet-icon
Expand Down
Loading