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

Wooden Grip for Antique Laser Pistol #34886

Merged
merged 7 commits into from
Feb 10, 2025
Merged

Wooden Grip for Antique Laser Pistol #34886

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7fe18d8
wooden grip on antique laser, changes description to match.
Kazaap88 Feb 4, 2025
677530d
Merge remote-tracking branch 'upstream/master' into antique-laser-pistol
Kazaap88 Feb 4, 2025
5e19d20
darker grip
Kazaap88 Feb 4, 2025
940873c
update meta.json
Kazaap88 Feb 5, 2025
91635d5
redesigned shape similar to ps3moira, edited mag to match, changed li…
Kazaap88 Feb 6, 2025
dc4b7b2
fixing an only SLIGHTLY catastrophic fuckup with an experimental inha…
Kazaap88 Feb 6, 2025
264a476
I DID IT AGAIN
Kazaap88 Feb 6, 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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@
name: antique laser pistol
parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband]
id: WeaponAntiqueLaser
description: This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy.
description: This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with high-grade wood and chrome. The object menaces with spikes of energy.
GaussiArson marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi
Expand Down
Binary file modified Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading