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

Merging pull request from caelaislinn-master

Browse Source
This commit is contained in:
Albert Iordache
2012-07-13 20:54:22 +03:00
parent aab476a847
commit dda09390ac
14 changed files with 614 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/mining/satchel_ore_box.dm
View File

@@ -81,24 +81,26 @@
var/amt_plasma = 0
var/amt_uranium = 0
var/amt_clown = 0
var/amt_archaeo = 0
for (var/obj/item/weapon/ore/C in contents)
if (istype(C,/obj/item/weapon/ore/diamond))
amt_diamond++;
if (istype(C,/obj/item/weapon/ore/glass))
else if (istype(C,/obj/item/weapon/ore/glass))
amt_glass++;
if (istype(C,/obj/item/weapon/ore/plasma))
else if (istype(C,/obj/item/weapon/ore/plasma))
amt_plasma++;
if (istype(C,/obj/item/weapon/ore/iron))
else if (istype(C,/obj/item/weapon/ore/iron))
amt_iron++;
if (istype(C,/obj/item/weapon/ore/silver))
else if (istype(C,/obj/item/weapon/ore/silver))
amt_silver++;
if (istype(C,/obj/item/weapon/ore/gold))
else if (istype(C,/obj/item/weapon/ore/gold))
amt_gold++;
if (istype(C,/obj/item/weapon/ore/uranium))
else if (istype(C,/obj/item/weapon/ore/uranium))
amt_uranium++;
if (istype(C,/obj/item/weapon/ore/clown))
else if (istype(C,/obj/item/weapon/ore/clown))
amt_clown++;
else if (istype(C,/obj/item/weapon/ore/strangerock))
amt_archaeo++;
var/dat = text("<b>The contents of the ore box reveal...</b><br>")
if (amt_gold)
@@ -117,6 +119,8 @@
dat += text("Uranium ore: [amt_uranium]<br>")
if (amt_clown)
dat += text("Bananium ore: [amt_clown]<br>")
if (amt_archaeo)
dat += text("Strange rocks: [amt_archaeo]<br>")
dat += text("<br><br><A href='?src=\ref[src];removeall=1'>Empty box</A>")
user << browse("[dat]", "window=orebox")