cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compatability fixes

Browse Source
This commit is contained in:
Unknown
2020-07-22 17:37:47 -04:00
parent 77d6c2b33e
commit 382e676ee2
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/datums/supplypacks/engineering.dm
View File

@@ -35,8 +35,6 @@
containertype = /obj/structure/closet/crate/focalpoint containertype = /obj/structure/closet/crate/focalpoint
containername = "Superconducting Transmission Coil crate" containername = "Superconducting Transmission Coil crate"
<<<<<<< HEAD
=======
/datum/supply_pack/eng/shield_capacitor /datum/supply_pack/eng/shield_capacitor
name = "Shield Capacitor" name = "Shield Capacitor"
contains = list(/obj/machinery/shield_capacitor) contains = list(/obj/machinery/shield_capacitor)
@@ -79,7 +77,6 @@
containertype = /obj/structure/closet/crate/focalpoint containertype = /obj/structure/closet/crate/focalpoint
containername = "advanced hull shield generator crate" containername = "advanced hull shield generator crate"
>>>>>>> d7f25c3... Flavour Enhancement: Crates (#7342)
/datum/supply_pack/eng/electrical /datum/supply_pack/eng/electrical
name = "Electrical maintenance crate" name = "Electrical maintenance crate"
contains = list( contains = list(
@@ -176,21 +173,6 @@
containername = "Particle Accelerator crate" containername = "Particle Accelerator crate"
access = access_ce access = access_ce
<<<<<<< HEAD
/datum/supply_pack/eng/shield_generator
name = "Shield Generator Construction Kit"
contains = list(
/obj/item/weapon/circuitboard/shield_generator,
/obj/item/weapon/stock_parts/capacitor,
/obj/item/weapon/stock_parts/micro_laser,
/obj/item/weapon/smes_coil,
/obj/item/weapon/stock_parts/console_screen,
/obj/item/weapon/stock_parts/subspace/amplifier
)
cost = 80
containertype = /obj/structure/closet/crate/engineering
containername = "shield generator construction kit crate"
=======
/datum/supply_pack/eng/shield_gen /datum/supply_pack/eng/shield_gen
contains = list(/obj/item/weapon/circuitboard/shield_gen) contains = list(/obj/item/weapon/circuitboard/shield_gen)
name = "Bubble shield generator circuitry" name = "Bubble shield generator circuitry"
@@ -214,7 +196,6 @@
containertype = /obj/structure/closet/crate/secure/focalpoint containertype = /obj/structure/closet/crate/secure/focalpoint
containername = "shield capacitor circuitry crate" containername = "shield capacitor circuitry crate"
access = access_ce access = access_ce
>>>>>>> d7f25c3... Flavour Enhancement: Crates (#7342)
/datum/supply_pack/eng/smbig /datum/supply_pack/eng/smbig
name = "Supermatter Core" name = "Supermatter Core"

14
code/datums/supplypacks/engineering_vr.dm
View File

@@ -1,3 +1,17 @@
/datum/supply_pack/eng/modern_shield
name = "Modern Shield Construction Kit"
contains = list(
/obj/item/weapon/circuitboard/shield_generator,
/obj/item/weapon/stock_parts/capacitor,
/obj/item/weapon/stock_parts/micro_laser,
/obj/item/weapon/smes_coil,
/obj/item/weapon/stock_parts/console_screen,
/obj/item/weapon/stock_parts/subspace/amplifier
)
cost = 80
containertype = /obj/structure/closet/crate/focalpoint
containername = "shield generator construction kit crate"
/datum/supply_pack/eng/thermoregulator /datum/supply_pack/eng/thermoregulator
contains = list(/obj/machinery/power/thermoregulator) contains = list(/obj/machinery/power/thermoregulator)
name = "Thermal Regulator" name = "Thermal Regulator"