cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polaris sync

Browse Source
This commit is contained in:
killer653
2017-08-06 19:07:17 -04:00
parent 7b850d6c10 923285b2af
commit 468e73c7f3
652 changed files with 44410 additions and 18080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
code/modules/research/designs.dm
View File

@@ -659,9 +659,9 @@ other types of metals and chemistry for reagents).
sort_string = "VABAI"
/datum/design/item/intellicard
name = "'intelliCard', AI preservation and transportation system"
desc = "Allows for the construction of an intelliCard."
id = "intellicard"
name = "'intelliCore', AI preservation and transportation system"
desc = "Allows for the construction of an intelliCore."
id = "intellicore"
req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4)
materials = list("glass" = 1000, "gold" = 200)
build_path = /obj/item/device/aicard
@@ -1543,7 +1543,7 @@ CIRCUITS BELOW
/datum/design/item/custom_circuit_assembly
name = "Small custom assembly"
desc = "An customizable assembly for simple, small devices."
desc = "A customizable assembly for simple, small devices."
id = "assembly-small"
req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2, TECH_POWER = 2)
materials = list(DEFAULT_WALL_MATERIAL = 10000)
@@ -1552,7 +1552,7 @@ CIRCUITS BELOW
/datum/design/item/custom_circuit_assembly/medium
name = "Medium custom assembly"
desc = "An customizable assembly suited for more ambitious mechanisms."
desc = "A customizable assembly suited for more ambitious mechanisms."
id = "assembly-medium"
req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_POWER = 3)
materials = list(DEFAULT_WALL_MATERIAL = 20000)
@@ -1561,7 +1561,7 @@ CIRCUITS BELOW
/datum/design/item/custom_circuit_assembly/drone
name = "Drone custom assembly"
desc = "An customizable assembly optimized for autonomous devices."
desc = "A customizable assembly optimized for autonomous devices."
id = "assembly-drone"
req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 4, TECH_POWER = 4)
materials = list(DEFAULT_WALL_MATERIAL = 30000)
@@ -1570,7 +1570,7 @@ CIRCUITS BELOW
/datum/design/item/custom_circuit_assembly/large
name = "Large custom assembly"
desc = "An customizable assembly for large machines."
desc = "A customizable assembly for large machines."
id = "assembly-large"
req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_POWER = 4)
materials = list(DEFAULT_WALL_MATERIAL = 40000)
@@ -1586,6 +1586,33 @@ CIRCUITS BELOW
build_path = /obj/item/weapon/implant/integrated_circuit
sort_string = "VCAAE"
/datum/design/item/custom_circuit_assembly/device
name = "Device custom assembly"
desc = "An customizable assembly designed to interface with other devices."
id = "assembly-device"
req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2)
materials = list(DEFAULT_WALL_MATERIAL = 5000)
build_path = /obj/item/device/assembly/electronic_assembly
sort_string = "VCAAF"
/datum/design/item/custom_circuit_printer
name = "Portable integrated circuit printer"
desc = "A portable(ish) printer for modular machines."
id = "ic_printer"
req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 4, TECH_DATA = 5)
materials = list(DEFAULT_WALL_MATERIAL = 10000)
build_path = /obj/item/device/integrated_circuit_printer
sort_string = "VCAAG"
/datum/design/item/custom_circuit_printer
name = "Integrated circuit printer upgrade - advanced designs"
desc = "Allows the integrated circuit printer to create advanced circuits"
id = "ic_printer_upgrade_adv"
req_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 4)
materials = list(DEFAULT_WALL_MATERIAL = 2000)
build_path = /obj/item/weapon/disk/integrated_circuit/upgrade/advanced
sort_string = "VCAAH"
/datum/design/item/translator
name = "handheld translator"
id = "translator"

2
code/modules/research/message_server.dm
View File

@@ -136,7 +136,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/attack_hand(user as mob)
// user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays."
// user << "<font color='blue'>There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays.</font>"
user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]"
active = !active
update_icon()

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

@@ -97,7 +97,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
D.linked_console = src
return
/obj/machinery/computer/rdconsole/proc/griefProtection() //Have it automatically push research to the centcomm server so wild griffins can't fuck up R&D's work
/obj/machinery/computer/rdconsole/proc/griefProtection() //Have it automatically push research to the CentCom server so wild griffins can't fuck up R&D's work
for(var/obj/machinery/r_n_d/server/centcom/C in machines)
for(var/datum/tech/T in files.known_tech)
C.files.AddTech2Known(T)
@@ -167,7 +167,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
screen = 1.2
files.AddTech2Known(t_disk.stored)
updateUsrDialog()
griefProtection() //Update centcomm too
griefProtection() //Update CentCom too
else if(href_list["clear_tech"]) //Erase data on the technology disk.
t_disk.stored = null
@@ -190,7 +190,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
screen = 1.4
files.AddDesign2Known(d_disk.blueprint)
updateUsrDialog()
griefProtection() //Update centcomm too
griefProtection() //Update CentCom too
else if(href_list["clear_design"]) //Erases data on the design disk.
d_disk.blueprint = null

5
code/modules/research/research.dm
View File

@@ -54,7 +54,7 @@ research holder datum.
known_tech += new T(src)
for(var/D in typesof(/datum/design) - /datum/design)
possible_designs += new D(src)
generate_integrated_circuit_designs()
// generate_integrated_circuit_designs()
RefreshResearch()
/datum/research/techonly
@@ -129,7 +129,7 @@ research holder datum.
var/datum/tech/check_tech = T
if(initial(check_tech.id) == ID)
return initial(check_tech.name)
/*
/datum/research/proc/generate_integrated_circuit_designs()
spawn(2 SECONDS) // So the list has time to initialize.
for(var/obj/item/integrated_circuit/IC in all_integrated_circuits)
@@ -143,6 +143,7 @@ research holder datum.
D.req_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2)
D.build_path = IC.type
possible_designs += D
*/
/***************************************************************
** Technology Datums **

2
code/modules/research/server.dm
View File

@@ -79,7 +79,7 @@
griefProtection()
..()
//Backup files to centcomm to help admins recover data after greifer attacks
//Backup files to CentCom to help admins recover data after greifer attacks
/obj/machinery/r_n_d/server/proc/griefProtection()
for(var/obj/machinery/r_n_d/server/centcom/C in machines)
for(var/datum/tech/T in files.known_tech)