Rebase onto Master for Volume Control Panel, Squash Commits

This commit is contained in:
Rykka
2020-08-27 19:47:38 -04:00
parent 61f7ef53c2
commit d2fb9a7691
375 changed files with 743 additions and 73 deletions
@@ -5,6 +5,8 @@
icon = 'icons/obj/forensics.dmi'
icon_state = "case"
storage_slots = 14
drop_sound = 'sound/items/drop/toolbox.ogg'
pickup_sound = 'sound/items/pickup/toolbox.ogg'
/obj/item/weapon/storage/briefcase/crimekit/New()
..()
+2 -1
View File
@@ -25,7 +25,8 @@
can_be_placed_into = null
flags = OPENCONTAINER | NOBLUDGEON
unacidable = 0
drop_sound = 'sound/items/drop/clothing.ogg'
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
var/on_fire = 0
var/burn_time = 20 //if the rag burns for too long it turns to ashes
@@ -5,6 +5,8 @@
var/gsr = 0
var/list/dna
var/used
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
/obj/item/weapon/forensics/swab/proc/is_used()
return used