Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/_onclick/cyborg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
if(A.IsReachableBy(src, W?.reach))
W.melee_attack_chain(src, A, modifiers)
return
else if(isturf(A) || isturf(A.loc))
else if(isturf(A) || isturf(A.loc) || istype(A, /atom/movable/screen/fullscreen/cursor_catcher)) // DOPPLER EDIT - Stupid fix for cyborg tetherguns not letting you put things down - ORIGINAL: else if(isturf(A) || isturf(A.loc))
A.base_ranged_item_interaction(src, W, modifiers)

//Give cyborgs hotkey clicks without breaking existing uses of hotkey clicks
Expand Down
3 changes: 2 additions & 1 deletion modular_doppler/cell_component/code/cell_component.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ component_cell_out_of_charge/component_cell_removed proc using loc where necessa
/datum/component/cell
/// Our reference to the inserted cell, which will be stored in the parent.
var/obj/item/stock_parts/power_store/cell/inserted_cell
/// The type of power storage, cell or megacell, that this uses
var/cell_type = /obj/item/stock_parts/power_store/cell
/// The item reference to parent.
var/obj/item/equipment
/// How much power do we use each process?
Expand Down Expand Up @@ -55,7 +57,6 @@ component_cell_out_of_charge/component_cell_removed proc using loc where necessa
power_use_amount = _power_use_amount
else
power_use_amount = equipment.power_use_amount

if(_cell_can_be_removed)
cell_can_be_removed = _cell_can_be_removed

Expand Down
36 changes: 36 additions & 0 deletions modular_doppler/shipbreaking/code/tools/rnd.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,45 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO

/datum/design/tethergun
name = "Matter-Energy Tetherspike"
id = "tethergun"
build_type = PROTOLATHE | AWAY_LATHE | COLONY_FABRICATOR
materials = list(
/datum/material/nanocarbon = SHEET_MATERIAL_AMOUNT * 3,
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 9,
/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2.5,
/datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
/datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT,
)
build_path = /obj/item/tethergun
category = list(
RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO

/datum/design/borg_upgrade_engineering_tetherspike
name = "Engineering Tetherspike"
id = "borg_upgrade_engineering_tetherspike"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/tethergun
materials = list(
/datum/material/nanocarbon = SHEET_MATERIAL_AMOUNT * 3,
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 9,
/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2.5,
/datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
/datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT,
)
construction_time = 12 SECONDS
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ENGINEERING
)

/datum/techweb_node/plasma_mining/New()
design_ids |= list(
"demo_remote",
"demo_charge",
"tethergun",
"borg_upgrade_engineering_tetherspike",
)
return ..()
Loading
Loading