Skip to content

Commit

Permalink
RnD Больше дизайнов (#2742)
Browse files Browse the repository at this point in the history
Co-authored-by: UEDCommander <[email protected]>
  • Loading branch information
Lexanx and UEDCommander authored Nov 2, 2024
1 parent bf6162b commit 44c94bc
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 30 deletions.
17 changes: 17 additions & 0 deletions mods/RnD/code/design.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,20 @@
F.uniquekey = uniquekey
return F


/datum/design/item/tool/jetpack
shortname = "Jetpack"
name = "Jetpack"
desc = "The O'Neill Manufacturing VMU-11-C is a tank-based propulsion unit that utilizes compressed carbon dioxide for moving in zero-gravity areas. <span class='danger'>The label on the side indicates it should not be used as a source for internals.</span>."
id = "jetpack"
req_tech = list(TECH_ENGINEERING = 5, TECH_MATERIAL = 5)
materials = list(MATERIAL_STEEL = 12000, MATERIAL_GLASS = 10000, MATERIAL_SILVER = 2000)
build_path = /obj/item/tank/jetpack/carbondioxide
sort_string = "VAGAM"

/datum/design/circuit/area_atmos
name = "area atmos"
id = "area_atmos"
req_tech = list(TECH_DATA = 2)
build_path = /obj/item/stock_parts/circuitboard/area_atmos
sort_string = "KCAAR"
29 changes: 22 additions & 7 deletions mods/RnD/code/tech_engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,22 @@
required_tech_levels = list()
cost = 1000

unlocks_designs = list("portascrubberstat", "portascrubberhuge", "portapump", "portascrubber", "oxyregen", "cracer","rpd")
unlocks_designs = list("portascrubberstat", "portascrubberhuge", "portapump", "portascrubber", "oxyregen", "cracer","rpd","area_atmos")

/datum/technology/engineering/jetpack
name = "Jetpacks"
desc = "Jetpacks"
id = "jetpack"

x = 0.3
y = 0.7
icon = "jetpack"

required_technologies = list("gas_heat")
required_tech_levels = list()
cost = 1500

unlocks_designs = list("jetpack")

/datum/technology/engineering/adv_parts
name = "Advanced Parts"
Expand Down Expand Up @@ -245,20 +260,20 @@

unlocks_designs = list("arc_welder", "power_drill", "jaws_of_life", "experimental_welder", "price_scanner","hand_rcd")

/datum/technology/engineering/airlock_brace
name = "Airlock Brace"
desc = "Airlock Brace"
id = "airlock_brace"
/datum/technology/engineering/crusher
name = "Crusher"
desc = "Crusher"
id = "crusher"

x = 0.3
y = 0.4
icon = "brace"

required_technologies = list("res_tech")
required_tech_levels = list()
cost = 500
cost = 1500

unlocks_designs = list("brace", "bracejack")
unlocks_designs = list("brace", "bracejack","crusher","pile_ripper","recycler",)

/datum/technology/engineering/icprinter
name = "Integrated Circuit Printer"
Expand Down
24 changes: 4 additions & 20 deletions mods/RnD/code/tech_illegal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,20 @@

required_technologies = list()
required_tech_levels = list()
cost = 1250

unlocks_designs = list("binaryencrypt")

/datum/technology/esoteric/bomb
name = "large chem grenade"
desc = "large chem grenade"
id = "large_grenade"
tech_type = RESEARCH_ESOTERIC
cost = 1750

x = 0.5
y = 0.6
icon = "kit"

required_technologies = list("radiokey")
required_tech_levels = list()
cost = 1000

unlocks_designs = list("large_Grenade")
unlocks_designs = list("binaryencrypt", "large_Grenade")

/datum/technology/esoteric/chameleon_kit
name = "Chameleon Kit"
desc = "Chameleon Kit"
id = "chameleon_kit"

x = 0.5
y = 0.7
y = 0.6
icon = "kit"

required_technologies = list("large_grenade")
required_technologies = list("radiokey")
required_tech_levels = list()
cost = 1500

Expand Down
2 changes: 1 addition & 1 deletion mods/RnD/code/tech_power.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,4 @@
required_tech_levels = list()
cost = 2500

unlocks_designs = list("fusion_core_control", "fusion_fuel_compressor", "fusion_fuel_control", "gyrotron_control", "fusion_core", "fusion_injector")
unlocks_designs = list("fusion_core_control", "fusion_fuel_compressor", "fusion_fuel_control", "gyrotron_control", "fusion_core", "fusion_injector", "fusion_kinetic_harvester")
4 changes: 2 additions & 2 deletions mods/RnD/code/tech_telecom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@

required_technologies = list("tcom_monitoring")
required_tech_levels = list()
cost = 750
cost = 1550

unlocks_designs = list("rcon_console")
unlocks_designs = list("rcon_console", "traffic_server")

/datum/technology/tcom/mainframes
name = "Mainframes"
Expand Down
1 change: 1 addition & 0 deletions mods/utility_items/_utility_items.dme
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "code/hair_olivka.dm"
#include "code/ert_maint_helmet.dm"
#include "code/tag_recipe.dm"
#include "code/chemistry.dm"
#include "code/jobs.dm"

#endif
42 changes: 42 additions & 0 deletions mods/utility_items/code/chemistry.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/singleton/reaction/goldalchemy
name = "Gold"
result = null
required_reagents = list(/datum/reagent/frostoil = 5, /datum/reagent/gold = 20)
catalysts = list(/datum/reagent/coolant=1)
result_amount = 1
mix_message = "The solution solidifies into a golden mass."

/singleton/reaction/goldalchemy/on_reaction(datum/reagents/holder, created_volume, reaction_flags)
..()
new /obj/item/stack/material/gold(get_turf(holder.my_atom), created_volume)

/singleton/reaction/silveralchemy
name = "Silver"
result = null
required_reagents = list(/datum/reagent/frostoil = 5, /datum/reagent/silver = 20)
result_amount = 1
mix_message = "The solution solidifies into a silver mass."

/singleton/reaction/silveralchemy/on_reaction(datum/reagents/holder, created_volume, reaction_flags)
..()
new /obj/item/stack/material/silver(get_turf(holder.my_atom), created_volume)



/singleton/reaction/kompot
name = "Kompot"
result = /datum/reagent/drink/kompot
required_reagents = list(/datum/reagent/water = 2, /datum/reagent/drink/juice/berry = 1, /datum/reagent/drink/juice/apple = 1, /datum/reagent/drink/juice/pear = 1)
result_amount = 5
mix_message = "The mixture turns a soft orange, bubbling faintly"

//REAGENTS//

/datum/reagent/drink/kompot
name = "Kompot"
description = "A traditional Eastern European beverage once used to preserve fruit in the 1980s."
taste_description = "refreshuingly sweet and fruity"
color = "#ed9415"

glass_name = "Kompot"
glass_desc = "Traditional Terran drink. Grandma would be proud."
Binary file modified nano/images/science.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions nano/templates/rdconsole.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,7 @@
.sciTechTreeIcon.icon-eva { background-position: -96px -384px; }
.sciTechTreeIcon.icon-mechloader { background-position: -128px -384px; }
.sciTechTreeIcon.icon-mechlight { background-position: -160px -384px; }
.sciTechTreeIcon.icon-jetpack { background-position: -192px -384px; }

.sciMenuButton {
width: 300px;
Expand Down

0 comments on commit 44c94bc

Please sign in to comment.