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

Дезориентатор #2005

Merged
merged 11 commits into from
May 22, 2024
Merged

Дезориентатор #2005

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5af6957
Fix disorientator icon
SadNinjaSid Mar 12, 2024
72f5474
Merge branch 'dev-sierra' of https://github.com/SierraBay/SierraBay12…
SadNinjaSid Mar 12, 2024
38643f4
Disorientator fix
SadNinjaSid Mar 12, 2024
a737577
Corecode fix
SadNinjaSid Mar 13, 2024
093bafb
Создание мода
SadNinjaSid Mar 13, 2024
a7d1132
Merge branch 'dev-sierra' of https://github.com/SadNinjaSid/SierraBay…
SadNinjaSid Mar 13, 2024
575851a
Update _ssgunsetc.dme
UEDCommander May 22, 2024
f4e9003
Update stun.dm
UEDCommander May 22, 2024
f207c28
Update stun.dm
UEDCommander May 22, 2024
8fa3626
Update stun.dm
UEDCommander May 22, 2024
703f299
Update global_modpacks.dm
UEDCommander May 22, 2024
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 code/modules/projectiles/guns/energy/stun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
/obj/item/gun/energy/confuseray
name = "disorientator"
desc = "The W-T Mk. 4 Disorientator is a small, low capacity, and short-ranged energy projector intended for personal defense with minimal risk of permanent damage or cross-fire."
icon = 'icons/obj/guns/confuseray.dmi'
icon = 'icons/obj/guns/confuseraysec.dmi'
icon_state = "confuseray"
safety_icon = "safety"
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_POWER = 2)
Expand Down
Binary file added icons/obj/guns/confuseraysec.dmi
View file
Open in desktop
Binary file not shown.