cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

Browse Source 
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
This commit is contained in:
Ccomp5950
2014-03-28 18:46:04 -05:00
parent 820b5e0d9b b5dfa3f08d
commit 56ef5c165c
43 changed files with 1651 additions and 1518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/research/xenoarchaeology/misc.dm
View File

@@ -142,6 +142,7 @@ proc/SetupXenoarch()
new /obj/item/weapon/storage/belt/archaeology(src)
new /obj/item/weapon/storage/box/excavation(src)
new /obj/item/device/flashlight/lantern(src)
new /obj/item/device/ano_scanner(src)
new /obj/item/device/depth_scanner(src)
new /obj/item/device/core_sampler(src)
new /obj/item/device/gps(src)