Skip to content

Commit

Permalink
AssSembler fix (#135)
Browse files Browse the repository at this point in the history
* fix

* cccccc
  • Loading branch information
homexp13 authored Aug 26, 2024
1 parent 19f658f commit 5403880
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
3 changes: 1 addition & 2 deletions code/__DEFINES/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list( //Those networks can only be
#define SCOUT_CLOAK_ENERGY 100
#define SCOUT_CLOAK_STEALTH_DELAY 30
#define SCOUT_CLOAK_RUN_DRAIN 5
//#define SCOUT_CLOAK_WALK_DRAIN 1
#define SCOUT_CLOAK_WALK_DRAIN -1 //RUTGMС EDIT
#define SCOUT_CLOAK_WALK_DRAIN -1
#define SCOUT_CLOAK_ACTIVE_RECOVERY -5 //You only get this once every obj tick, so it'll be comparable to the inactive value
#define SCOUT_CLOAK_INACTIVE_RECOVERY 5
#define SCOUT_CLOAK_COOLDOWN 100
Expand Down
8 changes: 4 additions & 4 deletions code/modules/reqtorio/assembly_crafts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,26 @@ GLOBAL_LIST_INIT(all_assembly_craft_groups, list("Operations", "Weapons", "Explo
output = list(/obj/item/stack/sheet/mineral/osmium/large_stack = 1) // dont count

/datum/assembly_craft/engineering/junk_platinum_convert
name = "Сlearing junk in various resources like copper and platinum"
name = "Clearing junk in various resources like copper and platinum"
craft_time = 15 SECONDS
input = list(/obj/item/stack/sheet/mineral/junk = 5) // 20 points
output = list(/obj/item/stack/sheet/mineral/copper = 4, /obj/item/stack/sheet/mineral/platinum = 1) //12 + 12

/datum/assembly_craft/engineering/junk_silver_convert
name = "Сlearing junk in various resources like plasteel and silver"
name = "Clearing junk in various resources like plasteel and silver"
craft_time = 15 SECONDS
input = list(/obj/item/stack/sheet/mineral/junk = 4) // 20 points
output = list(/obj/item/stack/sheet/plasteel = 1, /obj/item/stack/sheet/mineral/silver = 1) //~ 8 + 8

/datum/assembly_craft/engineering/junk_phoron_convert
name = "Сlearing junk in phoron and glass? Explosion transformation power!"
name = "Clearing junk in phoron and glass? Explosion transformation power!"
craft_time = 15 SECONDS
input = list(/obj/item/stack/sheet/mineral/junk = 4) // 20 points
output = list(/obj/item/stack/sheet/glass = 3, /obj/item/stack/sheet/mineral/phoron = 1) //that expensive! but automized!

//one in one craft cuz junk is multi use resource
/datum/assembly_craft/engineering/junk_phoron_iron
name = "Сlearing junk in iron"
name = "Clearing junk in iron"
craft_time = 15 SECONDS
input = list(/obj/item/stack/sheet/mineral/junk = 50) // 300 from cargo
output = list(/obj/item/stack/sheet/metal/large_stack = 1) //200 points so what?
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reqtorio/craft_components.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

/obj/item/stack/sheet/composite
name = "iron-copper composite"
desc = "Сomposite made of iron and copper plates"
desc = "Composite made of iron and copper plates"
singular_name = "composite sheet"
icon_state = "CuFe_composite"
item_state = "CuFe_composite"
Expand Down
11 changes: 7 additions & 4 deletions code/modules/reqtorio/machines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
. = ..()
. += "It is currently facing [dir2text(dir)] and [anchored ? "" : "un"]secured."
if(craft)
. += "Сurrent craft:"
. += "Current craft:"
. += craft.name
. += "Contains:"
for(var/type in craft.input)
Expand Down Expand Up @@ -133,6 +133,9 @@
return
switch(action)
if("select")
if(!COOLDOWN_CHECK(src, process_cooldown))
balloon_alert(usr, "assembly is still in progress")
return
craft = SSreqtorio.assembly_crafts[text2path(params["id"])]
held_items = list()
for(var/i in craft.input)
Expand All @@ -141,7 +144,7 @@

/obj/machinery/fabricator
name = "Metal fabricator"
desc = "Сreates metal from... air. I think so"
desc = "Creates metal from... air. I think so"
icon = 'icons/obj/factory/factory_machines.dmi'
icon_state = "reconstructor_inactive"
density = TRUE
Expand Down Expand Up @@ -194,7 +197,7 @@

/obj/machinery/fabricator/gunpowder
name = "Gunpowder fabricator"
desc = "Сreates gunpowder from... air. I think so, looks kinda dangerous"
desc = "Creates gunpowder from... air. I think so, looks kinda dangerous"
item_to_fabricate = /obj/item/stack/gun_powder/large_stack

/obj/machinery/fabricator/gunpowder/Destroy()
Expand All @@ -203,7 +206,7 @@

/obj/machinery/fabricator/junk
name = "Junk fabricator"
desc = "Сreates junk from... air. even this is garbage, it can be useful"
desc = "Creates junk from... air. even this is garbage, it can be useful"
item_to_fabricate = /obj/item/stack/sheet/mineral/junk/large_stack

/obj/machinery/splitter
Expand Down

0 comments on commit 5403880

Please sign in to comment.