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

Merge pull request #3767 from Tastyfish/silence

Browse Source 
Tranquillité, Prospérité & Mimeré
This commit is contained in:
TheDZD
2016-03-08 19:32:29 -05:00
parent fe128c4f7b ee32984535
commit 4e47626af7
41 changed files with 837 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs.dm
+1
View File
@@ -17,6 +17,7 @@ The currently supporting non-reagent materials:
- MAT_URANIUM (/obj/item/stack/uranium).
- MAT_DIAMOND (/obj/item/stack/diamond).
- MAT_BANANIUM (/obj/item/stack/bananium).
- MAT_TRANQUILLITE (/obj/item/stack/tranquillite).
(Insert new ones here)
Don't add new keyword/IDs if they are made from an existing one (such as rods which are made from metal). Only add raw materials.
code/modules/research/designs/mecha_designs.dm
+30
View File
@@ -166,3 +166,33 @@
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting
category = list("Exosuit Modules")
/datum/design/recitence_main
name = "Exosuit Module (\"Recitence\" Central Control module)"
desc = "Allows for the construction of a \"Recitence\" Central Control module."
id = "recitence_main"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/recitence/main
category = list("Exosuit Modules")
/datum/design/recitence_peri
name = "Exosuit Module (\"Recitence\" Peripherals Control module)"
desc = "Allows for the construction of a \"Recitence\" Peripheral Control module."
id = "recitence_peri"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/recitence/peripherals
category = list("Exosuit Modules")
/datum/design/recitence_targ
name = "Exosuit Module (\"Recitence\" Weapons & Targeting Control module)"
desc = "Allows for the construction of a \"Recitence\" Weapons & Targeting Control module."
id = "recitence_targ"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/recitence/targeting
category = list("Exosuit Modules")
code/modules/research/designs/mechfabricator_designs.dm
+83
View File
@@ -459,6 +459,70 @@
construction_time = 200
category = list("H.O.N.K")
//Recitence
/datum/design/recitence_chassis
name = "Exosuit Chassis (\"Recitence\")"
id = "recitence_chassis"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/recitence
materials = list(MAT_METAL=20000)
construction_time = 100
category = list("Recitence")
/datum/design/recitence_torso
name = "Exosuit Torso (\"Recitence\")"
id = "recitence_torso"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_torso
materials = list(MAT_METAL=20000,MAT_GLASS=10000,MAT_TRANQUILLITE=10000)
construction_time = 300
category = list("Recitence")
/datum/design/recitence_head
name = "Exosuit Head (\"Recitence\")"
id = "recitence_head"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_head
materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
/datum/design/recitence_left_arm
name = "Exosuit Left Arm (\"Recitence\")"
id = "recitence_left_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_left_arm
materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
/datum/design/recitence_right_arm
name = "Exosuit Right Arm (\"Recitence\")"
id = "recitence_right_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_right_arm
materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
/datum/design/recitence_left_leg
name = "Exosuit Left Leg (\"Recitence\")"
id = "recitence_left_leg"
build_type = MECHFAB
build_path =/obj/item/mecha_parts/part/recitence_left_leg
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
/datum/design/recitence_right_leg
name = "Exosuit Right Leg (\"Recitence\")"
id = "recitence_right_leg"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_right_leg
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
//Phazon
/datum/design/phazon_chassis
name = "Exosuit Chassis (\"Phazon\")"
@@ -641,6 +705,25 @@
construction_time = 300
category = list("Exosuit Equipment")
/datum/design/mech_silentgun
name = "S.H.H. \"Quietus\" Carbine"
id = "mech_silentgun"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=10000)
construction_time = 500
category = list("Exosuit Equipment")
/datum/design/mech_mimercd
name = "Exosuit Module (Mime RCD Module)"
desc = "An exosuit-mounted Mime Rapid Construction Device."
id = "mech_mrcd"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/tool/mimercd
materials = list(MAT_METAL=30000,MAT_TRANQUILLITE=10000)
construction_time = 700
category = list("Exosuit Equipment")
// Exosuit Modules
/datum/design/mech_diamond_drill
name = "Exosuit Module (Diamond Mining Drill)"
code/modules/research/rdconsole.dm
+13
View File
@@ -90,6 +90,8 @@ proc/CallMaterialName(ID)
return_name = "Diamond"
if("clown")
return_name = "Bananium"
if("mime")
return_name = "Tranquillite"
else
for(var/R in subtypesof(/datum/reagent))
temp_reagent = null
@@ -535,6 +537,8 @@ proc/CallMaterialName(ID)
MAT = MAT_DIAMOND
if("clown")
MAT = MAT_BANANIUM
if("mime")
MAT = "Tranquillite"
linked_lathe.materials.retrieve_sheets(desired_num_sheets, MAT)
else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the protolathe to eject a sheet of material
@@ -1011,6 +1015,15 @@ proc/CallMaterialName(ID)
if(bananium_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "<A href='?src=\ref[src];lathe_ejectsheet=clown;lathe_ejectsheet_amt=5'>5x</A> "
if(bananium_amount >= MINERAL_MATERIAL_AMOUNT) dat += "<A href='?src=\ref[src];lathe_ejectsheet=clown;lathe_ejectsheet_amt=50'>All</A>"
dat += "</div>"
//Tranquillite
var/tranquillite_amount = linked_lathe.materials.amount(MAT_TRANQUILLITE)
dat += "* [tranquillite_amount] of Tranquillite, [round(tranquillite_amount / MINERAL_MATERIAL_AMOUNT,0.1)] sheets: "
if(tranquillite_amount >= MINERAL_MATERIAL_AMOUNT)
dat += "<A href='?src=\ref[src];lathe_ejectsheet=mime;lathe_ejectsheet_amt=1'>Eject</A> "
dat += "<A href='?src=\ref[src];lathe_ejectsheet=mime;lathe_ejectsheet_amt=custom'>C</A> "
if(tranquillite_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "<A href='?src=\ref[src];lathe_ejectsheet=mime;lathe_ejectsheet_amt=5'>5x</A> "
if(tranquillite_amount >= MINERAL_MATERIAL_AMOUNT) dat += "<A href='?src=\ref[src];lathe_ejectsheet=mime;lathe_ejectsheet_amt=50'>All</A>"
dat += "</div>"
if(3.3)
dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A>"