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

Makes cargo datums and shuttle use fifty stacks for material, removes snowflake amount code and var

Browse Source
This commit is contained in:
Yoshax
2016-07-10 03:49:16 +01:00
parent c60407e6f4
commit 04e664ca36
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/datums/supplypacks/materials.dm
View File

@@ -9,40 +9,35 @@
/datum/supply_packs/materials/metal50 /datum/supply_packs/materials/metal50
name = "50 metal sheets" name = "50 metal sheets"
contains = list(/obj/item/stack/material/steel) contains = list(/obj/item/stack/material/steel/fifty)
amount = 50
cost = 10 cost = 10
containertype = /obj/structure/closet/crate containertype = /obj/structure/closet/crate
containername = "Metal sheets crate" containername = "Metal sheets crate"
/datum/supply_packs/materials/glass50 /datum/supply_packs/materials/glass50
name = "50 glass sheets" name = "50 glass sheets"
contains = list(/obj/item/stack/material/glass) contains = list(/obj/item/stack/material/glass/fifty)
amount = 50
cost = 10 cost = 10
containertype = /obj/structure/closet/crate containertype = /obj/structure/closet/crate
containername = "Glass sheets crate" containername = "Glass sheets crate"
/datum/supply_packs/materials/wood50 /datum/supply_packs/materials/wood50
name = "50 wooden planks" name = "50 wooden planks"
contains = list(/obj/item/stack/material/wood) contains = list(/obj/item/stack/material/wood/fifty)
amount = 50
cost = 10 cost = 10
containertype = /obj/structure/closet/crate containertype = /obj/structure/closet/crate
containername = "Wooden planks crate" containername = "Wooden planks crate"
/datum/supply_packs/materials/plastic50 /datum/supply_packs/materials/plastic50
name = "50 plastic sheets" name = "50 plastic sheets"
contains = list(/obj/item/stack/material/plastic) contains = list(/obj/item/stack/material/plastic/fifty)
amount = 50
cost = 10 cost = 10
containertype = /obj/structure/closet/crate containertype = /obj/structure/closet/crate
containername = "Plastic sheets crate" containername = "Plastic sheets crate"
/datum/supply_packs/materials/cardboard_sheets /datum/supply_packs/materials/cardboard_sheets
contains = list(/obj/item/stack/material/cardboard) contains = list(/obj/item/stack/material/cardboard/fifty)
name = "50 cardboard sheets" name = "50 cardboard sheets"
amount = 50
cost = 10 cost = 10
containertype = /obj/structure/closet/crate containertype = /obj/structure/closet/crate
containername = "Cardboard sheets crate" containername = "Cardboard sheets crate"
@@ -53,10 +48,9 @@
containername = "Imported carpet crate" containername = "Imported carpet crate"
cost = 15 cost = 15
contains = list( contains = list(
/obj/item/stack/tile/carpet, /obj/item/stack/tile/carpet/fifty,
/obj/item/stack/tile/carpet/blue /obj/item/stack/tile/carpet/blue/fifty
) )
amount = 50
/datum/supply_packs/misc/linoleum /datum/supply_packs/misc/linoleum
@@ -64,5 +58,4 @@
containertype = /obj/structure/closet/crate containertype = /obj/structure/closet/crate
containername = "Linoleum crate" containername = "Linoleum crate"
cost = 15 cost = 15
contains = list(/obj/item/stack/tile/linoleum) contains = list(/obj/item/stack/tile/linoleum/fifty)
amount = 50

1
code/datums/supplypacks/supplypacks.dm
View File

@@ -28,7 +28,6 @@ var/list/all_supply_groups = list("Atmospherics",
var/name = null var/name = null
var/list/contains = list() var/list/contains = list()
var/manifest = "" var/manifest = ""
var/amount = null
var/cost = null var/cost = null
var/containertype = null var/containertype = null
var/containername = null var/containername = null

1
code/game/supplyshuttle.dm
View File

@@ -291,7 +291,6 @@ var/list/mechtoys = list(
var/number_of_items = max(1, contains[typepath]) var/number_of_items = max(1, contains[typepath])
for(var/j = 1 to number_of_items) for(var/j = 1 to number_of_items)
var/atom/B2 = new typepath(A) var/atom/B2 = new typepath(A)
if(SP.amount && B2:amount) B2:amount = SP.amount
if(slip) slip.info += "<li>[B2.name]</li>" //add the item to the manifest if(slip) slip.info += "<li>[B2.name]</li>" //add the item to the manifest
//manifest finalisation //manifest finalisation