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

Fix merge conflict

Browse Source
This commit is contained in:
Mars
2018-10-09 09:41:37 +02:00
parent f2532e74ba 534b2f8c06
commit d9b60a7bfb
814 changed files with 32582 additions and 16649 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_items.dm
+1 -1
View File
@@ -442,7 +442,7 @@
attack_self(user)
//Bed
/obj/structure/stool/bed/pod
/obj/structure/bed/pod
icon = 'icons/obj/lavaland/survival_pod.dmi'
icon_state = "bed"