cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Browse Source 
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
This commit is contained in:
Erthilo
2012-05-29 15:00:11 +01:00
parent 41b45396f4 5f030b1117
commit b409a84f2d
109 changed files with 2686 additions and 1464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_turfs.dm
+8
View File
@@ -316,6 +316,8 @@
icon_plating = "asteroid_dug"
icon_state = "asteroid_dug"
return
else
return
else
..(W,user)
if ((istype(W,/obj/item/weapon/pickaxe/drill)))
@@ -337,6 +339,9 @@
dug = 1
icon_plating = "asteroid_dug"
icon_state = "asteroid_dug"
return
else
return
else
..(W,user)
@@ -359,6 +364,9 @@
dug = 1
icon_plating = "asteroid_dug"
icon_state = "asteroid_dug"
return
else
return
else
..(W,user)