cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-5735

Browse Source
This commit is contained in:
Spades
2019-01-14 11:20:55 -05:00
committed by GitHub
parent 9dbbbf5697 a0cb0a347d
commit c6c7d98a2d
155 changed files with 5785 additions and 1586 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/trash_pile.dm
+1
View File
@@ -221,6 +221,7 @@
prob(4);/obj/item/weapon/storage/pill_bottle/happy,
prob(4);/obj/item/weapon/storage/pill_bottle/zoom,
prob(4);/obj/item/weapon/gun/energy/sizegun,
prob(3);/obj/item/weapon/implanter/sizecontrol,
prob(3);/obj/item/weapon/material/butterfly,
prob(3);/obj/item/weapon/material/butterfly/switchblade,
prob(3);/obj/item/clothing/gloves/knuckledusters,