cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-29 07:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1491 from Chemlight/Carpentry-VS-Paper

Browse Source 
Carpentry VS paperwork
This commit is contained in:
Dahlular
2021-11-17 01:13:01 -07:00
committed by GitHub
parent e630655da8 5758c66520
commit aa3963f3bb
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/exports/manifest.dm
+1 -1
View File
@@ -80,7 +80,7 @@
// Paper work done correctly
/datum/export/paperwork_correct
cost = 120 // finicky number 20 x 120 = 2400 per crate
cost = 50 // finicky number 20 x 50 = 1000 per crate, nerfed from 120 to 50 gaining 2400 versus 1000 (CC is running out of space to put all this paper somewhere)
k_elasticity = 0
unit_name = "correct paperwork"
export_types = list(/obj/item/folder/paperwork_correct)
code/modules/cargo/packs/misc.dm
+1 -1
View File
@@ -223,7 +223,7 @@
/datum/supply_pack/misc/paper_work
name = "Freelance Paper work"
desc = "The Kinaris Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (20) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to Kinaris Standards." // Disbursement. It's not a typo, look it up.
cost = 700 // Net of 0 credits but makes (120 x 20 = 2400)
cost = 700 // Net of 0 credits but makes (50 x 20 = 1000, used to be (120 x 20 = 2400))
contains = list(/obj/item/folder/paperwork,
/obj/item/folder/paperwork,
/obj/item/folder/paperwork,
hyperstation/code/modules/cargo/exports/sweatshop.dm
+7 -5
View File
@@ -1,24 +1,26 @@
/datum/export/sweatshop/stool
cost = 850
cost = 2550 //buffed temporarily due to paper being pricier than actual wood, was 850
unit_name = "custom stool"
export_types = list(/obj/item/processed/wood/stool)
/datum/export/sweatshop/cushion
cost = 300
cost = 450 //buffed temporarily due to paper being pricier than actual cotton, was 300
unit_name = "cloth cushion"
export_types = list(/obj/item/cushion)
/datum/export/sweatshop/cushionsilk
cost = 500
cost = 750 //buffed temporarily due to paper being pricier than actual silk, was 500
unit_name = "silk cushion"
export_types = list(/obj/item/cushion)
/datum/export/sweatshop/stool/cushioncloth
cost = 1800
cost = 5400 //buffed temporarily due to paper being pricier than actual wood, was 1800
unit_name = "cushioned stool (cloth)"
export_types = list(/obj/item/processed/wood/stoolcloth)
/datum/export/sweatshop/stool/cushionsilk
cost = 2400
cost = 7200 //buffed temporarily due to paper being pricier than actual wood, was 2400
unit_name = "cushioned stool (cloth)"
export_types = list(/obj/item/processed/wood/stoolsilk)
// Prices above are temporary buffs until more carpentry is added