cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm
This commit is contained in:
skull132
2017-10-29 16:15:53 +02:00
parent 0d50eed14e 2d52377ad8
commit c0f22a1cdd
47 changed files with 3560 additions and 90287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/weapon.dm
+1 -1
View File
@@ -437,7 +437,7 @@
/obj/item/weapon/anomaly_core
name = "anomaly core"
desc = "An advanced bluespace device, little is know about its applications."
desc = "An advanced bluespace device, little is known about its applications, meriting research into its purpose."
icon = 'icons/obj/objects.dmi'
icon_state = "anomaly_core"
origin_tech = list(TECH_MAGNET = 6, TECH_MATERIAL = 7, TECH_BLUESPACE = 8)