cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts near a vorestation edit

Browse Source
This commit is contained in:
Leshana
2020-02-24 19:15:09 -05:00
parent 16183867df
commit e7700b7af0
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/accessories/holster.dm
-3
View File
@@ -5,12 +5,9 @@
slot = ACCESSORY_SLOT_TORSO //Legacy/balance purposes
concealed_holster = 1
var/obj/item/holstered = null
<<<<<<< HEAD
var/list/can_hold //VOREStation Add
=======
var/holster_in = 'sound/items/holsterin.ogg'
var/holster_out = 'sound/items/holsterout.ogg'
>>>>>>> 0792f74... Merge pull request #6726 from listerla/more-sounds
/obj/item/clothing/accessory/holster/proc/holster(var/obj/item/I, var/mob/living/user)
if(holstered && istype(user))