cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT

Browse Source 
Conflicts:
	code/game/supplyshuttle.dm
	code/modules/mining/laborcamp/laborshuttle.dm
This commit is contained in:
Tigercat2000
2015-12-09 10:08:28 -08:00
parent ebcc4edcef b0be9925d3
commit 42aa800393
160 changed files with 1490 additions and 1239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_items.dm
+1 -1
View File
@@ -177,7 +177,7 @@
/obj/structure/closet/crate/miningcar
desc = "A mining car. This one doesn't work on rails, but has to be dragged."
name = "Mining car (not for rails)"
name = "mining car (not for rails)"
icon = 'icons/obj/storage.dmi'
icon_state = "miningcar"
density = 1