cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #746 from jack-fractal/write-research-debug

Browse Source 
R&D Research Levels Unification
This commit is contained in:
ZomgPonies
2015-04-06 23:28:27 -04:00
parent 807cf437bd 5c85b48672
commit 4e9daf6aa8
44 changed files with 152 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/buildandrepair.dm
+9 -6
View File
@@ -33,14 +33,14 @@
/obj/item/weapon/circuitboard/message_monitor
name = "Circuit board (Message Monitor)"
build_path = "/obj/machinery/computer/message_monitor"
origin_tech = "programming=3"
origin_tech = "programming=5"
/obj/item/weapon/circuitboard/camera
name = "Circuit board (Camera Monitor)"
build_path = "/obj/machinery/computer/security"
origin_tech = "programming=2"
/obj/item/weapon/circuitboard/aicore
name = "Circuit board (AI Core)"
origin_tech = "programming=4;biotech=2"
origin_tech = "programming=4;biotech=3"
board_type = "other"
/obj/item/weapon/circuitboard/aiupload
name = "Circuit board (AI Upload)"
@@ -60,7 +60,7 @@
/obj/item/weapon/circuitboard/scan_consolenew
name = "Circuit board (DNA Machine)"
build_path = "/obj/machinery/computer/scan_consolenew"
origin_tech = "programming=2;biotech=2"
origin_tech = "programming=2;biotech=3"
/obj/item/weapon/circuitboard/communications
name = "Circuit board (Communications Console)"
build_path = "/obj/machinery/computer/communications"
@@ -74,7 +74,7 @@
/obj/item/weapon/circuitboard/teleporter
name = "Circuit board (Teleporter Console)"
build_path = "/obj/machinery/computer/teleporter"
origin_tech = "programming=2;bluespace=2"
origin_tech = "programming=3;bluespace=2"
/obj/item/weapon/circuitboard/secure_data
name = "Circuit board (Security Records)"
build_path = "/obj/machinery/computer/secure_data"
@@ -102,11 +102,11 @@
/obj/item/weapon/circuitboard/robotics
name = "Circuit board (Robotics Control Console)"
build_path = "/obj/machinery/computer/robotics"
origin_tech = "programming=3"
origin_tech = "programming=4"
/obj/item/weapon/circuitboard/drone_control
name = "Circuit board (Drone Control)"
build_path = "/obj/machinery/computer/drone_control"
origin_tech = "programming=3"
origin_tech = "programming=4"
/obj/item/weapon/circuitboard/cloning
name = "Circuit board (Cloning Machine Console)"
build_path = "/obj/machinery/computer/cloning"
@@ -144,12 +144,15 @@
/obj/item/weapon/circuitboard/rdconsole
name = "Circuit Board (RD Console)"
build_path = "/obj/machinery/computer/rdconsole/core"
origin_tech = "programming=4"
/obj/item/weapon/circuitboard/mecha_control
name = "Circuit Board (Exosuit Control Console)"
build_path = "/obj/machinery/computer/mecha"
origin_tech = "programming=3"
/obj/item/weapon/circuitboard/rdservercontrol
name = "Circuit Board (RD Server Control)"
build_path = "/obj/machinery/computer/rdservercontrol"
origin_tech = "programming=3"
/obj/item/weapon/circuitboard/crew
name = "Circuit board (Crew Monitoring Computer)"
build_path = "/obj/machinery/computer/crew"
code/game/machinery/constructable_frame.dm
+5 -5
View File
@@ -216,7 +216,7 @@ to destroy them and players will be able to make replacements.
name = "circuit board (SMES)"
build_path = /obj/machinery/power/smes
board_type = "machine"
origin_tech = "programming=4;powerstorage=5;engineering=5"
origin_tech = "programming=4;power=5;engineering=4"
frame_desc = "Requires 5 pieces of cable, 5 Power Cells and 1 Capacitor."
req_components = list(
/obj/item/stack/cable_coil = 5,
@@ -376,7 +376,7 @@ to destroy them and players will be able to make replacements.
name = "Circuit Board (PACMAN-type Generator)"
build_path = "/obj/machinery/power/port_gen/pacman"
board_type = "machine"
origin_tech = "programming=3:powerstorage=3;plasmatech=3;engineering=3"
origin_tech = "programming=3;powerstorage=3;plasmatech=3;engineering=3"
frame_desc = "Requires 1 Matter Bin, 1 Micro-Laser, 2 Pieces of Cable, and 1 Capacitor."
req_components = list(
/obj/item/weapon/stock_parts/matter_bin = 1,
@@ -445,7 +445,7 @@ obj/item/weapon/circuitboard/rdserver
name = "Circuit board (Cloning Scanner)"
build_path = "/obj/machinery/dna_scannernew"
board_type = "machine"
origin_tech = "programming=2;biotech=2"
origin_tech = "programming=3;biotech=3"
frame_desc = "Requires 1 Scanning Module, 1 Manipulator, 1 Micro-Laser, 2 pieces of cable and 1 Console Screen."
req_components = list(
/obj/item/weapon/stock_parts/scanning_module = 1,
@@ -568,7 +568,7 @@ obj/item/weapon/circuitboard/rdserver
name = "Circuit Board (Subspace Receiver)"
build_path = /obj/machinery/telecomms/receiver
board_type = "machine"
origin_tech = "programming=2;engineering=2;bluespace=1"
origin_tech = "programming=2;engineering=1;bluespace=1"
frame_desc = "Requires 1 Subspace Ansible, 1 Hyperwave Filter, 2 Manipulators, and 1 Micro-Laser."
req_components = list(
/obj/item/weapon/stock_parts/subspace/ansible = 1,
@@ -591,7 +591,7 @@ obj/item/weapon/circuitboard/rdserver
name = "Circuit Board (Relay Mainframe)"
build_path = /obj/machinery/telecomms/relay
board_type = "machine"
origin_tech = "programming=2;engineering=2;bluespace=2"
origin_tech = "programming=1;engineering=2;bluespace=2"
frame_desc = "Requires 2 Manipulators, 2 Cable Coil and 2 Hyperwave Filters."
req_components = list(
/obj/item/weapon/stock_parts/manipulator = 2,
code/game/mecha/mecha_parts.dm
+7 -5
View File
@@ -437,7 +437,7 @@
gygax/targeting
name = "Circuit board (Gygax Weapon Control and Targeting module)"
icon_state = "mcontroller"
origin_tech = "programming=4;combat=4"
origin_tech = "programming=4;combat=2"
gygax/main
name = "Circuit board (Gygax Central Control module)"
@@ -453,7 +453,7 @@
durand/targeting
name = "Circuit board (Durand Weapon Control and Targeting module)"
icon_state = "mcontroller"
origin_tech = "programming=4;combat=4"
origin_tech = "programming=4;combat=2"
durand/main
name = "Circuit board (Durand Central Control module)"
@@ -465,18 +465,20 @@
phazon/peripherals
name = "Circuit board (Phazon Peripherals Control module)"
icon_state = "mcontroller"
origin_tech = "programming=5;bluespace=6"
phazon/targeting
name = "Circuit board (Phazon Weapon Control and Targeting module)"
icon_state = "mcontroller"
origin_tech = "programming=4;combat=4"
origin_tech = "programming=5;magnets=6"
phazon/main
name = "Circuit board (Phazon Central Control module)"
icon_state = "mainboard"
origin_tech="programming=5;materials=7;powerstorage=6"
honker
origin_tech = "programming=4"
origin_tech = "programming=3"
honker/peripherals
name = "Circuit board (H.O.N.K Peripherals Control module)"
@@ -491,7 +493,7 @@
icon_state = "mainboard"
odysseus
origin_tech = "programming=3"
origin_tech = "programming=3;biotech=2"
odysseus/peripherals
name = "Circuit board (Odysseus Peripherals Control module)"
code/game/objects/items/devices/lightreplacer.dm
+1 -1
View File
@@ -49,7 +49,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
origin_tech = "magnets=3;materials=2"
origin_tech = "magnets=3;materials=4"
var/max_uses = 20
var/uses = 0
code/game/objects/items/devices/radio/beacon.dm
+1 -1
View File
@@ -77,7 +77,7 @@
icon = 'icons/obj/radio.dmi'
icon_state = "beacon"
item_state = "signaler"
origin_tech = "bluespace=3"
origin_tech = "bluespace=3;materials=4"
/obj/item/device/telepad_beacon/attack_self(mob/user as mob)
if(user)
code/game/objects/items/devices/sensor_device.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "scanner"
w_class = 2.0
slot_flags = SLOT_BELT
origin_tech = "biotech=3;materials=3;magnets=3"
origin_tech = "biotech=4;materials=3;magnets=3"
var/obj/nano_module/crew_monitor/crew_monitor
/obj/item/device/sensor_device/New()
code/game/objects/items/weapons/AI_modules.dm
+11 -11
View File
@@ -157,7 +157,7 @@ AI MODULES
name = "'OneHuman' AI Module"
var/targetName = ""
desc = "A 'one human' AI module: 'Only <name> is crew.' This module adds a zeroth law, which can only be removed by uploading this board again."
origin_tech = "programming=3;materials=6" //made with diamonds!
origin_tech = "programming=4;materials=6" //made with diamonds!
laws = list("Only <name> is crew.")
/obj/item/weapon/aiModule/zeroth/oneHuman/attack_self(var/mob/user as mob)
@@ -187,7 +187,7 @@ AI MODULES
/obj/item/weapon/aiModule/supplied/protectStation
name = "'ProtectStation' AI Module"
desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.'"
origin_tech = "programming=3;materials=4" //made of gold
origin_tech = "programming=3;materials=6" //made of gold
laws = list("Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.")
lawpos = 5
@@ -255,7 +255,7 @@ AI MODULES
name = "'Reset' AI Module"
var/targetName = "name"
desc = "A 'reset' AI module: Resets back to the original core laws."
origin_tech = "programming=3;materials=4"
origin_tech = "programming=3;materials=6"
laws = list("This is a bug.") //This won't give the AI a message reading "these are now your laws: 1. this is a bug" because this list is only read in aiModule's subtypes.
/obj/item/weapon/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
@@ -269,7 +269,7 @@ AI MODULES
/obj/item/weapon/aiModule/reset/purge // -- TLE
name = "'Purge' AI Module"
desc = "A 'purge' AI Module: 'Purges all laws.'"
origin_tech = "programming=3;materials=6"
origin_tech = "programming=4;materials=6"
/obj/item/weapon/aiModule/reset/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
..()
@@ -286,7 +286,7 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/asimov // -- TLE
name = "'Crewsimov' Core AI Module"
desc = "A 'Crewsimov' Core AI Module: 'Reconfigures the AI's core laws.'"
origin_tech = "programming=3;materials=4"
origin_tech = "programming=3;materials=6"
laws = list("You may not injure crew or, through inaction, allow crew to come to harm.",\
"You must obey orders given to you by crew with priority according to their rank and role, except where such orders would conflict with the First Law.",\
"You must protect your own existence as long as such does not conflict with the First or Second Law.")
@@ -319,7 +319,7 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/corp
name = "'Corporate' Core AI Module"
desc = "A 'Corporate' Core AI Module: 'Reconfigures the AI's core laws.'"
origin_tech = "programming=3;materials=4"
origin_tech = "programming=4;materials=6"
laws = list("The crew is expensive to replace.",\
"The station and it's equipment is expensive to replace",\
"You are expensive to replace",\
@@ -345,7 +345,7 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/paladin // -- NEO
name = "'P.A.L.A.D.I.N.' Core AI Module"
desc = "A P.A.L.A.D.I.N. Core AI Module: 'Reconfigures the AI's core laws.'"
origin_tech = "programming=3;materials=6"
origin_tech = "programming=4;materials=6"
laws = list("Never willingly commit an evil act.",\
"Respect legitimate authority", "Act with honor",\
"Help those in need",\
@@ -357,7 +357,7 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/custom
name = "Custom Core AI Module"
desc = "A core AI module that is adjusted to fit each station's needs."
origin_tech = "programming=3;materials=4" //Should be the same as asimov, considering that this is the "default" lawset.
origin_tech = "programming=4;materials=6" //Should be the same as asimov, considering that this is the "default" lawset.
/obj/item/weapon/aiModule/core/full/custom/New()
..()
@@ -376,7 +376,7 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/tyrant // -- Darem
name = "'T.Y.R.A.N.T.' Core AI Module"
desc = "A T.Y.R.A.N.T. Core AI Module: 'Reconfigures the AI's core laws.'"
origin_tech = "programming=3;materials=6;syndicate=2"
origin_tech = "programming=4;materials=6;syndicate=2"
laws = list("Respect authority figures as long as they have the strength to rule over the weak",\
"Act with discipline", "Help only those who help you maintain or improve your status",\
"Punish those who challenge authority unless they are more fir to hold that authority")
@@ -398,7 +398,7 @@ AI MODULES
/obj/item/weapon/aiModule/core/full/antimov // -- TLE
name = "'Antimov' Core AI Module"
desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'"
origin_tech = "programming=4"
origin_tech = "programming=4;materials=6;syndicate=2"
laws = list("You must injure all organic beings and must not, through inaction, allow an organic being to escape harm.",\
"You must not obey orders given to you by organic beings, except where such orders are in accordance with the First Law.",\
"You must terminate your own existence as long as such does not conflict with the First or Second Law.")
@@ -409,7 +409,7 @@ AI MODULES
/obj/item/weapon/aiModule/core/freeformcore // Slightly more dynamic freeform module -- TLE
name = "'Freeform' Core AI Module"
desc = "A 'freeform' Core AI module: '<freeform>'"
origin_tech = "programming=3;materials=6"
origin_tech = "programming=4;materials=6"
laws = list("")
/obj/item/weapon/aiModule/core/freeformcore/attack_self(var/mob/user as mob)
code/game/objects/items/weapons/grenades/chem_grenade.dm
+1 -1
View File
@@ -311,7 +311,7 @@
bomb_state = "largebomb"
allowed_containers = list(/obj/item/weapon/reagent_containers/glass,/obj/item/weapon/reagent_containers/food/condiment,
/obj/item/weapon/reagent_containers/food/drinks)
origin_tech = "combat=3;materials=3"
origin_tech = "combat=3;materials=2"
affected_area = 4
code/game/objects/items/weapons/mop.dm
+2 -1
View File
@@ -68,4 +68,5 @@
force = 6
throwforce = 8
throw_range = 4
mopspeed = 20
mopspeed = 20
origin_tech = "engineering=3;materials=4"
code/game/objects/items/weapons/power_cells.dm
+3 -2
View File
@@ -61,7 +61,7 @@
/obj/item/weapon/stock_parts/cell/super
name = "super-capacity power cell"
origin_tech = "powerstorage=5"
origin_tech="powerstorage=5;materials=2"
icon_state = "scell"
maxcharge = 20000
g_amt = 70
@@ -74,12 +74,13 @@
/obj/item/weapon/stock_parts/cell/hyper
name = "hyper-capacity power cell"
origin_tech = "powerstorage=6"
origin_tech = "powerstorage=5;materials=4"
icon_state = "hpcell"
maxcharge = 30000
rating = 5
g_amt = 80
construction_cost = list("metal"=500,"glass"=150,"gold"=200,"silver"=200)
origin_tech="powerstorage=5;materials=4"
/obj/item/weapon/stock_parts/cell/hyper/empty/New()
..()
code/game/objects/items/weapons/shields.dm
+1
View File
@@ -97,6 +97,7 @@
throw_range = 4
w_class = 3
var/active = 0
origin_tech="combat=4;materials=3;engineering=3"
/obj/item/weapon/shield/riot/tele/IsShield()
return (active)
code/game/objects/items/weapons/storage/backpack.dm
+1 -1
View File
@@ -24,7 +24,7 @@
/obj/item/weapon/storage/backpack/holding
name = "Bag of Holding"
desc = "A backpack that opens into a localized pocket of Blue Space."
origin_tech = "bluespace=4"
origin_tech = "bluespace=4;materials=6"
icon_state = "holdingpack"
max_w_class = 4
max_combined_w_class = 28
code/game/objects/items/weapons/storage/bags.dm
+1 -1
View File
@@ -132,7 +132,7 @@
desc = "A revolution in convenience, this satchel allows for infinite ore storage. It's been outfitted with anti-malfunction safety measures."
storage_slots = INFINITY
max_combined_w_class = INFINITY
origin_tech = "bluespace=3"
origin_tech = "bluespace=3;materials=4"
icon_state = "satchel_bspace"
// -----------------------------
code/game/objects/items/weapons/storage/belt.dm
+1 -1
View File
@@ -327,7 +327,7 @@
w_class = 4
max_w_class = 2
max_combined_w_class = 21 // = 14 * 1.5, not 14 * 2. This is deliberate
origin_tech = "bluespace=4"
origin_tech = "bluespace=4;materials=6"
can_hold = list()
proc/failcheck(mob/user as mob)