cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 05:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bombs, Lasers, and Magnets, Oh my! Update:

Browse Source 
- Destructive Analyzer now only sends HALF of the material it salvages to a linked protolathe rather then all of it (some gets lost in the process).
- Lowered tech requirements of basic parts.
- Circuit Imprinter and Destructive Analyzer now properly use power.
- Added rating 2 versions of the basic stock parts (and the designs so you can make them). Note: Stock parts all have a rating that can affect the end result if you want them to (example: A lathe made with a rating 2 matter bin can hold more material then a rating 1 bin). Granted, I haven't added any handling for this yet, but it's there if needed :3
- Add some lights to various areas and redid break area some more. Add some tables to the science area.
- The freezer for the server room has been hooked up.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@985 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
morikou@gmail.com
2011-02-07 18:45:18 +00:00
parent dd43c01076
commit 9d451ba2ad
4 changed files with 6578 additions and 6466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
code/defines/obj/weapon.dm
View File

@@ -1636,6 +1636,8 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
var/timer = 10
var/atom/target = null
///////////////////////////////////////Stock Parts /////////////////////////////////
/obj/item/weapon/stock_parts
name = "stock part"
desc = "What?"
@@ -1649,14 +1651,14 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
name = "Console Screen"
desc = "Used in the construction of computers and other devices with a interactive console."
icon_state = "screen"
origin_tech = list("materials" = 2)
origin_tech = list("materials" = 1)
g_amt = 200
/obj/item/weapon/stock_parts/capacitor
name = "Capacitor"
desc = "A basic capacitor used in the construction of a variety of devices."
icon_state = "capacitor"
origin_tech = list("energystorage" = 2)
origin_tech = list("energystorage" = 1)
m_amt = 50
g_amt = 50
@@ -1664,7 +1666,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
name = "Scanning Module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module"
origin_tech = list("magnets" = 2)
origin_tech = list("magnets" = 1)
m_amt = 50
g_amt = 20
@@ -1679,7 +1681,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
name = "Micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "micro_laser"
origin_tech = list("magnets" = 2)
origin_tech = list("magnets" = 1)
m_amt = 10
g_amt = 20
@@ -1687,5 +1689,48 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
name = "Matter Bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "matter_bin"
origin_tech = list("materials" = 2)
origin_tech = list("materials" = 1)
m_amt = 80
/obj/item/weapon/stock_parts/adv_capacitor
name = "Advanced Capacitor"
desc = "An advanced capacitor used in the construction of a variety of devices."
icon_state = "capacitor"
origin_tech = list("energystorage" = 3)
rating = 2
m_amt = 50
g_amt = 50
/obj/item/weapon/stock_parts/adv_scanning_module
name = "Advanced Scanning Module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module"
origin_tech = list("magnets" = 3)
rating = 2
m_amt = 50
g_amt = 20
/obj/item/weapon/stock_parts/nano_manipulator
name = "Nano-Manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "micro_mani"
origin_tech = list("robotics" = 3)
rating = 2
m_amt = 30
/obj/item/weapon/stock_parts/high_micro_laser
name = "High-Power Micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "micro_laser"
origin_tech = list("magnets" = 3)
rating = 2
m_amt = 10
g_amt = 20
/obj/item/weapon/stock_parts/adv_matter_bin
name = "Advanced Matter Bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "matter_bin"
origin_tech = list("materials" = 3)
rating = 2
m_amt = 80

97
code/game/research/designs.dm
View File

@@ -217,7 +217,6 @@ datum
desc = "Allows for the construction of a Safeguard AI Module."
id = "safeguard_module"
req_tech = list("programming" = 5)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/safeguard"
@@ -227,7 +226,6 @@ datum
desc = "Allows for the construction of a OneHuman AI Module."
id = "onehuman_module"
req_tech = list("programming" = 5, "syndicate" = 2)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/oneHuman"
@@ -237,7 +235,6 @@ datum
desc = "Allows for the construction of a ProtectStation AI Module."
id = "protectstation_module"
req_tech = list("programming" = 5)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/protectStation"
@@ -247,7 +244,6 @@ datum
desc = "Allows for the construction of a TeleporterOffline AI Module."
id = "notele_module"
req_tech = list("programming" = 5)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/teleporterOffline"
@@ -257,7 +253,6 @@ datum
desc = "Allows for the construction of a Quarantine AI Module."
id = "quarantine_module"
req_tech = list("programming" = 5, "biotech" = 2)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/quarantine"
@@ -267,7 +262,6 @@ datum
desc = "Allows for the construction of a Safeguard AI Module."
id = "oxygen_module"
req_tech = list("programming" = 5, "biotech" = 2)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/oxygen"
@@ -277,7 +271,6 @@ datum
desc = "Allows for the construction of a Freeform AI Module."
id = "freeform_module"
req_tech = list("programming" = 6)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/freeform"
@@ -287,7 +280,6 @@ datum
desc = "Allows for the construction of a Reset AI Module."
id = "reset_module"
req_tech = list("programming" = 5)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/reset"
@@ -297,7 +289,6 @@ datum
desc = "Allows for the construction of a Purge AI Module."
id = "purge_module"
req_tech = list("programming" = 5)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/purge"
@@ -307,7 +298,6 @@ datum
desc = "Allows for the construction of a Freeform AI Core Module."
id = "freeformcore_module"
req_tech = list("programming" = 6)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/freeformcore"
@@ -317,7 +307,6 @@ datum
desc = "Allows for the construction of a Asimov AI Core Module."
id = "asimov_module"
req_tech = list("programming" = 5)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/asimov"
@@ -327,7 +316,6 @@ datum
desc = "Allows for the construction of a P.A.L.A.D.I.N. AI Core Module."
id = "paladin_module"
req_tech = list("programming" = 5)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/paladin"
@@ -337,7 +325,6 @@ datum
desc = "Allows for the construction of a T.Y.R.A.N.T. AI Module."
id = "tyrant_module"
req_tech = list("programming" = 5, "syndicate" = 2)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/weapon/aiModule/tyrant"
@@ -351,7 +338,6 @@ datum
desc = "Allows for the construction of a Safeguard AI Module."
id = "ripley_main"
req_tech = list("programming" = 3, "robotics" = 5)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/mecha_parts/circuitboard/ripley/main"
@@ -361,7 +347,6 @@ datum
desc = "Allows for the construction of a Safeguard AI Module."
id = "ripley_peri"
req_tech = list("programming" = 3, "robotics" = 5)
reliability = 100
build_type = IMPRINTER
materials = list("$glass" = 2000, "acid" = 20)
build_path = "/obj/item/mecha_parts/circuitboard/ripley/peripherals"
@@ -374,7 +359,6 @@ datum
desc = "Produce additional disks for storing device designs."
id = "design_disk"
req_tech = list("programming" = 1)
reliability = 100
build_type = PROTOLATHE | AUTOLATHE
materials = list("$metal" = 30, "$glass" = 10)
build_path = "/obj/item/weapon/disk/design_disk"
@@ -384,7 +368,6 @@ datum
desc = "Produce additional disks for storing technology data."
id = "tech_disk"
req_tech = list("programming" = 1)
reliability = 100
build_type = PROTOLATHE | AUTOLATHE
materials = list("$metal" = 30, "$glass" = 10)
build_path = "/obj/item/weapon/disk/tech_disk"
@@ -397,29 +380,91 @@ datum
name = "Basic Capacitor"
desc = "A stock part used in the construction of various devices."
id = "basic_capacitor"
req_tech = list("powerstorage" = 2)
reliability = 100
req_tech = list("powerstorage" = 1)
build_type = PROTOLATHE | AUTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
build_path = "/obj/item/weapon/stock_parts/capacitor"
basic_sensor
name = "Basic Sensor Module"
desc = "A stock part used in the construction of various devices."
id = "basic_senosr"
req_tech = list("magnets" = 2)
reliability = 100
id = "basic_sensor"
req_tech = list("magnets" = 1)
build_type = PROTOLATHE | AUTOLATHE
materials = list("$metal" = 50, "$glass" = 20)
build_path = "/obj/item/weapon/stock_parts/scanning_module"
basic_micro_mani
name = "Basic Micro Manipulator"
micro_mani
name = "Micro Manipulator"
desc = "A stock part used in the construction of various devices."
id = "basic_micro_mani"
id = "micro_mani"
req_tech = list("robotics" = 1)
reliability = 100
build_type = PROTOLATHE | AUTOLATHE
materials = list("$metal" = 30)
build_path = "/obj/item/weapon/stock_parts/micro_manipulator"
basic_micro_laser
name = "Basic Micro-Laser"
desc = "A stock part used in the construction of various devices."
id = "basic_micro_laser"
req_tech = list("magnets" = 1)
build_type = PROTOLATHE | AUTOLATHE
materials = list("$metal" = 10, "$glass" = 20)
build_path = "/obj/item/weapon/stock_parts/micro_laser"
basic_matter_bin
name = "Basic Matter Bin"
desc = "A stock part used in the construction of various devices."
id = "basic_matter_bin"
req_tech = list("materials" = 1)
build_type = PROTOLATHE | AUTOLATHE
materials = list("$metal" = 80)
build_path = "/obj/item/weapon/stock_parts/matter_bin"
adv_capacitor
name = "Advanced Capacitor"
desc = "A stock part used in the construction of various devices."
id = "adv_capacitor"
req_tech = list("powerstorage" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
build_path = "/obj/item/weapon/stock_parts/adv_capacitor"
adv_sensor
name = "Advanced Sensor Module"
desc = "A stock part used in the construction of various devices."
id = "adv_sensor"
req_tech = list("magnets" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 50, "$glass" = 20)
build_path = "/obj/item/weapon/stock_parts/adv_scanning_module"
nano_mani
name = "Nano Manipulator"
desc = "A stock part used in the construction of various devices."
id = "nano_mani"
req_tech = list("robotics" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 30)
build_path = "/obj/item/weapon/stock_parts/nano_manipulator"
high_micro_laser
name = "High-Power Micro-Laser"
desc = "A stock part used in the construction of various devices."
id = "high_micro_laser"
req_tech = list("magnets" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 10, "$glass" = 20)
build_path = "/obj/item/weapon/stock_parts/high_micro_laser"
adv_matter_bin
name = "Advanced Matter Bin"
desc = "A stock part used in the construction of various devices."
id = "basic_matter_bin"
req_tech = list("materials" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 80)
build_path = "/obj/item/weapon/stock_parts/adv_matter_bin"
////////////////////////////////////////
//Disks for transporting design datums//

6
code/game/research/rdconsole.dm
View File

@@ -241,11 +241,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
for(var/T in linked_destroy.loaded_item.origin_tech)
files.UpdateTech(T, linked_destroy.loaded_item.origin_tech[T])
if(linked_lathe) //Also sends salvaged materials to a linked autolateh, if any.
linked_lathe.m_amount = min(linked_lathe.max_m_amount, (linked_lathe.m_amount + linked_destroy.loaded_item.m_amt))
linked_lathe.g_amount = min(linked_lathe.max_g_amount, (linked_lathe.g_amount + linked_destroy.loaded_item.g_amt))
linked_lathe.m_amount = min(linked_lathe.max_m_amount, ((linked_lathe.m_amount + linked_destroy.loaded_item.m_amt)/2))
linked_lathe.g_amount = min(linked_lathe.max_g_amount, ((linked_lathe.g_amount + linked_destroy.loaded_item.g_amt)/2))
linked_destroy.loaded_item = null
for(var/I in contents)
del(I)
use_power(250)
linked_destroy.icon_state = "d_analyzer"
screen = 1.0
updateUsrDialog()
@@ -322,6 +323,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
linked_imprinter.reagents.remove_reagent(I, being_built.materials[I])
power += being_built.materials[I]
var/obj/new_item = new being_built.build_path(src)
use_power(power)
new_item.loc = linked_destroy.loc
linked_imprinter.busy = 0
screen = 4.1