Adds some missing paper, fixes compile errors from merges

This commit is contained in:
BurgerLUA
2023-08-05 23:10:47 -07:00
parent de79066162
commit 9941c77cce
4 changed files with 24 additions and 6 deletions

View File

@@ -1073,5 +1073,6 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/instrument/trumpet/spectral = 1,
/obj/item/instrument/violin = 10,
/obj/item/instrument/violin/golden = 1
) = 25
) = 25,
/obj/item/paper/fluff/stations/soap = 50
))

View File

@@ -42,7 +42,6 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items
/obj/item/storage/belt/chameleon = 1,
/obj/item/storage/belt/chameleon/broken = 10,
/obj/item/storage/belt/holster/chameleon = 1,
/obj/item/storage/belt/holster/chameleon/broken = 10,
/obj/item/clothing/gloves/combat = 5,
/obj/item/clothing/gloves/tackler/combat = 10,
/obj/item/clothing/gloves/tackler/combat/insulated = 5,

View File

@@ -40,7 +40,7 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c
/obj/item/light/tube/broken = 25,
/obj/item/match = 10,
/obj/item/newspaper = 5,
/obj/item/paper/crumpled = 20,
/obj/item/paper/crumpled = 50,
/obj/item/paper/pamphlet/violent_video_games = 5,
/obj/item/photo/old = 10,
/obj/item/reagent_containers/cup/glass/colocup = 75,

View File

@@ -407,10 +407,10 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/rack_parts = 75,
/obj/item/reagent_containers/blood/random = 50,
list(
/obj/item/reagent_containers/cup/bottle/acidic_buffer = 100,
/obj/item/reagent_containers/cup/bottle/acidic_buffer = 200,
/obj/item/reagent_containers/cup/bottle/amanitin = 10,
/obj/item/reagent_containers/cup/bottle/ammonia = 25,
/obj/item/reagent_containers/cup/bottle/basic_buffer = 100,
/obj/item/reagent_containers/cup/bottle/basic_buffer = 200,
/obj/item/reagent_containers/cup/bottle/chlorine = 25,
/obj/item/reagent_containers/cup/bottle/clownstears = 10,
/obj/item/reagent_containers/cup/bottle/diethylamine = 50,
@@ -456,5 +456,23 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/skillchip/useless_adapter = 200,
/obj/item/skillchip/wine_taster = 100,
/obj/item/skillchip/xenoarch_magnifier = 25
) = 50
) = 50,
list(
/obj/item/folder/ancient_paperwork = 1,
/obj/item/folder/biscuit/unsealed = 10,
/obj/item/folder/blue = 25,
/obj/item/folder/red = 25,
/obj/item/folder/syndicate = 1,
/obj/item/folder/white = 25,
/obj/item/folder/yellow = 25,
/obj/item/paper/fake_report = 50,
/obj/item/paper/joker = 5,
/obj/item/paper/pamphlet/centcom/visitor_info = 10,
/obj/item/paper/pamphlet/cybernetics = 10,
/obj/item/paper/pamphlet/gateway = 10,
/obj/item/paper/pamphlet/radstorm = 10,
/obj/item/paper/pamphlet/ruin/spacehotel = 10,
/obj/item/paper/pamphlet/violent_video_games = 50,
/obj/item/paper/paperslip/fortune = 100
) = 100
))