Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Details costs #11336

Merged
merged 2 commits into from May 19, 2023
Merged

Details costs #11336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
803a7e8
costs
Chip11-n Apr 25, 2023
a6aba62
ways
Chip11-n Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 37 additions & 32 deletions code/defines/obj/weapon.dm
View file
Open in desktop
Expand Up @@ -650,38 +650,39 @@
desc = "A basic capacitor used in the construction of a variety of devices."
icon_state = "capacitor"
origin_tech = "powerstorage=1"
m_amt = 50
g_amt = 50
m_amt = 150
g_amt = 150

/obj/item/weapon/stock_parts/scanning_module
name = "scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module"
origin_tech = "magnets=1"
m_amt = 50
g_amt = 20
m_amt = 100
g_amt = 120

/obj/item/weapon/stock_parts/manipulator
name = "micro-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "micro_mani"
origin_tech = "materials=1;programming=1"
m_amt = 30
m_amt = 100
g_amt = 80

/obj/item/weapon/stock_parts/micro_laser
name = "micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "micro_laser"
origin_tech = "magnets=1"
m_amt = 10
g_amt = 20
m_amt = 100
g_amt = 120

/obj/item/weapon/stock_parts/matter_bin
name = "matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "matter_bin"
origin_tech = "materials=1"
m_amt = 80
m_amt = 300

//Rank 2

Expand All @@ -691,42 +692,44 @@
icon_state = "adv_capacitor"
origin_tech = "powerstorage=3"
rating = 2
m_amt = 50
g_amt = 50
m_amt = 250
g_amt = 250

/obj/item/weapon/stock_parts/scanning_module/adv
name = "advanced scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "adv_scan_module"
origin_tech = "magnets=3"
rating = 2
m_amt = 50
g_amt = 20
m_amt = 250
g_amt = 220

/obj/item/weapon/stock_parts/manipulator/nano
name = "nano-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "nano_mani"
origin_tech = "materials=3,programming=2"
rating = 2
m_amt = 30
m_amt = 230
g_amt = 220

/obj/item/weapon/stock_parts/micro_laser/high
name = "high-power micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "high_micro_laser"
origin_tech = "magnets=3"
rating = 2
m_amt = 10
g_amt = 20
m_amt = 210
g_amt = 220

/obj/item/weapon/stock_parts/matter_bin/adv
name = "advanced matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "advanced_matter_bin"
origin_tech = "materials=3"
rating = 2
m_amt = 80
m_amt = 280
g_amt = 220

//Rating 3

Expand All @@ -736,42 +739,44 @@
icon_state = "super_capacitor"
origin_tech = "powerstorage=5;materials=4"
rating = 3
m_amt = 50
g_amt = 50
m_amt = 350
g_amt = 350

/obj/item/weapon/stock_parts/scanning_module/adv/phasic
name = "phasic scanning module"
desc = "A compact, high resolution phasic scanning module used in the construction of certain devices."
icon_state = "super_scan_module"
origin_tech = "magnets=5"
rating = 3
m_amt = 50
g_amt = 20
m_amt = 350
g_amt = 320

/obj/item/weapon/stock_parts/manipulator/nano/pico
name = "pico-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "pico_mani"
origin_tech = "materials=5,programming=2"
rating = 3
m_amt = 30
m_amt = 330
g_amt = 320

/obj/item/weapon/stock_parts/micro_laser/high/ultra
name = "ultra-high-power micro-laser"
icon_state = "ultra_high_micro_laser"
desc = "A tiny laser used in certain devices."
origin_tech = "magnets=5"
rating = 3
m_amt = 10
g_amt = 20
m_amt = 310
g_amt = 320

/obj/item/weapon/stock_parts/matter_bin/adv/super
name = "super matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "super_matter_bin"
origin_tech = "materials=5"
rating = 3
m_amt = 80
m_amt = 380
g_amt = 320

//Rating 4

Expand All @@ -781,42 +786,42 @@
icon_state = "quadratic_capacitor"
origin_tech = "powerstorage=6;materials=5"
rating = 4
m_amt = 50
g_amt = 50
m_amt = 350
g_amt = 350

/obj/item/weapon/stock_parts/scanning_module/adv/phasic/triphasic
name = "triphasic scanning module"
desc = "A compact, ultra resolution triphasic scanning module used in the construction of certain devices."
icon_state = "triphasic_scan_module"
origin_tech = "magnets=6"
rating = 4
m_amt = 50
g_amt = 20
m_amt = 350
g_amt = 320

/obj/item/weapon/stock_parts/manipulator/nano/pico/femto
name = "femto-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "femto_mani"
origin_tech = "materials=6;programming=3"
rating = 4
m_amt = 30
m_amt = 330

/obj/item/weapon/stock_parts/micro_laser/high/ultra/quadultra
name = "quad-ultra micro-laser"
icon_state = "quadultra_micro_laser"
desc = "A tiny laser used in certain devices."
origin_tech = "magnets=6"
rating = 4
m_amt = 10
g_amt = 20
m_amt = 80
g_amt = 220

/obj/item/weapon/stock_parts/matter_bin/adv/super/bluespace
name = "bluespace matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "bluespace_matter_bin"
origin_tech = "materials=6"
rating = 4
m_amt = 80
m_amt = 380

// Subspace stock parts

Expand Down
22 changes: 16 additions & 6 deletions code/game/machinery/autolathe.dm
View file
Open in desktop
Expand Up @@ -76,18 +76,23 @@ var/global/list/datum/autolathe_recipe/autolathe_recipes = list(
R(/obj/item/weapon/reagent_containers/syringe, CATEGORY_MEDICAL),
R(/obj/item/clothing/accessory/stethoscope, CATEGORY_MEDICAL),
R(/obj/item/stack/cable_coil/random, CATEGORY_ENGINEERING),
R(/obj/item/weapon/stock_parts/console_screen, CATEGORY_ENGINEERING),
R(/obj/item/weapon/module/power_control, CATEGORY_ENGINEERING),
R(/obj/item/weapon/airlock_electronics, CATEGORY_ENGINEERING),
R(/obj/item/weapon/airalarm_electronics, CATEGORY_ENGINEERING),
R(/obj/item/weapon/firealarm_electronics, CATEGORY_ENGINEERING),
R(/obj/item/weapon/rcd_ammo, CATEGORY_ENGINEERING),
R(/obj/item/weapon/camera_assembly, CATEGORY_ENGINEERING),
R(/obj/item/weapon/table_parts/stall, CATEGORY_ENGINEERING),
R(/obj/item/ammo_box/eight_shells/beanbag, CATEGORY_AMMO),
R(/obj/item/ammo_box/magazine/colt/rubber, CATEGORY_AMMO),
R(/obj/item/ammo_box/magazine/glock/rubber, CATEGORY_AMMO),
R(/obj/item/ammo_box/speedloader/c38, CATEGORY_AMMO),
R(/obj/item/weapon/stock_parts/console_screen, CATEGORY_ENGINEERING),
R(/obj/item/weapon/stock_parts/matter_bin, CATEGORY_ENGINEERING),
R(/obj/item/weapon/stock_parts/micro_laser, CATEGORY_ENGINEERING),
R(/obj/item/weapon/stock_parts/manipulator, CATEGORY_ENGINEERING),
R(/obj/item/weapon/stock_parts/capacitor, CATEGORY_ENGINEERING),
R(/obj/item/weapon/stock_parts/scanning_module, CATEGORY_ENGINEERING),
R(/obj/item/ammo_box/eight_shells/beanbag, CATEGORY_AMMO),
R(/obj/item/ammo_box/magazine/colt/rubber, CATEGORY_AMMO),
R(/obj/item/ammo_box/magazine/glock/rubber, CATEGORY_AMMO),
R(/obj/item/ammo_box/speedloader/c38, CATEGORY_AMMO),
R(/obj/item/device/taperecorder, CATEGORY_DEVICES),
R(/obj/item/device/assembly/igniter, CATEGORY_DEVICES),
R(/obj/item/device/assembly/signaler, CATEGORY_DEVICES),
Expand Down Expand Up @@ -136,7 +141,12 @@ var/global/list/datum/autolathe_recipe/autolathe_recipes_hidden = list(
R(/obj/item/ammo_box/magazine/glock, CATEGORY_AMMO),
R(/obj/item/ammo_box/speedloader/c38m, CATEGORY_AMMO),
R(/obj/item/ammo_box/eight_shells, CATEGORY_AMMO),
R(/obj/item/ammo_box/eight_shells/buckshot, CATEGORY_AMMO)
R(/obj/item/ammo_box/eight_shells/buckshot, CATEGORY_AMMO),
R(/obj/item/weapon/stock_parts/matter_bin/adv, CATEGORY_ENGINEERING),
R(/obj/item/weapon/stock_parts/micro_laser/high, CATEGORY_ENGINEERING),
R(/obj/item/weapon/stock_parts/manipulator/nano, CATEGORY_ENGINEERING),
R(/obj/item/weapon/stock_parts/capacitor/adv, CATEGORY_ENGINEERING),
R(/obj/item/weapon/stock_parts/scanning_module/adv, CATEGORY_ENGINEERING),

)
#undef R
Expand Down
5 changes: 5 additions & 0 deletions code/game/machinery/vending/engineering.dm
View file
Open in desktop
Expand Up @@ -78,6 +78,11 @@
)
contraband = list(
/obj/item/weapon/stock_parts/cell/potato = 3,
/obj/item/weapon/stock_parts/matter_bin/adv = 3,
/obj/item/weapon/stock_parts/micro_laser/high = 3,
/obj/item/weapon/stock_parts/manipulator/nano = 3,
/obj/item/weapon/stock_parts/capacitor/adv = 2,
/obj/item/weapon/stock_parts/scanning_module/adv = 2,
)
premium = list(
/obj/item/weapon/storage/belt/utility = 3,
Expand Down
40 changes: 20 additions & 20 deletions code/modules/research/designs.dm
View file
Open in desktop
Expand Up @@ -811,7 +811,7 @@ other types of metals and chemistry for reagents).
build_path = /obj/item/weapon/storage/part_replacer/bluespace
category = list("Stock Parts")

//Tier1
//Tier1
/datum/design/basic_capacitor
name = "Basic Capacitor"
desc = "A stock part used in the construction of various devices."
Expand Down Expand Up @@ -857,59 +857,59 @@ other types of metals and chemistry for reagents).
build_path = /obj/item/weapon/stock_parts/matter_bin
category = list("Stock Parts")

//Tier 2
//Tier 2
/datum/design/adv_capacitor
name = "Advanced Capacitor"
desc = "A stock part used in the construction of various devices."
id = "adv_capacitor"
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 400, MAT_GLASS = 400, MAT_SILVER = 250)
build_type = PROTOLATHE | MECHFAB | AUTOLATHE
materials = list(MAT_METAL = 650, MAT_GLASS = 400)
build_path = /obj/item/weapon/stock_parts/capacitor/adv
category = list("Stock Parts")

/datum/design/adv_sensor
name = "Advanced Sensor Module"
desc = "A stock part used in the construction of various devices."
id = "adv_sensor"
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 400, MAT_GLASS = 160, MAT_SILVER = 250)
build_type = PROTOLATHE | MECHFAB | AUTOLATHE
materials = list(MAT_METAL = 400, MAT_GLASS = 310)
build_path = /obj/item/weapon/stock_parts/scanning_module/adv
category = list("Stock Parts")

/datum/design/nano_mani
name = "Nano Manipulator"
desc = "A stock part used in the construction of various devices."
id = "nano_mani"
build_type = PROTOLATHE
materials = list(MAT_METAL = 240, MAT_SILVER = 250)
build_type = PROTOLATHE | AUTOLATHE
materials = list(MAT_METAL = 240, MAT_GLASS = 250)
build_path = /obj/item/weapon/stock_parts/manipulator/nano
category = list("Stock Parts")

/datum/design/high_micro_laser
name = "High-Power Micro-Laser"
desc = "A stock part used in the construction of various devices."
id = "high_micro_laser"
build_type = PROTOLATHE
materials = list(MAT_METAL = 80, MAT_GLASS = 160, MAT_SILVER = 250)
build_type = PROTOLATHE | AUTOLATHE
materials = list(MAT_METAL = 330, MAT_GLASS = 160)
build_path = /obj/item/weapon/stock_parts/micro_laser/high
category = list("Stock Parts")

/datum/design/adv_matter_bin
name = "Advanced Matter Bin"
desc = "A stock part used in the construction of various devices."
id = "adv_matter_bin"
build_type = PROTOLATHE
materials = list(MAT_METAL = 640, MAT_SILVER = 300)
build_type = PROTOLATHE | AUTOLATHE
materials = list(MAT_METAL = 640, MAT_GLASS = 300)
build_path = /obj/item/weapon/stock_parts/matter_bin/adv
category = list("Stock Parts")

//Tier 3
//Tier 3
/datum/design/super_capacitor
name = "Super Capacitor"
desc = "A stock part used in the construction of various devices."
id = "super_capacitor"
build_type = PROTOLATHE |MECHFAB
materials = list(MAT_METAL = 400, MAT_GLASS = 400, MAT_GOLD = 250)
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 700, MAT_GLASS = 450)
build_path = /obj/item/weapon/stock_parts/capacitor/adv/super
category = list("Stock Parts")

Expand All @@ -918,7 +918,7 @@ other types of metals and chemistry for reagents).
desc = "A stock part used in the construction of various devices."
id = "phasic_sensor"
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 400, MAT_GLASS = 160, MAT_SILVER = 80, MAT_GOLD = 250)
materials = list(MAT_METAL = 600, MAT_GLASS = 390)
build_path = /obj/item/weapon/stock_parts/scanning_module/adv/phasic
category = list("Stock Parts")

Expand All @@ -927,7 +927,7 @@ other types of metals and chemistry for reagents).
desc = "A stock part used in the construction of various devices."
id = "pico_mani"
build_type = PROTOLATHE
materials = list(MAT_METAL = 240, MAT_GOLD = 250)
materials = list(MAT_METAL = 340, MAT_GLASS = 250)
build_path = /obj/item/weapon/stock_parts/manipulator/nano/pico
category = list("Stock Parts")

Expand All @@ -936,7 +936,7 @@ other types of metals and chemistry for reagents).
desc = "A stock part used in the construction of various devices."
id = "ultra_micro_laser"
build_type = PROTOLATHE
materials = list(MAT_METAL = 80, MAT_GLASS = 160, MAT_GOLD = 250, MAT_URANIUM = 80)
materials = list(MAT_METAL = 380, MAT_GLASS = 310)
build_path = /obj/item/weapon/stock_parts/micro_laser/high/ultra
category = list("Stock Parts")

Expand All @@ -945,11 +945,11 @@ other types of metals and chemistry for reagents).
desc = "A stock part used in the construction of various devices."
id = "super_matter_bin"
build_type = PROTOLATHE
materials = list(MAT_METAL = 640, MAT_GOLD = 300)
materials = list(MAT_METAL = 840, MAT_GLASS = 300)
build_path = /obj/item/weapon/stock_parts/matter_bin/adv/super
category = list("Stock Parts")

//Tier 4
//Tier 4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А тебе разве не надо изменить ресерч, который открывает Т2 ?

Copy link
Contributor Author

@Chip11-n Chip11-n Apr 26, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не вижу смысла менять. Или имелось ввиду что-то другое?

Это как-то странно... Почему важные штуки во взломанной автолате? Т2 детали же не контрабанда, не опасная вещь, а вполне обычная база.

Улучшенная сварка в взломанном автолате. И наручники, и РЦД, и гармошка. А ещё звонок. По сути проверка на квалификацию космонавтика. Если не может взломать автолат, то куда до сборки машинерии.

Хотя это всё отговорки и я просто не хочу ставить 10 деталей в одну линию, а также выделить т2.

/datum/design/quadratic_capacitor
name = "Quadratic Capacitor"
desc = "A stock part used in the construction of various devices."
Expand Down