Merge pull request #41 from Skyrat-SS13/upstream-merge-52383

[MIRROR] Fix leading slashes and turn on linting for it
This commit is contained in:
Azarak
2020-07-26 01:13:53 +02:00
committed by GitHub
23 changed files with 42 additions and 38 deletions
@@ -16,11 +16,11 @@
bolt_drop_sound = 'sound/weapons/gun/rifle/bolt_in.ogg'
tac_reloads = FALSE
obj/item/gun/ballistic/rifle/update_overlays()
/obj/item/gun/ballistic/rifle/update_overlays()
. = ..()
. += "[icon_state]_bolt[bolt_locked ? "_locked" : ""]"
obj/item/gun/ballistic/rifle/rack(mob/user = null)
/obj/item/gun/ballistic/rifle/rack(mob/user = null)
if (bolt_locked == FALSE)
to_chat(user, "<span class='notice'>You open the bolt of \the [src].</span>")
playsound(src, rack_sound, rack_sound_volume, rack_sound_vary)
@@ -30,12 +30,12 @@ obj/item/gun/ballistic/rifle/rack(mob/user = null)
return
drop_bolt(user)
obj/item/gun/ballistic/rifle/can_shoot()
/obj/item/gun/ballistic/rifle/can_shoot()
if (bolt_locked)
return FALSE
return ..()
obj/item/gun/ballistic/rifle/attackby(obj/item/A, mob/user, params)
/obj/item/gun/ballistic/rifle/attackby(obj/item/A, mob/user, params)
if (!bolt_locked)
to_chat(user, "<span class='notice'>The bolt is closed!</span>")
return