cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor

Browse Source 
# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm
This commit is contained in:
phil235
2016-09-29 01:44:27 +02:00
parent 7c6c99683d 69281c24ad
commit 194398cbbd
173 changed files with 879 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/circuitprinter.dm
+2 -2
View File
@@ -62,7 +62,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
T += M.rating
efficiency_coeff = 2 ** (T - 1) //Only 1 manipulator here, you're making runtimes Razharas
/obj/machinery/r_n_d/circuit_imprinter/blob_act(obj/effect/blob/B)
/obj/machinery/r_n_d/circuit_imprinter/blob_act(obj/structure/blob/B)
if (prob(50))
qdel(src)
@@ -76,7 +76,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
return round(A / max(1, (all_materials[M]/efficiency_coeff)))
//we eject the materials upon deconstruction.
/obj/machinery/r_n_d/circuit_imprinter/deconstruction()
/obj/machinery/r_n_d/circuit_imprinter/on_deconstruction()
for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
reagents.trans_to(G, G.reagents.maximum_volume)
materials.retrieve_all()
code/modules/research/designs.dm
+1
View File
@@ -39,6 +39,7 @@ other types of metals and chemistry for reagents).
var/list/category = null //Primarily used for Mech Fabricators, but can be used for anything
var/list/reagents_list = 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
////////////////////////////////////////
code/modules/research/designs/stock_parts_designs.dm
+20
View File
@@ -32,6 +32,7 @@
materials = list(MAT_METAL = 100, MAT_GLASS = 100)
build_path = /obj/item/weapon/stock_parts/capacitor
category = list("Stock Parts","Machinery","initial")
lathe_time_factor = 0.2
/datum/design/adv_capacitor
name = "Advanced Capacitor"
@@ -42,6 +43,7 @@
materials = list(MAT_METAL = 150, MAT_GLASS = 150)
build_path = /obj/item/weapon/stock_parts/capacitor/adv
category = list("Stock Parts")
lathe_time_factor = 0.2
/datum/design/super_capacitor
name = "Super Capacitor"
@@ -52,6 +54,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_GOLD = 100)
build_path = /obj/item/weapon/stock_parts/capacitor/super
category = list("Stock Parts")
lathe_time_factor = 0.2
/datum/design/quadratic_capacitor
name = "Quadratic Capacitor"
@@ -62,6 +65,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_DIAMOND = 100)
build_path = /obj/item/weapon/stock_parts/capacitor/quadratic
category = list("Stock Parts")
lathe_time_factor = 0.2
//Scanning modules
/datum/design/basic_scanning
@@ -73,6 +77,7 @@
materials = list(MAT_METAL = 100, MAT_GLASS = 50)
build_path = /obj/item/weapon/stock_parts/scanning_module
category = list("Stock Parts","Machinery","initial")
lathe_time_factor = 0.2
/datum/design/adv_scanning
name = "Advanced Scanning Module"
@@ -83,6 +88,7 @@
materials = list(MAT_METAL = 150, MAT_GLASS = 100)
build_path = /obj/item/weapon/stock_parts/scanning_module/adv
category = list("Stock Parts")
lathe_time_factor = 0.2
/datum/design/phasic_scanning
name = "Phasic Scanning Module"
@@ -93,6 +99,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 150, MAT_SILVER = 60)
build_path = /obj/item/weapon/stock_parts/scanning_module/phasic
category = list("Stock Parts")
lathe_time_factor = 0.2
/datum/design/triphasic_scanning
name = "Triphasic Scanning Module"
@@ -103,6 +110,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_DIAMOND = 60)
build_path = /obj/item/weapon/stock_parts/scanning_module/triphasic
category = list("Stock Parts")
lathe_time_factor = 0.2
//Maipulators
/datum/design/micro_mani
@@ -114,6 +122,7 @@
materials = list(MAT_METAL = 100)
build_path = /obj/item/weapon/stock_parts/manipulator
category = list("Stock Parts","Machinery","initial")
lathe_time_factor = 0.2
/datum/design/nano_mani
name = "Nano Manipulator"
@@ -124,6 +133,7 @@
materials = list(MAT_METAL = 150)
build_path = /obj/item/weapon/stock_parts/manipulator/nano
category = list("Stock Parts")
lathe_time_factor = 0.2
/datum/design/pico_mani
name = "Pico Manipulator"
@@ -134,6 +144,7 @@
materials = list(MAT_METAL = 200)
build_path = /obj/item/weapon/stock_parts/manipulator/pico
category = list("Stock Parts")
lathe_time_factor = 0.2
/datum/design/femto_mani
name = "Femto Manipulator"
@@ -144,6 +155,7 @@
materials = list(MAT_METAL = 200, MAT_DIAMOND = 30, MAT_TITANIUM = 30)
build_path = /obj/item/weapon/stock_parts/manipulator/femto
category = list("Stock Parts")
lathe_time_factor = 0.2
//Micro-lasers
/datum/design/basic_micro_laser
@@ -155,6 +167,7 @@
materials = list(MAT_METAL = 100, MAT_GLASS = 50)
build_path = /obj/item/weapon/stock_parts/micro_laser
category = list("Stock Parts","Machinery","initial")
lathe_time_factor = 0.2
/datum/design/high_micro_laser
name = "High-Power Micro-Laser"
@@ -165,6 +178,7 @@
materials = list(MAT_METAL = 150, MAT_GLASS = 100)
build_path = /obj/item/weapon/stock_parts/micro_laser/high
category = list("Stock Parts")
lathe_time_factor = 0.2
/datum/design/ultra_micro_laser
name = "Ultra-High-Power Micro-Laser"
@@ -175,6 +189,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 150, MAT_URANIUM = 60)
build_path = /obj/item/weapon/stock_parts/micro_laser/ultra
category = list("Stock Parts")
lathe_time_factor = 0.2
/datum/design/quadultra_micro_laser
name = "Quad-Ultra Micro-Laser"
@@ -185,6 +200,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 100, MAT_DIAMOND = 60)
build_path = /obj/item/weapon/stock_parts/micro_laser/quadultra
category = list("Stock Parts")
lathe_time_factor = 0.2
/datum/design/basic_matter_bin
name = "Basic Matter Bin"
@@ -195,6 +211,7 @@
materials = list(MAT_METAL = 100)
build_path = /obj/item/weapon/stock_parts/matter_bin
category = list("Stock Parts","Machinery","initial")
lathe_time_factor = 0.2
/datum/design/adv_matter_bin
name = "Advanced Matter Bin"
@@ -205,6 +222,7 @@
materials = list(MAT_METAL = 150)
build_path = /obj/item/weapon/stock_parts/matter_bin/adv
category = list("Stock Parts")
lathe_time_factor = 0.2
/datum/design/super_matter_bin
name = "Super Matter Bin"
@@ -215,6 +233,7 @@
materials = list(MAT_METAL = 200)
build_path = /obj/item/weapon/stock_parts/matter_bin/super
category = list("Stock Parts")
lathe_time_factor = 0.2
/datum/design/bluespace_matter_bin
name = "Bluespace Matter Bin"
@@ -225,6 +244,7 @@
materials = list(MAT_METAL = 250, MAT_DIAMOND = 200)
build_path = /obj/item/weapon/stock_parts/matter_bin/bluespace
category = list("Stock Parts")
lathe_time_factor = 0.2
//T-Comms devices
/datum/design/subspace_ansible
code/modules/research/protolathe.dm
+1 -1
View File
@@ -76,7 +76,7 @@ Note: Must be placed west/left of and R&D console to function.
return round(A / max(1, (all_materials[M]*efficiency_coeff)))
//we eject the materials upon deconstruction.
/obj/machinery/r_n_d/protolathe/deconstruction()
/obj/machinery/r_n_d/protolathe/on_deconstruction()
for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
reagents.trans_to(G, G.reagents.maximum_volume)
materials.retrieve_all()
code/modules/research/rdconsole.dm
+4 -1
View File
@@ -138,7 +138,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
updateUsrDialog()
/obj/machinery/computer/rdconsole/deconstruction()
/obj/machinery/computer/rdconsole/on_deconstruction()
if(linked_destroy)
linked_destroy.linked_console = null
linked_destroy = null
@@ -438,6 +438,9 @@ won't update every console in existence) but it's more of a hassle to do. Also,
linked_lathe.reagents.remove_reagent(R, being_built.reagents_list[R]*coeff)
var/P = being_built.build_path //lets save these values before the spawn() just in case. Nobody likes runtimes.
coeff *= being_built.lathe_time_factor
spawn(32*coeff*amount**0.8)
if(linked_lathe)
if(g2g) //And if we only fail the material requirements, we still spend time and power
code/modules/research/rdmachines.dm
+1 -1
View File
@@ -105,7 +105,7 @@
//we eject the loaded item when deconstructing the machine
/obj/machinery/r_n_d/deconstruction()
/obj/machinery/r_n_d/on_deconstruction()
if(loaded_item)
loaded_item.loc = loc
..()
code/modules/research/server.dm
+2 -2
View File
@@ -90,7 +90,7 @@
..()
/obj/machinery/r_n_d/server/blob_act(obj/effect/blob/B)
/obj/machinery/r_n_d/server/blob_act(obj/structure/blob/B)
griefProtection()
..()
@@ -129,7 +129,7 @@
air_update_turf()
//called when the server is deconstructed.
/obj/machinery/r_n_d/server/deconstruction()
/obj/machinery/r_n_d/server/on_deconstruction()
griefProtection()
..()