Merge pull request #4906 from deathride58/mapseparation2

Map syncs + ATTEMPT 2 OF MODIFIED MAP SEPARATION
This commit is contained in:
LetterJay
2018-01-18 00:03:32 -06:00
committed by GitHub
40 changed files with 666972 additions and 6781 deletions
+1 -1
View File
@@ -403,7 +403,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
if(newauthor)
scanner.cache.author = newauthor
if(href_list["setcategory"])
var/newcategory = input("Choose a category: ") in list("Fiction", "Non-Fiction", "Adult", "Reference", "Religion")
var/newcategory = input("Choose a category: ") in list("Fiction", "Non-Fiction", "Adult", "Reference", "Religion", "Technical")
if(newcategory)
upload_category = newcategory
if(href_list["upload"])
+1 -1
View File
@@ -364,7 +364,7 @@
value = 80
materials = list(MAT_URANIUM = MINERAL_MATERIAL_AMOUNT*0.2)
/obj/item/coin/clown
/obj/item/coin/bananium
name = "bananium coin"
cmineral = "bananium"
icon_state = "coin_bananium_heads"