shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860

Browse Source 
# Conflicts:
#	_maps/map_files/MetaStation/MetaStation.dmm
This commit is contained in:
deathride58
2017-11-20 23:34:46 -05:00
parent d52e405912 7e42e7cce0
commit 4e727ee576
92 changed files with 1128 additions and 1250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/wall/mineral_walls.dm
-4
View File
@@ -13,8 +13,6 @@
icon = 'icons/turf/walls/gold_wall.dmi'
icon_state = "gold"
sheet_type = /obj/item/stack/sheet/mineral/gold
//var/electro = 1
//var/shocked = null
explosion_block = 0 //gold is a soft metal you dingus.
canSmoothWith = list(/turf/closed/wall/mineral/gold, /obj/structure/falsewall/gold)
@@ -24,8 +22,6 @@
icon = 'icons/turf/walls/silver_wall.dmi'
icon_state = "silver"
sheet_type = /obj/item/stack/sheet/mineral/silver
//var/electro = 0.75
//var/shocked = null
canSmoothWith = list(/turf/closed/wall/mineral/silver, /obj/structure/falsewall/silver)
/turf/closed/wall/mineral/diamond