Merge pull request #2076 from Yoshax/cargo

Adds more fifty stacks and corrects cargo
This commit is contained in:
Neerti
2016-07-10 03:03:00 -04:00
committed by GitHub
8 changed files with 92 additions and 27 deletions

View File

@@ -88,6 +88,9 @@
default_type = "iron"
apply_colour = 1
/obj/item/stack/material/iron/fifty
amount = 50
/obj/item/stack/material/sandstone
name = "sandstone brick"
icon_state = "sheet-sandstone"
@@ -228,6 +231,9 @@
icon_state = "sheet-cloth"
default_type = "cloth"
/obj/item/stack/material/cloth/fifty
amount = 50
/obj/item/stack/material/cardboard
name = "cardboard"
icon_state = "sheet-card"
@@ -242,6 +248,9 @@
icon_state = "sheet-leather"
default_type = "leather"
/obj/item/stack/material/leather/fifty
amount = 50
/obj/item/stack/material/glass
name = "glass"
icon_state = "sheet-glass"

View File

@@ -128,15 +128,15 @@ var/global/list/datum/supply_drop_loot/supply_drop
/datum/supply_drop_loot/materials/New()
..()
contents = list(
/obj/item/stack/material/steel,
/obj/item/stack/material/steel,
/obj/item/stack/material/steel,
/obj/item/stack/material/glass,
/obj/item/stack/material/glass,
/obj/item/stack/material/wood,
/obj/item/stack/material/plastic,
/obj/item/stack/material/glass/reinforced,
/obj/item/stack/material/plasteel)
/obj/item/stack/material/steel/fifty,
/obj/item/stack/material/steel/fifty,
/obj/item/stack/material/steel/fifty,
/obj/item/stack/material/glass/fifty,
/obj/item/stack/material/glass/fifty,
/obj/item/stack/material/wood/fifty,
/obj/item/stack/material/plastic/fifty,
/obj/item/stack/material/glass/reinforced/fifty,
/obj/item/stack/material/plasteel/fifty)
/datum/supply_drop_loot/medical
name = "Medical"