Skip to content

Commit

Permalink
machine design (#1621)
Browse files Browse the repository at this point in the history
  • Loading branch information
FelixRuin authored Jan 19, 2025
1 parent 1ad4139 commit 2123ca8
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 2 deletions.
2 changes: 2 additions & 0 deletions code/game/machinery/PDApainter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,13 @@
else
return ..()

/*
/obj/machinery/pdapainter/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(!(machine_stat & BROKEN))
machine_stat |= BROKEN
update_icon()
*/

/obj/machinery/pdapainter/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/techweb/nodes/computer_hud_nodes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
display_name = "Computerized Recordkeeping"
description = "Organized record databases and how they're used."
prereq_ids = list("comptech")
design_ids = list("secdata", "med_data", "prisonmanage", "vendor", "automated_announcement")
design_ids = list("secdata", "med_data", "prisonmanage", "vendor", "automated_announcement", "pdapainter")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1250)

/datum/techweb_node/telecomms
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/techweb/nodes/medical_nodes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
description = "Basic fragile prosthetics for the impaired."
starting_node = TRUE
prereq_ids = list("biotech")
design_ids = list("basic_l_arm", "basic_r_arm", "basic_r_leg", "basic_l_leg")
design_ids = list("basic_l_arm", "basic_r_arm", "basic_r_leg", "basic_l_leg", "aug_manipulator")

/datum/techweb_node/advance_limbs
id = "advance_limbs"
Expand Down
7 changes: 7 additions & 0 deletions modular_bluemoon/code/game/machinery/PDApainter.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/obj/machinery/pdapainter
circuit = /obj/item/circuitboard/machine/pdapainter

/obj/machinery/pdapainter/crowbar_act(mob/living/user, obj/item/tool)
if(!default_deconstruction_crowbar(tool, TRUE))
return
return TOOL_ACT_TOOLTYPE_SUCCESS
7 changes: 7 additions & 0 deletions modular_bluemoon/code/game/machinery/aug_manipulator.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/obj/machinery/aug_manipulator
circuit = /obj/item/circuitboard/machine/aug_manipulator

/obj/machinery/aug_manipulator/crowbar_act(mob/living/user, obj/item/tool)
if(!default_deconstruction_crowbar(tool, TRUE))
return
return TOOL_ACT_TOOLTYPE_SUCCESS
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/obj/item/circuitboard/machine/pdapainter
name = "PDA painter (Machine Board)"
icon_state = "service"
build_path = /obj/machinery/pdapainter
req_components = list(
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stack/cable_coil = 2,
/obj/item/stack/sheet/glass = 2)
needs_anchored = FALSE

/obj/item/circuitboard/machine/aug_manipulator
name = "Augment manipulator (Machine Board)"
icon_state = "science"
build_path = /obj/machinery/aug_manipulator
req_components = list(
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stack/cable_coil = 2,
/obj/item/stack/sheet/glass = 2)
needs_anchored = FALSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/datum/design/board/pdapainter
name = "Machine Design (PDA painter Board)"
desc = "The circuit board for an PDA painter."
id = "pdapainter"
build_path = /obj/item/circuitboard/machine/pdapainter
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE

/datum/design/board/aug_manipulator
name = "Machine Design (Augment manipulator Board)"
desc = "The circuit board for a augment manipulator."
id = "aug_manipulator"
build_path = /obj/item/circuitboard/machine/aug_manipulator
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
4 changes: 4 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1074,6 +1074,7 @@
#include "code\game\machinery\airlock_control.dm"
#include "code\game\machinery\announcement_system.dm"
#include "code\game\machinery\aug_manipulator.dm"
#include "modular_bluemoon\code\game\machinery\aug_manipulator.dm"
#include "code\game\machinery\autolathe.dm"
#include "code\game\machinery\autoloom.dm"
#include "code\game\machinery\bank_machine.dm"
Expand Down Expand Up @@ -1110,6 +1111,7 @@
#include "code\game\machinery\mass_driver.dm"
#include "code\game\machinery\navbeacon.dm"
#include "code\game\machinery\PDApainter.dm"
#include "modular_bluemoon\code\game\machinery\PDApainter.dm"
#include "code\game\machinery\posi_alert.dm"
#include "code\game\machinery\prisonlabor.dm"
#include "code\game\machinery\quantum_pad.dm"
Expand Down Expand Up @@ -1373,6 +1375,7 @@
#include "code\game\objects\items\circuitboards\circuitboard.dm"
#include "code\game\objects\items\circuitboards\computer_circuitboards.dm"
#include "code\game\objects\items\circuitboards\machine_circuitboards.dm"
#include "modular_bluemoon\code\game\objects\items\circuitboards\machine_circuitboards.dm"
#include "code\game\objects\items\devices\aicard.dm"
#include "code\game\objects\items\devices\anomaly_neutralizer.dm"
#include "code\game\objects\items\devices\beacon.dm"
Expand Down Expand Up @@ -3750,6 +3753,7 @@
#include "code\modules\research\designs\autolathe_desings\autolathe_designs_tcomms_and_misc.dm"
#include "code\modules\research\designs\autolathe_desings\autolathe_designs_tools.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_all_misc.dm"
#include "modular_bluemoon\code\modules\research\designs\machine_desings\machine_designs_all_misc.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_cargo.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_engi.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_medical.dm"
Expand Down

0 comments on commit 2123ca8

Please sign in to comment.