Skip to content

Securiting #324

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

Open
oguzzzok123 wants to merge 5 commits into
base: master
Choose a base branch
from
+3 −2
Open

Securiting #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98e2690
Update bolas
oguzzzok123 Jun 19, 2026
b1a7e83
Update disabler speed
oguzzzok123 Jun 19, 2026
8b2b285
Update rubber shot speed
oguzzzok123 Jun 19, 2026
043769b
Update shotgun.dm
oguzzzok123 Jun 19, 2026
aec40c4
Update shotgun.dm
oguzzzok123 Jun 19, 2026
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: 2 additions & 2 deletions code/game/objects/items/handcuffs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@
inhand_icon_state = "bola"
lefthand_file = 'icons/mob/inhands/weapons/thrown_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/thrown_righthand.dmi'
breakouttime = 3.5 SECONDS//easy to apply, easy to break out of
breakouttime = 6 SECONDS//easy to apply, easy to break out of
gender = NEUTER
///Amount of time to knock the target down for once it's hit in deciseconds.
var/knockdown = 0
Expand Down Expand Up @@ -608,7 +608,7 @@
inhand_icon_state = "ebola"
hitsound = 'sound/items/weapons/taserhit.ogg'
w_class = WEIGHT_CLASS_SMALL
breakouttime = 6 SECONDS
breakouttime = 4 SECONDS
custom_price = PAYCHECK_COMMAND * 0.35

/obj/item/restraints/legcuffs/bola/energy/Initialize(mapload)
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/projectile/beams.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
name = "disabler beam"
icon_state = "omnilaser"
damage = 30
speed = 1.6
damage_type = STAMINA
armor_flag = ENERGY
hitsound = 'sound/items/weapons/sear_disabler.ogg'
Expand Down