cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plant_hud

Browse Source
This commit is contained in:
taukausanake
2016-06-20 11:23:28 -05:00
parent 55326e1c70 b20089057a
commit 795271048d
241 changed files with 5273 additions and 3396 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs.dm
+1
View File
@@ -49,6 +49,7 @@ other types of metals and chemistry for reagents).
var/category = null //Primarily used for Mech Fabricators, but can be used for anything
var/list/reagents = list() //List of reagents. Format: "id" = amount.
var/maxstack = 1
var/lathe_time_factor = 1 //How many times faster than normal is this to build on the protolathe
//A proc to calculate the reliability of a design based on tech levels and innate modifiers.
//Input: A list of /datum/tech; Output: The new reliabilty.
code/modules/research/designs/stock_parts_designs.dm
+22 -1
View File
@@ -11,6 +11,7 @@
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
build_path = /obj/item/weapon/stock_parts/capacitor
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/basic_sensor
name = "Basic Scanning Module"
@@ -21,6 +22,7 @@
materials = list(MAT_METAL = 50, MAT_GLASS = 20)
build_path = /obj/item/weapon/stock_parts/scanning_module
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/micro_mani
name = "Micro Manipulator"
@@ -31,6 +33,7 @@
materials = list(MAT_METAL = 30)
build_path = /obj/item/weapon/stock_parts/manipulator
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/basic_micro_laser
name = "Basic Micro-Laser"
@@ -41,6 +44,7 @@
materials = list(MAT_METAL = 10, MAT_GLASS = 20)
build_path = /obj/item/weapon/stock_parts/micro_laser
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/basic_matter_bin
name = "Basic Matter Bin"
@@ -51,6 +55,7 @@
materials = list(MAT_METAL = 80)
build_path = /obj/item/weapon/stock_parts/matter_bin
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/adv_capacitor
name = "Advanced Capacitor"
@@ -61,6 +66,7 @@
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
build_path = /obj/item/weapon/stock_parts/capacitor/adv
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/adv_sensor
name = "Advanced Scanning Module"
@@ -71,6 +77,7 @@
materials = list(MAT_METAL = 50, MAT_GLASS = 20)
build_path = /obj/item/weapon/stock_parts/scanning_module/adv
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/nano_mani
name = "Nano Manipulator"
@@ -81,6 +88,7 @@
materials = list(MAT_METAL = 30)
build_path = /obj/item/weapon/stock_parts/manipulator/nano
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/high_micro_laser
name = "High-Power Micro-Laser"
@@ -91,6 +99,7 @@
materials = list(MAT_METAL = 10, MAT_GLASS = 20)
build_path = /obj/item/weapon/stock_parts/micro_laser/high
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/adv_matter_bin
name = "Advanced Matter Bin"
@@ -101,6 +110,7 @@
materials = list(MAT_METAL = 80)
build_path = /obj/item/weapon/stock_parts/matter_bin/adv
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/super_capacitor
name = "Super Capacitor"
@@ -112,6 +122,7 @@
materials = list(MAT_METAL = 50, MAT_GLASS = 50, MAT_GOLD = 20)
build_path = /obj/item/weapon/stock_parts/capacitor/super
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/phasic_sensor
name = "Phasic Scanning Module"
@@ -123,6 +134,7 @@
reliability = 72
build_path = /obj/item/weapon/stock_parts/scanning_module/phasic
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/pico_mani
name = "Pico Manipulator"
@@ -134,6 +146,7 @@
reliability = 73
build_path = /obj/item/weapon/stock_parts/manipulator/pico
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/ultra_micro_laser
name = "Ultra-High-Power Micro-Laser"
@@ -145,6 +158,7 @@
reliability = 70
build_path = /obj/item/weapon/stock_parts/micro_laser/ultra
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/super_matter_bin
name = "Super Matter Bin"
@@ -156,6 +170,7 @@
reliability = 75
build_path = /obj/item/weapon/stock_parts/matter_bin/super
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/quadratic_capacitor
name = "Quadratic Capacitor"
@@ -167,6 +182,7 @@
materials = list(MAT_METAL = 100, MAT_GLASS = 100, MAT_DIAMOND = 40)
build_path = /obj/item/weapon/stock_parts/capacitor/quadratic
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/triphasic_scanning
name = "Triphasic Scanning Module"
@@ -178,6 +194,7 @@
reliability = 72
build_path = /obj/item/weapon/stock_parts/scanning_module/triphasic
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/femto_mani
name = "Femto Manipulator"
@@ -189,6 +206,7 @@
reliability = 73
build_path = /obj/item/weapon/stock_parts/manipulator/femto
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/quadultra_micro_laser
name = "Quad-Ultra Micro-Laser"
@@ -200,6 +218,7 @@
reliability = 70
build_path = /obj/item/weapon/stock_parts/micro_laser/quadultra
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/bluespace_matter_bin
name = "Bluespace Matter Bin"
@@ -211,6 +230,7 @@
reliability = 75
build_path = /obj/item/weapon/stock_parts/matter_bin/bluespace
category = list("Stock Parts")
lathe_time_factor = 5
/datum/design/RPED
name = "Rapid Part Exchange Device"
@@ -240,4 +260,5 @@
build_type = PROTOLATHE
materials = list(MAT_METAL = 4000, MAT_PLASMA = 4000)
build_path = /obj/item/stack/sheet/mineral/abductor
category = list("Stock Parts")
category = list("Stock Parts")
lathe_time_factor = 5
code/modules/research/designs/weapon_designs.dm
+4 -4
View File
@@ -128,7 +128,7 @@
//WT550 Mags
/datum/design/mag_oldsmg
name = "WT-550 Auto Gun Magazine (4.6×30mm)"
name = "WT-550 Auto Gun Magazine (4.6x30mm)"
desc = "A 20 round magazine for the out of date security WT-550 Auto Rifle"
id = "mag_oldsmg"
req_tech = list("combat" = 1, "materials" = 1)
@@ -138,21 +138,21 @@
category = list("Weapons")
/datum/design/mag_oldsmg/ap_mag
name = "WT-550 Auto Gun Armour Piercing Magazine (4.6×30mm AP)"
name = "WT-550 Auto Gun Armour Piercing Magazine (4.6x30mm AP)"
desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle"
id = "mag_oldsmg_ap"
materials = list(MAT_METAL = 6000, MAT_SILVER = 600)
build_path = /obj/item/ammo_box/magazine/wt550m9/wtap
/datum/design/mag_oldsmg/ic_mag
name = "WT-550 Auto Gun Incendiary Magazine (4.6×30mm IC)"
name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)"
desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle"
id = "mag_oldsmg_ic"
materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_GLASS = 1000)
build_path = /obj/item/ammo_box/magazine/wt550m9/wtic
/datum/design/mag_oldsmg/tx_mag
name = "WT-550 Auto Gun Urnaium Magazine (4.6×30mm TX)"
name = "WT-550 Auto Gun Urnaium Magazine (4.6x30mm TX)"
desc = "A 20 round urnaium tipped magazine for the out of date security WT-550 Auto Rifle"
id = "mag_oldsmg_tx"
materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000)
code/modules/research/protolathe.dm
+1 -1
View File
@@ -41,7 +41,7 @@ Note: Must be placed west/left of and R&D console to function.
component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
component_parts += new /obj/item/weapon/reagent_containers/glass/beaker/large(null)
component_parts += new /obj/item/weapon/reagent_containers/glass/beaker/large(null)
materials = new(src, list(MAT_METAL=1, MAT_GLASS=1, MAT_SILVER=1, MAT_GOLD=1, MAT_DIAMOND=1, MAT_PLASMA=1, MAT_URANIUM=1, MAT_BANANIUM=1))
materials = new(src, list(MAT_METAL=1, MAT_GLASS=1, MAT_SILVER=1, MAT_GOLD=1, MAT_DIAMOND=1, MAT_PLASMA=1, MAT_URANIUM=1, MAT_BANANIUM=1, MAT_TRANQUILLITE=1))
RefreshParts()
reagents.my_atom = src
code/modules/research/rdconsole.dm
+279 -570
View File
File diff suppressed because it is too large Load Diff
code/modules/research/xenobiology/xenobiology.dm
+2 -1
View File
@@ -202,7 +202,8 @@
to_chat(user, "<span class='notice'>You offer [src] sentience potion to [SM]...</span>")
being_used = 1
var/list/candidates = pollCandidates("Do you want to play as [SM.name]?", ROLE_SENTIENT, 0, 100)
var/ghostmsg = "Play as [SM.name], pet of [user.name]?"
var/list/candidates = pollCandidates(ghostmsg, ROLE_SENTIENT, 0, 100)
if(!src)
return