cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 21:49:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576

Browse Source
This commit is contained in:
Unknown
2020-08-28 13:30:54 -04:00
parent 0c4ff56030 28c19ee066
commit 10ca73bc6e
500 changed files with 14619 additions and 9723 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj.dm
+1
View File
@@ -97,6 +97,7 @@
throw_speed = 1
throw_range = 20
drop_sound = 'sound/items/drop/rubber.ogg'
pickup_sound = 'sound/items/pickup/rubber.ogg'
afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
user.drop_item()
code/defines/obj/weapon.dm
+2
View File
@@ -79,6 +79,8 @@
/obj/item/weapon/disk
name = "disk"
icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit
drop_sound = 'sound/items/drop/disk.ogg'
pickup_sound = 'sound/items/pickup/disk.ogg'
/obj/item/weapon/disk/nuclear
name = "nuclear authentication disk"