cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

Browse Source 
Conflicts:
	code/game/turfs/simulated/floor.dm
	icons/mob/back.dmi
	maps/exodus-3.dmm
	polaris.dme
This commit is contained in:
Neerti
2015-05-10 04:21:37 -04:00
parent bd66a9e463 928b0a8be5
commit 6906acf193
233 changed files with 12838 additions and 11596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/research/xenoarchaeology/finds/finds.dm
View File

@@ -323,7 +323,7 @@
apply_material_decorations = 0
if(23)
apply_prefix = 0
new_item = new /obj/item/stack/rods(src.loc)
new_item = PoolOrNew(/obj/item/stack/rods, src.loc)
apply_image_decorations = 0
apply_material_decorations = 0
if(24)