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

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

Browse Source 
Conflicts:
	code/setup.dm
This commit is contained in:
GinjaNinja32
2015-05-16 08:53:33 +01:00
parent 354859b889 38eb1ad7b9
commit 76654321e4
128 changed files with 4730 additions and 7135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials.dm
+3
View File
@@ -53,6 +53,9 @@ var/list/name_to_material
if(!shard_icon)
shard_icon = shard_type
/material/placeholder
name = "placeholder"
/material/proc/place_dismantled_girder(var/turf/target, var/material/reinf_material)
var/obj/structure/girder/G = new(target)
if(reinf_material)