cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
This commit is contained in:
PsiOmega
2015-06-26 20:28:47 +02:00
parent eedbcee063 69704b55af
commit f25e8a7a67
41 changed files with 290 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/TriDimension/Turfs.dm
View File

@@ -114,10 +114,10 @@
ReplaceWithLattice()
return
if (istype(C, /obj/item/stack/tile/plasteel))
if (istype(C, /obj/item/stack/tile/steel))
var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
if(L)
var/obj/item/stack/tile/plasteel/S = C
var/obj/item/stack/tile/steel/S = C
if (S.get_amount() < 1)
return
qdel(L)