cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 08:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Safeties for sprays, fixes #403 (#516)

Browse Source 
Pepperspray no longer makes a spraying sound when the safety is on
Spraybottles can now be locked with an alt click
This commit is contained in:
NanakoAC
2016-07-05 21:33:56 +01:00
committed by skull132
parent b6eee04dac
commit 1ecd7629ae
2 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -16,11 +16,18 @@
var/spray_size = 3
var/list/spray_sizes = list(1,3)
volume = 250
var/safety = 0
/obj/item/weapon/reagent_containers/spray/New()
..()
src.verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT
/obj/item/weapon/reagent_containers/spray/AltClick()
safety = !safety
playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
usr << "<span class = 'notice'>You twist the locking cap on the end of the nozzle, the spraybottle is now [safety ? "locked" : "unlocked"].</span>"
/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob, proximity)
if(istype(A, /obj/item/weapon/storage) || istype(A, /obj/structure/table) || istype(A, /obj/structure/closet) || istype(A, /obj/item/weapon/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart))
return
@@ -36,6 +43,11 @@
user << "<span class='notice'>\The [src] is empty!</span>"
return
if(safety)
playsound(src.loc, 'sound/weapons/empty.ogg', 25, 1)
user << "<span class='notice'>The safety is on!</span>"
return
Spray_at(A, user, proximity)
playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
@@ -121,7 +133,8 @@
item_state = "pepperspray"
possible_transfer_amounts = null
volume = 40
var/safety = 1
safety = 1
/obj/item/weapon/reagent_containers/spray/pepper/New()
..()
@@ -131,9 +144,13 @@
if(..(user, 1))
user << "The safety is [safety ? "on" : "off"]."
/obj/item/weapon/reagent_containers/spray/pepper/AltClick()
return //No altclick functionality for pepper spray
/obj/item/weapon/reagent_containers/spray/pepper/attack_self(var/mob/user)
safety = !safety
usr << "<span class = 'notice'>You switch the safety [safety ? "on" : "off"].</span>"
playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
/obj/item/weapon/reagent_containers/spray/pepper/Spray_at(atom/A as mob|obj)
if(safety)

37
html/changelogs/Nanako-PR-412.yml Normal file
View File

@@ -0,0 +1,37 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Nanako
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Pepperspray will no longer make a spraying sound if used while the safety is on"
- rscadd: "Spray bottles can now be locked by alt-clicking"