cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-08-22 20:07:45 +02:00
parent 8c55d1cc3f 38f6ff2404
commit 48af4c881c
339 changed files with 12177 additions and 5535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/research/designs/circuits/circuits.dm
View File

@@ -494,7 +494,7 @@ CIRCUITS BELOW
id = "durand_main"
req_tech = list(TECH_DATA = 4)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
chemicals = list("pacid" = 20)
chemicals = list("sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/main
sort_string = "NAADA"
@@ -503,7 +503,7 @@ CIRCUITS BELOW
id = "durand_peri"
req_tech = list(TECH_DATA = 4)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
chemicals = list("pacid" = 20)
chemicals = list("sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals
sort_string = "NAADB"
@@ -512,7 +512,7 @@ CIRCUITS BELOW
id = "durand_targ"
req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2)
materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
chemicals = list("pacid" = 20)
chemicals = list("sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting
sort_string = "NAADC"

16
code/modules/research/mechfab_designs.dm
View File

@@ -184,49 +184,49 @@
name = "Durand Torso"
id = "durand_torso"
build_path = /obj/item/mecha_parts/part/durand_torso
time = 60
time = 30
materials = list(DEFAULT_WALL_MATERIAL = 41250, MAT_PLASTEEL = 15000, "silver" = 7500)
/datum/design/item/mechfab/durand/head
name = "Durand Head"
id = "durand_head"
build_path = /obj/item/mecha_parts/part/durand_head
time = 40
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 18750, "glass" = 7500, "silver" = 2250)
/datum/design/item/mechfab/durand/left_arm
name = "Durand Left Arm"
id = "durand_left_arm"
build_path = /obj/item/mecha_parts/part/durand_left_arm
time = 40
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 26250, "silver" = 2250)
/datum/design/item/mechfab/durand/right_arm
name = "Durand Right Arm"
id = "durand_right_arm"
build_path = /obj/item/mecha_parts/part/durand_right_arm
time = 40
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 26250, "silver" = 2250)
/datum/design/item/mechfab/durand/left_leg
name = "Durand Left Leg"
id = "durand_left_leg"
build_path = /obj/item/mecha_parts/part/durand_left_leg
time = 40
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 30000, "silver" = 2250)
/datum/design/item/mechfab/durand/right_leg
name = "Durand Right Leg"
id = "durand_right_leg"
build_path = /obj/item/mecha_parts/part/durand_right_leg
time = 40
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 30000, "silver" = 2250)
/datum/design/item/mechfab/durand/armour
name = "Durand Armour Plates"
id = "durand_armour"
build_path = /obj/item/mecha_parts/part/durand_armour
time = 90
time = 60
materials = list(DEFAULT_WALL_MATERIAL = 27500, MAT_PLASTEEL = 10000, "uranium" = 7500)
/datum/design/item/mechfab/janus
@@ -1043,7 +1043,7 @@
/datum/design/item/mechfab/exointernal
category = "Exosuit Internals"
time = 120
time = 30
req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3)
/datum/design/item/mechfab/exointernal/stan_armor

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

@@ -113,15 +113,15 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
var/authmsg = "[message]<br>"
var/authmsg = "[message]\n"
if (id_auth)
authmsg += "[id_auth]<br>"
authmsg += "([id_auth])\n"
if (stamp)
authmsg += "[stamp]<br>"
authmsg += "([stamp])\n"
for (var/obj/machinery/requests_console/Console in allConsoles)
if (ckey(Console.department) == ckey(recipient))
if(Console.inoperable())
Console.message_log += "<B>Message lost due to console failure.</B><BR>Please contact [station_name()] system adminsitrator or AI for technical assistance.<BR>"
Console.message_log += list(list("Message lost due to console failure.","Please contact [station_name()] system adminsitrator or AI for technical assistance."))
continue
if(Console.newmessagepriority < priority)
Console.newmessagepriority = priority
@@ -131,12 +131,12 @@ var/global/list/obj/machinery/message_server/message_servers = list()
if(!Console.silent)
playsound(Console, 'sound/machines/twobeep.ogg', 50, 1)
Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5)
Console.message_log += "<B><FONT color='red'>High Priority message from <A href='?src=\ref[Console];write=[sender]'>[sender]</A></FONT></B><BR>[authmsg]"
Console.message_log += list(list("High Priority message from [sender]", "[authmsg]"))
else
if(!Console.silent)
playsound(Console, 'sound/machines/twobeep.ogg', 50, 1)
Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'Message from [sender]'"),,4)
Console.message_log += "<B>Message from <A href='?src=\ref[Console];write=[sender]'>[sender]</A></B><BR>[authmsg]"
Console.message_log += list(list("Message from [sender]", "[authmsg]"))
Console.set_light(2)

28
code/modules/research/prosfab_designs.dm
View File

@@ -193,6 +193,34 @@
materials = list(DEFAULT_WALL_MATERIAL = 5625, "glass" = 5625)
// req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2)
/datum/design/item/prosfab/pros/internal/hydraulic
name = "Hydraulic Hub"
id = "pros_hydraulic"
build_path = /obj/item/organ/internal/heart/machine
time = 15
materials = list(DEFAULT_WALL_MATERIAL = 7500, MAT_PLASTIC = 3000)
/datum/design/item/prosfab/pros/internal/reagcycler
name = "Reagent Cycler"
id = "pros_reagcycler"
build_path = /obj/item/organ/internal/stomach/machine
time = 15
materials = list(DEFAULT_WALL_MATERIAL = 7500, MAT_PLASTIC = 3000)
/datum/design/item/prosfab/pros/internal/heatsink
name = "Heatsink"
id = "pros_heatsink"
build_path = /obj/item/organ/internal/robotic/heatsink
time = 15
materials = list(DEFAULT_WALL_MATERIAL = 7500, MAT_PLASTIC = 3000)
/datum/design/item/prosfab/pros/internal/diagnostic
name = "Diagnostic Controller"
id = "pros_diagnostic"
build_path = /obj/item/organ/internal/robotic/diagnostic
time = 15
materials = list(DEFAULT_WALL_MATERIAL = 7500, MAT_PLASTIC = 3000)
/datum/design/item/prosfab/pros/internal/heart
name = "Prosthetic Heart"
id = "pros_heart"