Skip to content

Commit

Permalink
QOL-MODSUITS:
Browse files Browse the repository at this point in the history
- Cone compare to module
- Sprinter module
- EFF module
- Energy spear module
- Blade module
  • Loading branch information
Resomi Enjoer committed Oct 15, 2023
1 parent a93c321 commit 0c75884
Show file tree
Hide file tree
Showing 22 changed files with 470 additions and 221 deletions.
2 changes: 2 additions & 0 deletions code/__DEFINES/~ff_defines/tff_company.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#define LAPLAS_ANOMALISTIC_NAME "Laplas anomalistic"
#define CARGO_LAPLAS_ANOMALISTIC (1<<10)

This file was deleted.

71 changes: 0 additions & 71 deletions tff_modular/master_files/code/modules/mod/modules/rig_module.dm

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,18 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING

/datum/design/module/mod_module_shock_protect
name = "MOD shock protection module"
id = "mod_shock_protection_module"
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 5, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5)
build_path = /obj/item/mod/module/energy_effective
category = list(
RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_GENERAL
)

/datum/design/module/mod_energy_effective
name = "MOD energy effective module"
id = "mod_rpd_module"
id = "mod_energy_eff_module"
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 5)
build_path = /obj/item/mod/module/energy_effective
category = list(
Expand All @@ -57,7 +66,7 @@

/datum/design/module/mod_speed_effective
name = "MOD speed effective module"
id = "mod_rpd_module"
id = "mod_speed_eff_module"
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5)
build_path = /obj/item/mod/module/movemenet_effective
category = list(
Expand All @@ -66,7 +75,7 @@

/datum/design/module/mod_cc_effective
name = "MOD complexity effective module"
id = "mod_rpd_module"
id = "mod_cc_eff_module"
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3)
build_path = /obj/item/mod/module/complexity_effective
category = list(
Expand All @@ -75,8 +84,8 @@

/datum/design/module/sprinter
name = "MOD sprinter module"
id = "mod_rpd_module"
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 4, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4)
id = "mod_sprinter_module"
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 4, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4)
build_path = /obj/item/mod/module/sprinter
category = list(
RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_GENERAL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,23 @@
prereq_ids = list("mod_advanced", "adv_engi")
design_ids = list(
"mod_toolarms_module",
"mod_shock_protection_module",
"mod_rpd_module",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)

/datum/techweb_node/utility_effection_mod_module
id = "effective_mod_utility_modules"
display_name = "MOD part effective modules"
description = "Utility modules, what can upgrade MOD part effective."
prereq_ids = list("mod_advanced")
design_ids = list(
"mod_energy_eff_module",
"mod_speed_eff_module",
"mod_cc_eff_module",
"mod_sprinter_module",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
discount_experiments = list(
/datum/experiment/ordnance/gaseous/bz = 4000,
)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified tff_modular/master_files/icons/obj/mod.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/datum/armament_entry/company_import/laplas_anomalistic
category = LAPLAS_ANOMALISTIC_NAME
company_bitflag = CARGO_LAPLAS_ANOMALISTIC

/datum/armament_entry/company_import/laplas_anomalistic/modsuits
subcategory = "MOD desings"

/datum/armament_entry/company_import/laplas_anomalistic/modsuits/energy_spear
item_type = /obj/item/mod/module/energy_spear
cost = PAYCHECK_COMMAND * 8

/datum/armament_entry/company_import/laplas_anomalistic/modsuits/mod_blade
item_type = /obj/item/mod/module/itemgive/mod_blade
cost = PAYCHECK_COMMAND * 10
24 changes: 24 additions & 0 deletions tff_modular/modules/tff_modsuits/modsuits/mod_control.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/obj/item/mod/construction/plating/rnd
icon = 'tff_modular/master_files/icons/obj/mod.dmi'
theme = /datum/mod_theme/rnd

/obj/item/mod/control/rnd
worn_icon = 'tff_modular/master_files/icons/mob/clothing/modsuits/tff_mod.dmi'
icon = 'tff_modular/master_files/icons/obj/clothing/modsuits/mod_clothing.dmi'
icon_state = "rnd-control"
theme = /datum/mod_theme/rnd

/obj/item/mod/control/pre_equipped/rnd
worn_icon = 'tff_modular/master_files/icons/mob/clothing/modsuits/tff_mod.dmi'
icon = 'tff_modular/master_files/icons/obj/clothing/modsuits/mod_clothing.dmi'
icon_state = "rnd-control"
theme = /datum/mod_theme/rnd
starting_frequency = MODLINK_FREQ_NANOTRASEN
applied_cell = /obj/item/stock_parts/cell/hyper
applied_modules = list(
/obj/item/mod/module/dna_lock,
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/storage/bluespace,
/obj/item/mod/module/tether,
)
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
/**
* РнД МОД
*/

/obj/item/mod/construction/plating/rnd
icon = 'tff_modular/master_files/icons/obj/mod.dmi'
theme = /datum/mod_theme/rnd

/datum/mod_theme/rnd
name = "scientist"
desc = "An scientist-fit suit with heat, shock, fire and explosive resistance. Laplas anomalistic desing."
Expand All @@ -19,7 +11,7 @@
slowdown_inactive = 1
slowdown_active = 0.7
complexity_max = 15
ui_theme = "ntos"
ui_theme = "hackerman"
allowed_suit_storage = list(
/obj/item/construction/rcd,
/obj/item/pipe_dispenser,
Expand Down Expand Up @@ -92,24 +84,3 @@
fire = 100
acid = 100
wound = 10

/obj/item/mod/control/rnd
worn_icon = 'tff_modular/master_files/icons/mob/clothing/modsuits/tff_mod.dmi'
icon = 'tff_modular/master_files/icons/obj/clothing/modsuits/mod_clothing.dmi'
icon_state = "rnd-control"
theme = /datum/mod_theme/rnd

/obj/item/mod/control/pre_equipped/rnd
worn_icon = 'tff_modular/master_files/icons/mob/clothing/modsuits/tff_mod.dmi'
icon = 'tff_modular/master_files/icons/obj/clothing/modsuits/mod_clothing.dmi'
icon_state = "rnd-control"
theme = /datum/mod_theme/rnd
starting_frequency = MODLINK_FREQ_NANOTRASEN
applied_cell = /obj/item/stock_parts/cell/hyper
applied_modules = list(
/obj/item/mod/module/dna_lock,
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/storage/bluespace,
/obj/item/mod/module/tether,
)
Original file line number Diff line number Diff line change
Expand Up @@ -91,74 +91,3 @@
if(!selected_item)
return
detach(selected_item)

/**
* Модули
*/

/obj/item/mod/module/itemgive/tool_arms
name = "MOD tools arms module"
desc = "A module installed to users spine. That gift\
Thwo mechanical robotics arm with kit of basic tools."
complexity = 2

overlay_state_inactive = "toolarm_module"
icon_state = "module_toolarm"
incompatible_modules = list(/obj/item/mod/module/itemgive/tool_arms)
items_to_give = list(
/obj/item/screwdriver/cyborg,
/obj/item/wrench/cyborg,
/obj/item/weldingtool/largetank/cyborg,
/obj/item/crowbar/cyborg,
/obj/item/wirecutters/cyborg,
/obj/item/multitool/cyborg,
)

/obj/item/mod/module/itemgive/rpd
name = "MOD rpd module"
desc = "A MOD module installed in users arm, gift a portable version of RPD device."
complexity = 2
icon_state = "module_pipe_dispanser"
items_to_give = list(/obj/item/pipe_dispenser/mod)
incompatible_modules = list(/obj/item/mod/module/itemgive/rpd)

/obj/item/mod/module/itemgive/part_replacer
name = "MOD part replacer module"
desc = "A MOD module installed in users arm, gift a portable version of bluespace part replacer device."
complexity = 1
icon_state = "module_part_replacer"
items_to_give = list(/obj/item/storage/part_replacer/bluespace/mod)
incompatible_modules = list(/obj/item/mod/module/itemgive/part_replacer)

/obj/item/mod/module/itemgive/experiscanner
name = "MOD research scaner module"
desc = "A MOD module installed in users arm, gift a portable version of research scaner."
complexity = 1
icon_state = "module_research_scaner"
items_to_give = list(/obj/item/experi_scanner/mod)
incompatible_modules = list(/obj/item/mod/module/itemgive/experiscanner)

/**
* Предметы
*/

/obj/item/storage/part_replacer/bluespace/mod
name = "MOD bluespace rapid part exchange device"
icon = 'tff_modular/master_files/icons/obj/clothing/modsuits/mod_modules.dmi'
icon_state = "module_part_replacer"
custom_materials = null
force = 0
pshoom_or_beepboopblorpzingshadashwoosh = 'tff_modular/master_files/sounds/energy_emit.ogg'
alt_sound = 'tff_modular/master_files/sounds/energy_emit.ogg'

/obj/item/pipe_dispenser/mod
name = "MOD pipe dispenser"
icon = 'tff_modular/master_files/icons/obj/clothing/modsuits/mod_modules.dmi'
icon_state = "module_pipe_dispanser"
custom_materials = null
force = 0

/obj/item/experi_scanner/mod
name = "MOD Experi-Scanner"
icon = 'tff_modular/master_files/icons/obj/clothing/modsuits/mod_modules.dmi'
icon_state = "module_research_scaner"
Loading

0 comments on commit 0c75884

Please sign in to comment.