cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 13:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/power/rust/core_gen.dm
	code/modules/power/rust/fuel_compressor_construction.dm
	code/modules/power/rust/fuel_injector.dm
This commit is contained in:
PsiOmegaDelta
2015-07-01 22:46:40 +02:00
parent 0e6aea6842 b7bb0e8b44
commit b5a47fd43b
24 changed files with 2 additions and 2602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks.dm
-36
View File
@@ -1115,42 +1115,6 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containername = "Formalwear for the best occasions."
group = "Miscellaneous"
/datum/supply_packs/rust_injector
contains = list(/obj/machinery/power/rust_fuel_injector)
name = "RUST fuel injector"
cost = 50
containertype = /obj/structure/closet/crate/secure/large
containername = "RUST injector crate"
group = "Engineering"
access = access_engine
/datum/supply_packs/rust_compressor
contains = list(/obj/item/weapon/module/rust_fuel_compressor)
name = "RUST fuel compressor circuitry"
cost = 60
containertype = /obj/structure/closet/crate/secure
containername = "RUST fuel compressor circuitry"
group = "Engineering"
access = access_engine
/datum/supply_packs/rust_assembly_port
contains = list(/obj/item/weapon/module/rust_fuel_port)
name = "RUST fuel assembly port circuitry"
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "RUST fuel assembly port circuitry"
group = "Engineering"
access = access_engine
/datum/supply_packs/rust_core
contains = list(/obj/machinery/power/rust_core)
name = "RUST Tokamak Core"
cost = 75
containertype = /obj/structure/closet/crate/secure/large
containername = "RUST tokamak crate"
group = "Engineering"
access = access_engine
/datum/supply_packs/shield_gen
contains = list(/obj/item/weapon/circuitboard/shield_gen)
name = "Bubble shield generator circuitry"