cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 09:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into Health-Analyzer

Browse Source
This commit is contained in:
Fox-McCloud
2015-03-24 15:53:37 -04:00
parent 1d30096eab 833ead52ef
commit 6b543f37ff
22 changed files with 1213 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
code/modules/research/designs/autolathe_designs.dm
View File

@@ -9,7 +9,7 @@
materials = list("$metal" = 30, "$glass" = 20)
build_path = /obj/item/device/analyzer
category = list("initial","Tools")
/datum/design/bucket
name = "Bucket"
id = "bucket"
@@ -25,7 +25,7 @@
materials = list("$metal" = 50)
build_path = /obj/item/weapon/crowbar
category = list("initial","Tools")
/datum/design/extinguisher
name = "Fire Extinguisher"
id = "extinguisher"
@@ -49,7 +49,7 @@
materials = list("$metal" = 50, "$glass" = 20)
build_path = /obj/item/device/multitool
category = list("initial","Tools")
/datum/design/screwdriver
name = "Screwdriver"
id = "screwdriver"
@@ -72,8 +72,8 @@
build_type = AUTOLATHE
materials = list("$metal" = 1750, "$glass" = 400)
build_path = /obj/item/clothing/head/welding
category = list("initial","Tools")
category = list("initial","Tools")
/datum/design/weldingtool
name = "Welding Tool"
id = "welding_tool"
@@ -104,16 +104,16 @@
build_type = AUTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
build_path = /obj/item/weapon/airalarm_electronics
category = list("initial", "Electronics")
category = list("initial", "Electronics")
/datum/design/airlock_board
name = "Airlock Electronics"
id = "airlock_board"
build_type = AUTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
build_path = /obj/item/weapon/airlock_electronics
category = list("initial", "Electronics")
category = list("initial", "Electronics")
/datum/design/console_screen
name = "Console Screen"
id = "console_screen"
@@ -128,7 +128,7 @@
build_type = AUTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
build_path = /obj/item/weapon/firealarm_electronics
category = list("initial", "Electronics")
category = list("initial", "Electronics")
/datum/design/igniter
name = "Igniter"
@@ -137,7 +137,7 @@
materials = list("$metal" = 500, "$glass" = 50)
build_path = /obj/item/device/assembly/igniter
category = list("initial", "Miscellaneous")
/datum/design/infrared_emitter
name = "Infrared Emitter"
id = "infrared_emitter"
@@ -145,15 +145,15 @@
materials = list("$metal" = 1000, "$glass" = 500)
build_path = /obj/item/device/assembly/infra
category = list("initial", "Miscellaneous")
/datum/design/kitchen_knife
name = "Kitchen knife"
id = "kitchen_knife"
build_type = AUTOLATHE
materials = list("$metal" = 12000)
build_path = /obj/item/weapon/kitchenknife
category = list("initial","Miscellaneous")
category = list("initial","Miscellaneous")
/datum/design/pipe_painter
name = "Pipe Painter"
id = "pipe_painter"
@@ -161,15 +161,15 @@
materials = list("$metal" = 5000, "$glass" = 2000)
build_path = /obj/item/device/pipe_painter
category = list("initial", "Miscellaneous")
/datum/design/prox_sensor
name = "Proximity Sensor"
id = "prox_sensor"
build_type = AUTOLATHE
materials = list("$metal" = 800, "$glass" = 200)
build_path = /obj/item/device/assembly/prox_sensor
category = list("initial", "Miscellaneous")
category = list("initial", "Miscellaneous")
/datum/design/timer
name = "Timer"
id = "timer"
@@ -183,9 +183,17 @@
id = "recorder"
build_type = AUTOLATHE
materials = list("$metal" = 60, "$glass" = 30)
build_path = /obj/item/device/taperecorder
category = list("initial", "Miscellaneous")
build_path = /obj/item/device/taperecorder/empty
category = list("initial", "Miscellaneous")
/datum/design/tape
name = "Tape"
id = "tape"
build_type = AUTOLATHE
materials = list("$metal" = 20, "$glass" = 5)
build_path = /obj/item/device/tape/random
category = list("initial", "Miscellaneous")
/datum/design/voice_analyser
name = "Voice Analyser"
id = "voice_analyser"
@@ -200,8 +208,8 @@
build_type = AUTOLATHE
materials = list("$metal" = 400, "$glass" = 250)
build_path = /obj/item/weapon/camera_assembly
category = list("initial", "Construction")
category = list("initial", "Construction")
/datum/design/glass
name = "Glass"
id = "glass"
@@ -216,16 +224,16 @@
build_type = AUTOLATHE
materials = list("$metal" = 60, "$glass" = 100)
build_path = /obj/item/weapon/light/bulb
category = list("initial", "Construction")
category = list("initial", "Construction")
/datum/design/light_tube
name = "Light Tube"
id = "light_tube"
build_type = AUTOLATHE
materials = list("$metal" = 60, "$glass" = 100)
build_path = /obj/item/weapon/light/tube
category = list("initial", "Construction")
category = list("initial", "Construction")
/datum/design/metal
name = "Metal"
id = "metal"
@@ -233,7 +241,7 @@
materials = list("$metal" = 3750)
build_path = /obj/item/stack/sheet/metal
category = list("initial","Construction")
/datum/design/newscaster_frame
name = "Newscaster Frame"
id = "newscaster_frame"
@@ -248,8 +256,8 @@
build_type = AUTOLATHE
materials = list("$metal" = 16000, "$glass"=8000)
build_path = /obj/item/weapon/rcd_ammo
category = list("initial","Construction")
category = list("initial","Construction")
/datum/design/rglass
name = "Reinforced Glass"
id = "rglass"
@@ -265,7 +273,7 @@
materials = list("$metal" = 1875)
build_path = /obj/item/stack/rods
category = list("initial","Construction")
/datum/design/beaker
name = "Beaker"
id = "beaker"
@@ -280,16 +288,16 @@
build_type = AUTOLATHE
materials = list("$metal" = 2500, "$glass" = 750)
build_path = /obj/item/weapon/cautery
category = list("initial", "Medical")
category = list("initial", "Medical")
/datum/design/circular_saw
name = "Circular Saw"
id = "circular_saw"
build_type = AUTOLATHE
materials = list("$metal" = 10000, "$glass" = 6000)
build_path = /obj/item/weapon/circular_saw
category = list("initial", "Medical")
category = list("initial", "Medical")
/datum/design/hemostat
name = "Hemostat"
id = "hemostat"
@@ -297,7 +305,7 @@
materials = list("$metal" = 5000, "$glass" = 2500)
build_path = /obj/item/weapon/hemostat
category = list("initial", "Medical")
/datum/design/large_beaker
name = "Large Beaker"
id = "large_beaker"
@@ -313,7 +321,7 @@
materials = list("$metal" = 6000, "$glass" = 3000)
build_path = /obj/item/weapon/retractor
category = list("initial", "Medical")
/datum/design/scalpel
name = "Scalpel"
id = "scalpel"
@@ -329,7 +337,7 @@
materials = list("$metal" = 10000, "$glass" = 6000)
build_path = /obj/item/weapon/surgicaldrill
category = list("initial", "Medical")
/datum/design/syringe
name = "Syringe"
id = "syringe"
@@ -360,8 +368,8 @@
build_type = AUTOLATHE
materials = list("$metal" = 75)
build_path = /obj/item/device/radio/headset
category = list("initial", "Communication")
category = list("initial", "Communication")
/datum/design/signaler
name = "Remote Signaling Device"
id = "signaler"
@@ -401,8 +409,8 @@
build_type = AUTOLATHE
materials = list("$metal" = 30000)
build_path = /obj/item/ammo_box/c9mm
category = list("hacked", "Security")
category = list("hacked", "Security")
/datum/design/c10mm
name = "Ammo Box (10mm)"
id = "c10mm"
@@ -410,7 +418,7 @@
materials = list("$metal" = 30000)
build_path = /obj/item/ammo_box/c10mm
category = list("hacked", "Security")
/datum/design/buckshot_shell
name = "Buckshot Shell"
id = "buckshot_shell"
@@ -418,7 +426,7 @@
materials = list("$metal" = 4000)
build_path = /obj/item/ammo_casing/shotgun/buckshot
category = list("hacked", "Security")
/datum/design/electropack
name = "Electropack"
id = "electropack"
@@ -426,7 +434,7 @@
materials = list("$metal" = 10000, "$glass" = 2500)
build_path = /obj/item/device/radio/electropack
category = list("hacked", "Tools")
/datum/design/flamethrower
name = "Flamethrower"
id = "flamethrower"
@@ -434,7 +442,7 @@
materials = list("$metal" = 500)
build_path = /obj/item/weapon/flamethrower/full
category = list("hacked", "Security")
/datum/design/handcuffs
name = "Handcuffs"
id = "handcuffs"
@@ -442,7 +450,7 @@
materials = list("$metal" = 500)
build_path = /obj/item/weapon/restraints/handcuffs
category = list("hacked", "Security")
/datum/design/incendiary_slug
name = "Incendiary Slug"
id = "incendiary_slug"
@@ -457,8 +465,8 @@
build_type = AUTOLATHE
materials = list("$metal" = 70, "$glass" = 60)
build_path = /obj/item/weapon/weldingtool/largetank
category = list("hacked", "Tools")
category = list("hacked", "Tools")
/datum/design/rcd
name = "Rapid Construction Device (RCD)"
id = "rcd"
@@ -473,8 +481,8 @@
build_type = AUTOLATHE
materials = list("$metal" = 4000)
build_path = /obj/item/ammo_casing/shotgun/dart
category = list("hacked", "Security")
category = list("hacked", "Security")
/datum/design/shotgun_slug
name = "Shotgun Slug"
id = "shotgun_slug"
@@ -482,4 +490,3 @@
materials = list("$metal" = 4000)
build_path = /obj/item/ammo_casing/shotgun
category = list("hacked", "Security")

11
code/modules/research/designs/mecha_designs.dm
View File

@@ -166,14 +166,3 @@
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting
category = list("Exosuit Modules")
// Space pod
/datum/design/spacepod_main
name = "Exosuit Board (Space Pod Mainboard)"
desc = "Allows for the construction of a Space Pod mainboard."
id = "spacepod_main"
req_tech = list("programming" = 4)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/pod
category = list("Exosuit Modules")

8
code/modules/research/designs/power_designs.dm
View File

@@ -7,7 +7,7 @@
desc = "A basic power cell that holds 1000 units of energy"
id = "basic_cell"
req_tech = list("powerstorage" = 1)
build_type = PROTOLATHE | AUTOLATHE | MECHFAB
build_type = PROTOLATHE | AUTOLATHE | MECHFAB | PODFAB
materials = list("$metal" = 700, "$glass" = 50)
construction_time=100
build_path = /obj/item/weapon/stock_parts/cell
@@ -18,7 +18,7 @@
desc = "A power cell that holds 10000 units of energy"
id = "high_cell"
req_tech = list("powerstorage" = 2)
build_type = PROTOLATHE | AUTOLATHE | MECHFAB
build_type = PROTOLATHE | AUTOLATHE | MECHFAB | PODFAB
materials = list("$metal" = 700, "$glass" = 60)
construction_time=100
build_path = /obj/item/weapon/stock_parts/cell/high
@@ -30,7 +30,7 @@
id = "hyper_cell"
req_tech = list("powerstorage" = 5, "materials" = 4)
reliability_base = 70
build_type = PROTOLATHE | MECHFAB
build_type = PROTOLATHE | MECHFAB | PODFAB
materials = list("$metal" = 400, "$gold" = 150, "$silver" = 150, "$glass" = 70)
construction_time=100
build_path = /obj/item/weapon/stock_parts/cell/hyper
@@ -42,7 +42,7 @@
id = "super_cell"
req_tech = list("powerstorage" = 3, "materials" = 2)
reliability_base = 75
build_type = PROTOLATHE | MECHFAB
build_type = PROTOLATHE | MECHFAB | PODFAB
materials = list("$metal" = 700, "$glass" = 70)
construction_time=100
build_path = /obj/item/weapon/stock_parts/cell/super

126
code/modules/research/designs/spacepod_designs.dm Normal file
View File

@@ -0,0 +1,126 @@
/datum/design/spacepod_main
construction_time = 100
name = "Circuit Design (Space Pod Mainboard)"
desc = "Allows for the construction of a Space Pod mainboard."
id = "spacepod_main"
req_tech = list("materials" = 1) //All parts required to build a basic pod have materials 1, so the mechanic can do his damn job.
build_type = PODFAB
materials = list("$metal"=5000)
build_path = /obj/item/weapon/circuitboard/mecha/pod
category = list("Pod_Parts")
//////////////////////////////////////////////////
/////////SPACEPOD PARTS///////////////////////////
//////////////////////////////////////////////////
/datum/design/podframe_fp
construction_time = 200
name = "Fore port pod frame"
desc = "Allows for the construction of spacepod frames. This is the fore port component."
id = "podframefp"
build_type = PODFAB
req_tech = list("materials" = 1)
build_path = /obj/item/pod_parts/pod_frame/fore_port
category = list("Pod_Frame")
materials = list("$metal"=15000,"$glass"=5000)
/datum/design/podframe_ap
construction_time = 200
name = "Aft port pod frame"
desc = "Allows for the construction of spacepod frames. This is the aft port component."
id = "podframeap"
build_type = PODFAB
req_tech = list("materials" = 1)
build_path = /obj/item/pod_parts/pod_frame/aft_port
category = list("Pod_Frame")
materials = list("$metal"=15000,"$glass"=5000)
/datum/design/podframe_fs
construction_time = 200
name = "Fore starboard pod frame"
desc = "Allows for the construction of spacepod frames. This is the fore starboard component."
id = "podframefs"
build_type = PODFAB
req_tech = list("materials" = 1)
build_path = /obj/item/pod_parts/pod_frame/fore_starboard
category = list("Pod_Frame")
materials = list("$metal"=15000,"$glass"=5000)
/datum/design/podframe_as
construction_time = 200
name = "Aft starboard pod frame"
desc = "Allows for the construction of spacepod frames. This is the aft starboard component."
id = "podframeas"
build_type = PODFAB
req_tech = list("materials" = 1)
build_path = /obj/item/pod_parts/pod_frame/aft_starboard
category = list("Pod_Frame")
materials = list("$metal"=15000,"$glass"=5000)
//////////////////////////
////////POD CORE////////
//////////////////////////
/datum/design/pod_core
construction_time = 700 //Pod core should take a bit to process, after all, it's a big complicated engine and stuff.
name = "Spacepod Core"
desc = "Allows for the construction of a spacepod core system, made up of the engine and life support systems."
id = "podcore"
build_type = MECHFAB | PODFAB
req_tech = list("materials" = 1)
build_path = /obj/item/pod_parts/core
category = list("Pod_Parts")
materials = list("$metal"=5000,"$uranium"=1000,"$plasma"=5000)
//////////////////////////////////////////
////////SPACEPOD ARMOR////////////////////
//////////////////////////////////////////
/datum/design/pod_armor_civ
construction_time = 400 //more time than frames, less than pod core
name = "Pod Armor (civilian)"
desc = "Allows for the construction of spacepod armor. This is the civilian version."
id = "podarmor_civ"
build_type = PODFAB
req_tech = list("materials" = 1)
build_path = /obj/item/pod_parts/armor
category = list("Pod_Armor")
materials = list("$metal"=15000,"$glass"=5000,"$plasma"=10000)
//////////////////////////////////////////
//////SPACEPOD GUNS///////////////////////
//////////////////////////////////////////
/datum/design/pod_gun_taser
construction_time = 200
name = "Spacepod Equipment (Taser)"
desc = "Allows for the construction of a spacepod mounted taser."
id = "podgun_taser"
build_type = PODFAB
req_tech = list("materials" = 2, "combat" = 2)
build_path = /obj/item/device/spacepod_equipment/weaponry/taser
category = list("Pod_Weaponry")
materials = list("$metal" = 15000)
locked = 1
/datum/design/pod_gun_btaser
construction_time = 200
name = "Spacepod Equipment (Burst Taser)"
desc = "Allows for the construction of a spacepod mounted taser. This is the burst-fire model."
id = "podgun_btaser"
build_type = PODFAB
req_tech = list("materials" = 3, "combat" = 3)
build_path = /obj/item/device/spacepod_equipment/weaponry/burst_taser
category = list("Pod_Weaponry")
materials = list("$metal" = 15000,"$plasma"=2000)
locked = 1
/datum/design/pod_gun_laser
construction_time = 200
name = "Spacepod Equipment (Laser)"
desc = "Allows for the construction of a spacepod mounted laser."
id = "podgun_laser"
build_type = PODFAB
req_tech = list("materials" = 3, "combat" = 3, "plasma" = 2)
build_path = /obj/item/device/spacepod_equipment/weaponry/laser
category = list("Pod_Weaponry")
materials = list("$metal"=10000,"$glass"=5000,"$gold"=1000,"$silver"=2000)
locked = 1

9
code/modules/research/rdconsole.dm
View File

@@ -252,7 +252,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
screen = 2.1
else if(href_list["maxresearch"]) //Eject the item inside the destructive analyzer.
if(!check_rights(R_ADMIN))
if(!check_rights(R_ADMIN))
return
screen = 0.0
if(alert("Are you sure you want to maximize research levels?","Confirmation","Yes","No")=="No")
@@ -1112,6 +1112,13 @@ won't update every console in existence) but it's more of a hassle to do. Also,
req_access = null
req_access_txt = "29"
/obj/machinery/computer/rdconsole/mechanics
name = "Mechanics R&D Console"
desc = "A console used to interface with R&D tools."
id = 2
req_access = null
req_access_txt = "70"
/obj/machinery/computer/rdconsole/core
name = "Core R&D Console"
desc = "A console used to interface with R&D tools."