cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
This commit is contained in:
PsiOmegaDelta
2015-07-11 10:58:49 +02:00
parent 25397fa101 ef7d13c3dd
commit 9b4d09c974
57 changed files with 1186 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mining/mine_turfs.dm
View File

@@ -340,8 +340,8 @@
R.amount = rand(5,25)
if(2)
var/obj/item/stack/tile/R = new(src)
R.amount = rand(1,5)
var/obj/item/stack/material/plasteel/R = new(src)
R.amount = rand(5,25)
if(3)
var/obj/item/stack/material/steel/R = new(src)