cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into GunsAndGunAccessories

Browse Source 
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
This commit is contained in:
Granodd
2019-01-26 02:17:22 -05:00
parent c33f03b920 7f54e65037
commit 6c53564df2
660 changed files with 18114 additions and 21521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/minebot.dm
+1 -1
View File
@@ -34,7 +34,7 @@
ranged_message = "shoots"
ranged_cooldown_time = 30
projectiletype = /obj/item/projectile/kinetic
projectilesound = 'sound/weapons/gunshots/Gunshot4.ogg'
projectilesound = 'sound/weapons/gunshots/gunshot4.ogg'
speak_emote = list("states")
wanted_objects = list(/obj/item/stack/ore/diamond, /obj/item/stack/ore/gold, /obj/item/stack/ore/silver,
/obj/item/stack/ore/plasma, /obj/item/stack/ore/uranium, /obj/item/stack/ore/iron,