Adds fifty stacks for all material stacks and makes drop pod actually drop fifties

This commit is contained in:
Yoshax
2016-07-10 03:40:24 +01:00
parent 108a8743f5
commit c60407e6f4
5 changed files with 84 additions and 10 deletions

View File

@@ -13,6 +13,9 @@
max_amount = 60 max_amount = 60
attack_verb = list("hit", "bludgeoned", "whacked") attack_verb = list("hit", "bludgeoned", "whacked")
/obj/item/stack/rods/fifty //Calling this path still fifty because sixty is confusing
amount = 60
/obj/item/stack/rods/cyborg /obj/item/stack/rods/cyborg
name = "metal rod synthesizer" name = "metal rod synthesizer"
desc = "A device that makes metal rods." desc = "A device that makes metal rods."

View File

@@ -4,36 +4,54 @@
singular_name = "human skin piece" singular_name = "human skin piece"
icon_state = "sheet-hide" icon_state = "sheet-hide"
/obj/item/stack/material/animalhide/human
amount = 50
/obj/item/stack/material/animalhide/corgi /obj/item/stack/material/animalhide/corgi
name = "corgi hide" name = "corgi hide"
desc = "The by-product of corgi farming." desc = "The by-product of corgi farming."
singular_name = "corgi hide piece" singular_name = "corgi hide piece"
icon_state = "sheet-corgi" icon_state = "sheet-corgi"
/obj/item/stack/material/animalhide/corgi
amount = 50
/obj/item/stack/material/animalhide/cat /obj/item/stack/material/animalhide/cat
name = "cat hide" name = "cat hide"
desc = "The by-product of cat farming." desc = "The by-product of cat farming."
singular_name = "cat hide piece" singular_name = "cat hide piece"
icon_state = "sheet-cat" icon_state = "sheet-cat"
/obj/item/stack/material/animalhide/cat
amount = 50
/obj/item/stack/material/animalhide/monkey /obj/item/stack/material/animalhide/monkey
name = "monkey hide" name = "monkey hide"
desc = "The by-product of monkey farming." desc = "The by-product of monkey farming."
singular_name = "monkey hide piece" singular_name = "monkey hide piece"
icon_state = "sheet-monkey" icon_state = "sheet-monkey"
/obj/item/stack/material/animalhide/monkey
amount = 50
/obj/item/stack/material/animalhide/lizard /obj/item/stack/material/animalhide/lizard
name = "lizard skin" name = "lizard skin"
desc = "Sssssss..." desc = "Sssssss..."
singular_name = "lizard skin piece" singular_name = "lizard skin piece"
icon_state = "sheet-lizard" icon_state = "sheet-lizard"
/obj/item/stack/material/animalhide/lizard
amount = 50
/obj/item/stack/material/animalhide/xeno /obj/item/stack/material/animalhide/xeno
name = "alien hide" name = "alien hide"
desc = "The skin of a terrible creature." desc = "The skin of a terrible creature."
singular_name = "alien hide piece" singular_name = "alien hide piece"
icon_state = "sheet-xeno" icon_state = "sheet-xeno"
/obj/item/stack/material/animalhide/xeno
amount = 50
//don't see anywhere else to put these, maybe together they could be used to make the xenos suit? //don't see anywhere else to put these, maybe together they could be used to make the xenos suit?
/obj/item/stack/material/xenochitin /obj/item/stack/material/xenochitin
name = "alien chitin" name = "alien chitin"
@@ -42,6 +60,9 @@
icon = 'icons/mob/alien.dmi' icon = 'icons/mob/alien.dmi'
icon_state = "chitin" icon_state = "chitin"
/obj/item/stack/material/xenochitin
amount = 50
/obj/item/xenos_claw /obj/item/xenos_claw
name = "alien claw" name = "alien claw"
desc = "The claw of a terrible creature." desc = "The claw of a terrible creature."
@@ -60,6 +81,9 @@
singular_name = "hairless hide piece" singular_name = "hairless hide piece"
icon_state = "sheet-hairlesshide" icon_state = "sheet-hairlesshide"
/obj/item/stack/material/hairlesshide
amount = 50
/obj/item/stack/material/wetleather /obj/item/stack/material/wetleather
name = "wet leather" name = "wet leather"
desc = "This leather has been cleaned but still needs to be dried." desc = "This leather has been cleaned but still needs to be dried."
@@ -68,6 +92,9 @@
var/wetness = 30 //Reduced when exposed to high temperautres var/wetness = 30 //Reduced when exposed to high temperautres
var/drying_threshold_temperature = 500 //Kelvin to start drying var/drying_threshold_temperature = 500 //Kelvin to start drying
/obj/item/stack/material/wetleather
amount = 50
//Step one - dehairing. //Step one - dehairing.
/obj/item/stack/material/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/stack/material/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob)
if( istype(W, /obj/item/weapon/material/knife) || \ if( istype(W, /obj/item/weapon/material/knife) || \

View File

@@ -35,6 +35,8 @@
flags = 0 flags = 0
origin_tech = list(TECH_BIO = 1) origin_tech = list(TECH_BIO = 1)
/obj/item/stack/tile/grass/fifty
amount = 50
/* /*
* Wood * Wood
*/ */
@@ -49,6 +51,9 @@
throw_range = 20 throw_range = 20
flags = 0 flags = 0
/obj/item/stack/tile/wood/fifty
amount = 50
/obj/item/stack/tile/wood/cyborg /obj/item/stack/tile/wood/cyborg
name = "wood floor tile synthesizer" name = "wood floor tile synthesizer"
desc = "A device that makes wood floor tiles." desc = "A device that makes wood floor tiles."
@@ -71,12 +76,18 @@
throw_range = 20 throw_range = 20
flags = 0 flags = 0
/obj/item/stack/tile/carpet/fifty
amount = 50
/obj/item/stack/tile/carpet/blue /obj/item/stack/tile/carpet/blue
name = "blue carpet" name = "blue carpet"
singular_name = "blue carpet" singular_name = "blue carpet"
desc = "A piece of blue carpet. It is the same size as a normal floor tile!" desc = "A piece of blue carpet. It is the same size as a normal floor tile!"
icon_state = "tile-bluecarpet" icon_state = "tile-bluecarpet"
/obj/item/stack/tile/carpet/blue/fifty
amount = 50
/obj/item/stack/tile/floor /obj/item/stack/tile/floor
name = "floor tile" name = "floor tile"
singular_name = "floor tile" singular_name = "floor tile"
@@ -89,42 +100,63 @@
throw_range = 20 throw_range = 20
flags = CONDUCT flags = CONDUCT
/obj/item/stack/tile/floor/fifty
amount = 50
/obj/item/stack/tile/floor_red /obj/item/stack/tile/floor_red
name = "red floor tile" name = "red floor tile"
singular_name = "red floor tile" singular_name = "red floor tile"
color = COLOR_RED_GRAY color = COLOR_RED_GRAY
icon_state = "tile_white" icon_state = "tile_white"
/obj/item/stack/tile/floor_red/fifty
amount = 50
/obj/item/stack/tile/floor_steel /obj/item/stack/tile/floor_steel
name = "steel floor tile" name = "steel floor tile"
singular_name = "steel floor tile" singular_name = "steel floor tile"
icon_state = "tile_steel" icon_state = "tile_steel"
matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4) matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
/obj/item/stack/tile/floor_steel/fifty
amount = 50
/obj/item/stack/tile/floor_white /obj/item/stack/tile/floor_white
name = "white floor tile" name = "white floor tile"
singular_name = "white floor tile" singular_name = "white floor tile"
icon_state = "tile_white" icon_state = "tile_white"
matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4) matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4)
/obj/item/stack/tile/floor_white/fifty
amount = 50
/obj/item/stack/tile/floor_yellow /obj/item/stack/tile/floor_yellow
name = "yellow floor tile" name = "yellow floor tile"
singular_name = "yellow floor tile" singular_name = "yellow floor tile"
color = COLOR_BROWN color = COLOR_BROWN
icon_state = "tile_white" icon_state = "tile_white"
/obj/item/stack/tile/floor_yellow/fifty
amount = 50
/obj/item/stack/tile/floor_dark /obj/item/stack/tile/floor_dark
name = "dark floor tile" name = "dark floor tile"
singular_name = "dark floor tile" singular_name = "dark floor tile"
icon_state = "fr_tile" icon_state = "fr_tile"
matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4) matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
/obj/item/stack/tile/floor_dark/fifty
amount = 50
/obj/item/stack/tile/floor_freezer /obj/item/stack/tile/floor_freezer
name = "freezer floor tile" name = "freezer floor tile"
singular_name = "freezer floor tile" singular_name = "freezer floor tile"
icon_state = "tile_freezer" icon_state = "tile_freezer"
matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4) matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4)
/obj/item/stack/tile/foor_freezer/fifty
amount = 50
/obj/item/stack/tile/floor/cyborg /obj/item/stack/tile/floor/cyborg
name = "floor tile synthesizer" name = "floor tile synthesizer"
desc = "A device that makes floor tiles." desc = "A device that makes floor tiles."
@@ -144,4 +176,7 @@
throwforce = 1.0 throwforce = 1.0
throw_speed = 5 throw_speed = 5
throw_range = 20 throw_range = 20
flags = 0 flags = 0
/obj/item/stack/tile/linoleum/fifty
amount = 50

View File

@@ -88,6 +88,9 @@
default_type = "iron" default_type = "iron"
apply_colour = 1 apply_colour = 1
/obj/item/stack/material/iron/fifty
amount = 50
/obj/item/stack/material/sandstone /obj/item/stack/material/sandstone
name = "sandstone brick" name = "sandstone brick"
icon_state = "sheet-sandstone" icon_state = "sheet-sandstone"
@@ -228,6 +231,9 @@
icon_state = "sheet-cloth" icon_state = "sheet-cloth"
default_type = "cloth" default_type = "cloth"
/obj/item/stack/material/cloth/fifty
amount = 50
/obj/item/stack/material/cardboard /obj/item/stack/material/cardboard
name = "cardboard" name = "cardboard"
icon_state = "sheet-card" icon_state = "sheet-card"
@@ -242,6 +248,9 @@
icon_state = "sheet-leather" icon_state = "sheet-leather"
default_type = "leather" default_type = "leather"
/obj/item/stack/material/leather/fifty
amount = 50
/obj/item/stack/material/glass /obj/item/stack/material/glass
name = "glass" name = "glass"
icon_state = "sheet-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() /datum/supply_drop_loot/materials/New()
..() ..()
contents = list( contents = list(
/obj/item/stack/material/steel, /obj/item/stack/material/steel/fifty,
/obj/item/stack/material/steel, /obj/item/stack/material/steel/fifty,
/obj/item/stack/material/steel, /obj/item/stack/material/steel/fifty,
/obj/item/stack/material/glass, /obj/item/stack/material/glass/fifty,
/obj/item/stack/material/glass, /obj/item/stack/material/glass/fifty,
/obj/item/stack/material/wood, /obj/item/stack/material/wood/fifty,
/obj/item/stack/material/plastic, /obj/item/stack/material/plastic/fifty,
/obj/item/stack/material/glass/reinforced, /obj/item/stack/material/glass/reinforced/fifty,
/obj/item/stack/material/plasteel) /obj/item/stack/material/plasteel/fifty)
/datum/supply_drop_loot/medical /datum/supply_drop_loot/medical
name = "Medical" name = "Medical"