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

Removes Weapons (#7415)

Browse Source 
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
This commit is contained in:
Werner
2019-11-16 18:36:13 +01:00
committed by GitHub
parent 128ca2235b
commit af16a489a6
1123 changed files with 27193 additions and 27175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/ore_datum.dm
+8 -8
View File
@@ -30,7 +30,7 @@ var/global/list/ore_data = list()
smelts_to = "uranium"
result_amount = 5
spread_chance = 15
ore = /obj/item/weapon/ore/uranium
ore = /obj/item/ore/uranium
scan_icon = "mineral_uncommon"
xarch_ages = list(
"thousand" = 999,
@@ -46,7 +46,7 @@ var/global/list/ore_data = list()
alloy = 1
result_amount = 5
spread_chance = 30
ore = /obj/item/weapon/ore/iron
ore = /obj/item/ore/iron
scan_icon = "mineral_common"
worth = 4
@@ -57,7 +57,7 @@ var/global/list/ore_data = list()
alloy = 1
result_amount = 5
spread_chance = 35
ore = /obj/item/weapon/ore/coal
ore = /obj/item/ore/coal
scan_icon = "mineral_common"
worth = 2
@@ -74,7 +74,7 @@ var/global/list/ore_data = list()
compresses_to = "phoron"
result_amount = 5
spread_chance = 25
ore = /obj/item/weapon/ore/phoron
ore = /obj/item/ore/phoron
scan_icon = "mineral_uncommon"
xarch_ages = list(
"thousand" = 999,
@@ -91,7 +91,7 @@ var/global/list/ore_data = list()
smelts_to = "silver"
result_amount = 5
spread_chance = 15
ore = /obj/item/weapon/ore/silver
ore = /obj/item/ore/silver
scan_icon = "mineral_uncommon"
worth = 20
@@ -101,7 +101,7 @@ var/global/list/ore_data = list()
display_name = "native gold"
result_amount = 5
spread_chance = 10
ore = /obj/item/weapon/ore/gold
ore = /obj/item/ore/gold
scan_icon = "mineral_uncommon"
xarch_ages = list(
"thousand" = 999,
@@ -117,7 +117,7 @@ var/global/list/ore_data = list()
compresses_to = "diamond"
result_amount = 5
spread_chance = 5
ore = /obj/item/weapon/ore/diamond
ore = /obj/item/ore/diamond
scan_icon = "mineral_rare"
xarch_source_mineral = "nitrogen"
worth = 50
@@ -130,7 +130,7 @@ var/global/list/ore_data = list()
alloy = 1
result_amount = 5
spread_chance = 15
ore = /obj/item/weapon/ore/osmium
ore = /obj/item/ore/osmium
scan_icon = "mineral_rare"
worth = 15