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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

reworks bluespace miners #4363

Closed
wants to merge 4 commits into from
Closed

reworks bluespace miners #4363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72ae009
soul machine
bloons3 May 21, 2021
35b928b
meat machine
bloons3 May 21, 2021
398851e
update description
bloons3 May 21, 2021
b8c610a
makes it betterer
bloons3 May 21, 2021
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
8 changes: 4 additions & 4 deletions code/game/objects/items/circuitboards/machine_circuitboards.dm
View file
Open in desktop
Expand Up @@ -618,7 +618,7 @@
/obj/item/stock_parts/cell = 1)
def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high)
needs_anchored = FALSE

/obj/item/circuitboard/machine/chem_dispenser/fullupgrade
build_path = /obj/machinery/chem_dispenser/fullupgrade
req_components = list(
Expand Down Expand Up @@ -804,12 +804,12 @@
icon_state = "science"
build_path = /obj/machinery/mineral/bluespace_miner
req_components = list(
/obj/item/stock_parts/capacitor/quadratic = 1,
/obj/item/stock_parts/capacitor = 1,
/obj/item/stock_parts/matter_bin = 3,
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/manipulator/femto = 3,
Copy link
Contributor

@Sinestia Sinestia May 21, 2021 •
edited

Choose a reason for hiding this comment

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

Sneaking in the buff I see, pretty Sus behavior.

/obj/item/stock_parts/manipulator = 3,
/obj/item/stock_parts/scanning_module = 1,
/obj/item/stack/ore/bluespace_crystal = 11)
/obj/item/organ/heart = 1)
needs_anchored = FALSE

/obj/item/circuitboard/machine/circuit_imprinter/department/science
Expand Down
17 changes: 14 additions & 3 deletions code/modules/mining/machine_bluespaceminer.dm
View file
Open in desktop
@@ -1,6 +1,6 @@
/obj/machinery/mineral/bluespace_miner
name = "bluespace mining machine"
desc = "A machine that uses the magic of Bluespace to slowly generate materials and add them to a linked ore silo."
desc = "A machine that uses the magic of Satan to slowly generate materials and add them to a linked ore silo."
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
desc = "A machine that uses the magic of Satan to slowly generate materials and add them to a linked ore silo."
desc = "A machine that uses the magic of Satan to slowly generate materials and add them to a linked ore silo."
timer = 0

icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "bs_miner"
density = TRUE
Expand Down Expand Up @@ -36,5 +36,16 @@
var/datum/component/material_container/mat_container = materials.mat_container
if(!mat_container || panel_open || !powered())
return
var/datum/material/ore = pick(ore_rates)
mat_container.insert_amount_mat((ore_rates[ore] * 1000), ore)

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
timer++
if(timer < 20) // Just guessing a value
return
timer = 0

// profit requires a sacrifice
var/victims = get_living_station_crew()
if(length(victims)<=1) // https://youtu.be/1FzZ7llgeAU
Copy link
Member

@Archanial Archanial May 21, 2021 •
edited

Choose a reason for hiding this comment

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

Suggested change
if(length(victims)<=1) // https://youtu.be/1FzZ7llgeAU
if(LAZYLEN(victims) <= 1) // https://youtu.be/1FzZ7llgeAU

return

var/mob/living/carbon/human/victim = pick(victims)
victim.adjustBruteLoss(5000)
victim.adjustFireLoss(5000)
Comment on lines +46 to +47
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
victim.adjustBruteLoss(5000)
victim.adjustFireLoss(5000)
victim.adjustBruteLoss(5000)
victim.adjustFireLoss(5000)
victin.Gib()

Copy link
Member

Choose a reason for hiding this comment

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

actually you should make it cross server too

visible_message("<span class='notice'>[src] has has provided a bounty of materials, at the cost of something dear to you!</span>")

for(var/datum/material/ore in ore_rates)
mat_container.insert_amount_mat((ore_rates[ore] * 10000), ore)