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

Feat: DBs can be holstered #554

Merged
merged 21 commits into from
Nov 2, 2023
Merged

Feat: DBs can be holstered #554

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
209ff71
Fixed1
Yata9arasu Oct 23, 2023
0ea8f9d
Fix. WILL WORK!
Yata9arasu Oct 23, 2023
b1e7553
Added real authors...
Yata9arasu Oct 23, 2023
a5cd468
Fixed ig
Yata9arasu Oct 25, 2023
93739a3
1
Yata9arasu Oct 25, 2023
550ebd6
Fixed tabs
Yata9arasu Oct 25, 2023
66f1a55
Merge branch 'ss220club:master' into master
Yata9arasu Oct 25, 2023
47723a4
Spaced changed for tabs
Yata9arasu Oct 25, 2023
15c887c
Changed tabs
Yata9arasu Oct 25, 2023
3f294ff
Merge branch 'master' of https://github.com/Yata9arasu/Paradise-SS220
Yata9arasu Oct 25, 2023
32381c0
Changed module paths
Yata9arasu Oct 26, 2023
0e0e161
Changing modules
Yata9arasu Oct 26, 2023
519d959
Changing paths
Yata9arasu Oct 26, 2023
8bc013d
No need this now
Yata9arasu Oct 26, 2023
aeee108
Merge branch 'master' into master
Yata9arasu Oct 30, 2023
226512d
Deleted authors
Yata9arasu Oct 31, 2023
aa9697d
Merge branch 'master' of https://github.com/Yata9arasu/Paradise-SS220
Yata9arasu Oct 31, 2023
e6e97c8
Merge branch 'ss220club:master' into master
Yata9arasu Nov 1, 2023
add1d20
vi jacket 1
Yata9arasu Nov 1, 2023
3e52e5b
Merge branch 'master' of https://github.com/Yata9arasu/Paradise-SS220
Yata9arasu Nov 1, 2023
978362e
Revert "vi jacket 1"
Yata9arasu Nov 1, 2023
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 modular_ss220/balance/_balance.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/datum/modpack/balance
name = "Баланс"
desc = "Твики баланса."
author = "dj-34, larentoun"
author = "dj-34, larentoun, Yata9arasu, Aylong220, TakeItEasyiloveyou"
Legendaxe marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 5 additions & 0 deletions modular_ss220/balance/code/items/weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
/obj/item/melee/baton/cattleprod
w_class = WEIGHT_CLASS_NORMAL
/obj/item/gun/projectile/revolver/doublebarrel/sawoff(mob/user)
. = ..()
if(sawn_state == SAWN_OFF)
can_holster = TRUE
w_class = WEAPON_MEDIUM