shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "12/21 modernizations from TG live"

Browse Source
This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/console.dm
+6 -7
View File
@@ -8,6 +8,7 @@
var/safety_warning = "For safety reasons the automated supply shuttle \
cannot transport live organisms, classified nuclear weaponry or \
homing beacons."
light_color = LIGHT_COLOR_BROWN
/obj/machinery/computer/cargo/request
name = "supply request console"
@@ -61,7 +62,7 @@
"name" = P.group,
"packs" = list()
)
if((P.hidden && !emagged) || (P.contraband && !contraband) || (P.special && !P.special_enabled))
if((P.hidden && !emagged) || (P.contraband && !contraband))
continue
data["supplies"][P.group]["packs"] += list(list(
"name" = P.name,
@@ -96,7 +97,7 @@
return
switch(action)
if("send")
if(!SSshuttle.supply.canMove())
if(SSshuttle.supply.canMove())
say(safety_warning)
return
if(SSshuttle.supply.getDockedId() == "supply_home")
@@ -113,11 +114,10 @@
if("loan")
if(!SSshuttle.shuttle_loan)
return
else if(SSshuttle.supply.mode != SHUTTLE_IDLE)
if(SSshuttle.supply.canMove())
say(safety_warning)
return
else if(SSshuttle.supply.getDockedId() != "supply_away")
return
else
else if(SSshuttle.supply.mode == SHUTTLE_IDLE)
SSshuttle.shuttle_loan.loan_shuttle()
say("The supply shuttle has been loaned to Centcom.")
. = TRUE
@@ -198,4 +198,3 @@
status_signal.data["command"] = command
frequency.post_signal(src, status_signal)
code/modules/cargo/export_scanner.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "export_scanner"
item_state = "radio"
flags = NOBLUDGEON
w_class = WEIGHT_CLASS_SMALL
w_class = 2
siemens_coefficient = 1
var/obj/machinery/computer/cargo/cargo_console = null
code/modules/cargo/exports/large_objects.dm
+12
View File
@@ -81,11 +81,23 @@
unit_name = "pipe dispenser"
export_types = list(/obj/machinery/pipedispenser)
/datum/export/large/singularitygen
cost = 4000 // If you have one left after engine setup, sell it.
unit_name = "unused gravitational singularity generator"
export_types = list(/obj/machinery/the_singularitygen)
include_subtypes = FALSE
/datum/export/large/singularitygen/tesla
unit_name = "unused energy ball generator"
export_types = list(/obj/machinery/the_singularitygen/tesla)
/datum/export/large/supermatter
cost = 9000
unit_name = "supermatter shard"
export_types = list(/obj/machinery/power/supermatter_shard)
// Misc
/datum/export/large/iv
cost = 300
code/modules/cargo/exports/materials.dm
-6
View File
@@ -73,12 +73,6 @@
material_id = MAT_SILVER
message = "cm3 of silver"
// Titanium.
/datum/export/material/titanium
cost = 250
material_id = MAT_TITANIUM
message = "cm3 of titanium"
// Metal. Common building material.
/datum/export/material/metal
message = "cm3 of metal"
code/modules/cargo/exports/research.dm
+6 -12
View File
@@ -7,19 +7,13 @@
/datum/export/tech/get_cost(obj/O)
var/obj/item/weapon/disk/tech_disk/D = O
var/cost = 0
for(var/V in D.tech_stored)
if(!V)
continue
var/datum/tech/tech = V
cost += tech.getCost(techLevels[tech.id])
return ..() * cost
if(!D.stored)
return 0
var/datum/tech/tech = D.stored
return ..() * tech.getCost(techLevels[tech.id])
/datum/export/tech/sell_object(obj/O)
..()
var/obj/item/weapon/disk/tech_disk/D = O
for(var/V in D.tech_stored)
if(!V)
continue
var/datum/tech/tech = V
techLevels[tech.id] = tech.level
var/datum/tech/tech = D.stored
techLevels[tech.id] = tech.level
code/modules/cargo/exports/seeds.dm
+3 -3
View File
@@ -31,6 +31,6 @@
if(!cost)
return 0
var/potDiff = (S.potency - discoveredPlants[S.type])
return round(..() * potDiff)
var/potDiff = max(S.potency - discoveredPlants[S.type], 0)
return round(..() * potDiff)
code/modules/cargo/exports/weapons.dm
+4 -4
View File
@@ -19,7 +19,7 @@
/datum/export/weapon/taser
cost = 250
unit_name = "advanced taser"
export_types = list(/obj/item/weapon/gun/energy/e_gun/advtaser)
export_types = list(/obj/item/weapon/gun/energy/gun/advtaser)
/datum/export/weapon/laser
cost = 250
@@ -34,18 +34,18 @@
/datum/export/weapon/energy_gun
cost = 900
unit_name = "energy gun"
export_types = list(/obj/item/weapon/gun/energy/e_gun)
export_types = list(/obj/item/weapon/gun/energy/gun)
/datum/export/weapon/wt550
cost = 1400
unit_name = "WT-550 automatic rifle"
export_types = list(/obj/item/weapon/gun/ballistic/automatic/wt550)
export_types = list(/obj/item/weapon/gun/projectile/automatic/wt550)
/datum/export/weapon/shotgun
cost = 350
unit_name = "combat shotgun"
export_types = list(/obj/item/weapon/gun/ballistic/shotgun/automatic/combat)
export_types = list(/obj/item/weapon/gun/projectile/shotgun/automatic/combat)
/datum/export/weapon/flashbang
code/modules/cargo/packs.dm
+40 -242
View File
@@ -5,21 +5,16 @@
var/contraband = FALSE
var/cost = 700 // Minimum cost, or infinite points are possible.
var/access = FALSE
var/access_any = FALSE
var/list/contains = null
var/crate_name = "crate"
var/crate_type = /obj/structure/closet/crate
var/dangerous = FALSE // Should we message admins?
var/special = FALSE //Event/Station Goals/Admin enabled packs
var/special_enabled = FALSE
/datum/supply_pack/proc/generate(turf/T)
var/obj/structure/closet/crate/C = new crate_type(T)
C.name = crate_name
if(access)
C.req_access = list(access)
if(access_any)
C.req_one_access = access_any
fill(C)
@@ -36,19 +31,6 @@
/datum/supply_pack/emergency
group = "Emergency"
/datum/supply_pack/emergency/vehicle
name = "Biker Gang Kit" //TUNNEL SNAKES OWN THIS TOWN
cost = 2000
contraband = TRUE
contains = list(/obj/vehicle/atv,
/obj/item/key,
/obj/item/clothing/suit/jacket/leather/overcoat,
/obj/item/clothing/gloves/color/black,
/obj/item/clothing/head/soft,
/obj/item/clothing/mask/bandana/skull)//so you can properly #cargoniabikergang
crate_name = "Biker Kit"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/emergency/equipment
name = "Emergency Equipment"
@@ -119,12 +101,7 @@
contains = list(/obj/item/clothing/head/radiation,
/obj/item/clothing/head/radiation,
/obj/item/clothing/suit/radiation,
/obj/item/clothing/suit/radiation,
/obj/item/device/geiger_counter,
/obj/item/device/geiger_counter,
/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka,
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass)
/obj/item/clothing/suit/radiation)
crate_name = "radiation protection crate"
crate_type = /obj/structure/closet/crate/radiation
@@ -170,26 +147,11 @@
name = "NULL_ENTRY"
hidden = TRUE
cost = 14000
contains = list()
contains = list(/obj/item/weapon/storage/box/syndicate)
crate_name = "emergency crate"
crate_type = /obj/structure/closet/crate/internals
dangerous = TRUE
/datum/supply_pack/emergency/syndicate/fill(obj/structure/closet/crate/C)
var/crate_value = 50
var/list/uplink_items = get_uplink_items(ticker.mode)
while(crate_value)
var/category = pick(uplink_items)
var/item = pick(uplink_items[category])
var/datum/uplink_item/I = uplink_items[category][item]
if(!I.surplus || prob(100 - I.surplus))
continue
if(crate_value < I.cost)
continue
crate_value -= I.cost
new I.item(C)
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Security ////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -243,7 +205,7 @@
/datum/supply_pack/security/laser
name = "Lasers Crate"
cost = 2000
cost = 1500
contains = list(/obj/item/weapon/gun/energy/laser,
/obj/item/weapon/gun/energy/laser,
/obj/item/weapon/gun/energy/laser)
@@ -251,15 +213,15 @@
/datum/supply_pack/security/taser
name = "Taser Crate"
cost = 3000
contains = list(/obj/item/weapon/gun/energy/e_gun/advtaser,
/obj/item/weapon/gun/energy/e_gun/advtaser,
/obj/item/weapon/gun/energy/e_gun/advtaser)
cost = 1500
contains = list(/obj/item/weapon/gun/energy/gun/advtaser,
/obj/item/weapon/gun/energy/gun/advtaser,
/obj/item/weapon/gun/energy/gun/advtaser)
crate_name = "taser crate"
/datum/supply_pack/security/disabler
name = "Disabler Crate"
cost = 1500
cost = 1000
contains = list(/obj/item/weapon/gun/energy/disabler,
/obj/item/weapon/gun/energy/disabler,
/obj/item/weapon/gun/energy/disabler)
@@ -345,10 +307,10 @@
/datum/supply_pack/security/armory/ballistic
name = "Combat Shotguns Crate"
cost = 4000
contains = list(/obj/item/weapon/gun/ballistic/shotgun/automatic/combat,
/obj/item/weapon/gun/ballistic/shotgun/automatic/combat,
/obj/item/weapon/gun/ballistic/shotgun/automatic/combat,
cost = 2000
contains = list(/obj/item/weapon/gun/projectile/shotgun/automatic/combat,
/obj/item/weapon/gun/projectile/shotgun/automatic/combat,
/obj/item/weapon/gun/projectile/shotgun/automatic/combat,
/obj/item/weapon/storage/belt/bandolier,
/obj/item/weapon/storage/belt/bandolier,
/obj/item/weapon/storage/belt/bandolier)
@@ -357,8 +319,8 @@
/datum/supply_pack/security/armory/energy
name = "Energy Guns Crate"
cost = 2500
contains = list(/obj/item/weapon/gun/energy/e_gun,
/obj/item/weapon/gun/energy/e_gun)
contains = list(/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/gun/energy/gun)
crate_name = "energy gun crate"
crate_type = /obj/structure/closet/crate/secure/plasma
@@ -380,8 +342,8 @@
/datum/supply_pack/security/armory/wt550
name = "WT-550 Auto Rifle Crate"
cost = 3500
contains = list(/obj/item/weapon/gun/ballistic/automatic/wt550,
/obj/item/weapon/gun/ballistic/automatic/wt550)
contains = list(/obj/item/weapon/gun/projectile/automatic/wt550,
/obj/item/weapon/gun/projectile/automatic/wt550)
crate_name = "auto rifle crate"
/datum/supply_pack/security/armory/wt550ammo
@@ -428,7 +390,7 @@
/datum/supply_pack/security/firingpins
name = "Standard Firing Pins Crate"
cost = 2000
cost = 1000
contains = list(/obj/item/weapon/storage/box/firingpins,
/obj/item/weapon/storage/box/firingpins)
crate_name = "firing pins crate"
@@ -473,35 +435,6 @@
crate_name = "fuel tank crate"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/engineering/oxygen
name = "Oxygen Canister"
cost = 1500
contains = list(/obj/machinery/portable_atmospherics/canister/oxygen)
crate_name = "oxygen canister crate"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/engineering/nitrogen
name = "Nitrogen Canister"
cost = 2000
contains = list(/obj/machinery/portable_atmospherics/canister/nitrogen)
crate_name = "nitrogen canister crate"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/engineering/carbon_dio
name = "Carbon Dioxide Canister"
cost = 3000
contains = list(/obj/machinery/portable_atmospherics/canister/carbon_dioxide)
crate_name = "carbon dioxide canister crate"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/science/nitrous_oxide_canister
name = "Nitrous Oxide Canister"
cost = 3000
access = access_atmospherics
contains = list(/obj/machinery/portable_atmospherics/canister/nitrous_oxide)
crate_name = "nitrous oxide canister crate"
crate_type = /obj/structure/closet/crate/secure
/datum/supply_pack/engineering/tools
name = "Toolbox Crate"
contains = list(/obj/item/weapon/storage/toolbox/electrical,
@@ -674,34 +607,6 @@
crate_type = /obj/structure/closet/crate/secure/engineering
dangerous = TRUE
/datum/supply_pack/engineering/engine/am_shielding
name = "Antimatter Shielding Crate"
cost = 2000
contains = list(/obj/item/device/am_shielding_container,
/obj/item/device/am_shielding_container,
/obj/item/device/am_shielding_container,
/obj/item/device/am_shielding_container,
/obj/item/device/am_shielding_container,
/obj/item/device/am_shielding_container,
/obj/item/device/am_shielding_container,
/obj/item/device/am_shielding_container,
/obj/item/device/am_shielding_container,
/obj/item/device/am_shielding_container)//10 shields: 3x3 containment and a core
crate_name = "antimatter shielding crate"
/datum/supply_pack/engineering/engine/am_core
name = "Antimatter Control Crate"
cost = 5000
contains = list(/obj/machinery/power/am_control_unit)
crate_name = "antimatter control crate"
/datum/supply_pack/engineering/engine/am_jar
name = "Antimatter Containment Jar Crate"
cost = 2000
contains = list(/obj/item/weapon/am_containment,
/obj/item/weapon/am_containment)
crate_name = "antimatter jar crate"
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Medical /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -907,24 +812,6 @@
crate_type = /obj/structure/closet/crate/secure
dangerous = TRUE
/datum/supply_pack/science/bz_canister
name = "BZ Canister"
cost = 2000
access_any = list(access_rd, access_atmospherics)
contains = list(/obj/machinery/portable_atmospherics/canister/bz)
crate_name = "bz canister crate"
crate_type = /obj/structure/closet/crate/secure
dangerous = TRUE
/datum/supply_pack/science/freon_canister
name = "Freon Canister"
cost = 6000
access_any = list(access_rd, access_atmospherics)
contains = list(/obj/machinery/portable_atmospherics/canister/freon)
crate_name = "freon canister crate"
crate_type = /obj/structure/closet/crate/secure
dangerous = TRUE
/datum/supply_pack/science/research
name = "Machine Prototype Crate"
cost = 8000
@@ -933,16 +820,6 @@
crate_name = "machine prototype crate"
crate_type = /obj/structure/closet/crate/secure
/datum/supply_pack/science/tablets
name = "Tablet Crate"
cost = 5000
contains = list(/obj/item/device/modular_computer/tablet/preset/cargo,
/obj/item/device/modular_computer/tablet/preset/cargo,
/obj/item/device/modular_computer/tablet/preset/cargo,
/obj/item/device/modular_computer/tablet/preset/cargo,
/obj/item/device/modular_computer/tablet/preset/cargo)
crate_name = "tablet crate"
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Organic /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -1032,7 +909,7 @@
name = "Corgi Crate"
cost = 5000
contains = list(/mob/living/simple_animal/pet/dog/corgi,
/obj/item/clothing/neck/petcollar)
/obj/item/clothing/tie/petcollar)
crate_name = "corgi crate"
/datum/supply_pack/organic/critter/corgi/generate()
@@ -1046,7 +923,7 @@
name = "Cat Crate"
cost = 5000 //Cats are worth as much as corgis.
contains = list(/mob/living/simple_animal/pet/cat,
/obj/item/clothing/neck/petcollar,
/obj/item/clothing/tie/petcollar,
/obj/item/toy/cattoy)
crate_name = "cat crate"
@@ -1061,14 +938,14 @@
name = "Pug Crate"
cost = 5000
contains = list(/mob/living/simple_animal/pet/dog/pug,
/obj/item/clothing/neck/petcollar)
/obj/item/clothing/tie/petcollar)
crate_name = "pug crate"
/datum/supply_pack/organic/critter/fox
name = "Fox Crate"
cost = 5000
contains = list(/mob/living/simple_animal/pet/fox,
/obj/item/clothing/neck/petcollar)
/obj/item/clothing/tie/petcollar)
crate_name = "fox crate"
/datum/supply_pack/organic/critter/butterfly
@@ -1147,9 +1024,7 @@
/obj/item/seeds/amanita,
/obj/item/seeds/reishi,
/obj/item/seeds/banana,
/obj/item/seeds/eggplant/eggy,
/obj/item/seeds/random,
/obj/item/seeds/random)
/obj/item/seeds/eggplant/eggy)
crate_name = "exotic seeds crate"
/datum/supply_pack/organic/hydroponics/beekeeping_fullkit
@@ -1161,8 +1036,7 @@
/obj/item/honey_frame,
/obj/item/queen_bee/bought,
/obj/item/clothing/head/beekeeper_head,
/obj/item/clothing/suit/beekeeper_suit,
/obj/item/weapon/melee/flyswatter)
/obj/item/clothing/suit/beekeeper_suit)
crate_name = "beekeeping starter crate"
/datum/supply_pack/organic/hydroponics/beekeeping_suits
@@ -1265,20 +1139,6 @@
/datum/supply_pack/misc
group = "Miscellaneous Supplies"
/datum/supply_pack/misc/minerkit
name = "Shaft Miner Starter Kit"
cost = 2500
access = access_qm
contains = list(/obj/item/weapon/pickaxe/mini,
/obj/item/clothing/glasses/meson,
/obj/item/device/t_scanner/adv_mining_scanner/lesser,
/obj/item/device/radio/headset/headset_cargo/mining,
/obj/item/weapon/storage/bag/ore,
/obj/item/clothing/suit/hooded/explorer,
/obj/item/clothing/mask/gas/explorer)
crate_name = "shaft miner starter kit"
crate_type = /obj/structure/closet/crate/secure
/datum/supply_pack/misc/mule
name = "MULEbot Crate"
cost = 2000
@@ -1313,13 +1173,6 @@
crate_name = "high-capacity water tank crate"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/misc/water_vapor
name = "Water Vapor Canister"
cost = 2500
contains = list(/obj/machinery/portable_atmospherics/canister/water_vapor)
crate_name = "water vapor canister crate"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/misc/lasertag
name = "Laser Tag Crate"
cost = 1500
@@ -1345,7 +1198,7 @@
/datum/supply_pack/misc/lasertag/pins
name = "Laser Tag Firing Pins Crate"
cost = 3000
cost = 2000
contraband = TRUE
contains = list(/obj/item/weapon/storage/box/lasertagpins)
crate_name = "laser tag crate"
@@ -1555,7 +1408,7 @@
/obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims,
/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori,
/obj/item/seeds/ambrosia/deus,
/obj/item/clothing/neck/necklace/dope)
/obj/item/clothing/tie/dope_necklace)
crate_name = "crate"
/datum/supply_pack/misc/randomised/toys
@@ -1574,7 +1427,7 @@
/obj/item/toy/carpplushie,
/obj/item/weapon/coin/antagtoken,
/obj/item/stack/tile/fakespace/loaded,
/obj/item/weapon/gun/ballistic/shotgun/toy/crossbow,
/obj/item/weapon/gun/projectile/shotgun/toy/crossbow,
/obj/item/toy/redbutton)
crate_name = "toy crate"
@@ -1598,9 +1451,9 @@
/obj/item/clothing/under/lawyer/blacksuit,
/obj/item/clothing/suit/toggle/lawyer/black,
/obj/item/clothing/tie/waistcoat,
/obj/item/clothing/neck/tie/blue,
/obj/item/clothing/neck/tie/red,
/obj/item/clothing/neck/tie/black,
/obj/item/clothing/tie/blue,
/obj/item/clothing/tie/red,
/obj/item/clothing/tie/black,
/obj/item/clothing/head/bowler,
/obj/item/clothing/head/fedora,
/obj/item/clothing/head/flatcap,
@@ -1620,22 +1473,22 @@
/datum/supply_pack/misc/foamforce
name = "Foam Force Crate"
cost = 1000
contains = list(/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy)
contains = list(/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy)
crate_name = "foam force crate"
/datum/supply_pack/misc/foamforce/bonus
name = "Foam Force Pistols Crate"
contraband = TRUE
cost = 4000
contains = list(/obj/item/weapon/gun/ballistic/automatic/toy/pistol,
/obj/item/weapon/gun/ballistic/automatic/toy/pistol,
contains = list(/obj/item/weapon/gun/projectile/automatic/toy/pistol,
/obj/item/weapon/gun/projectile/automatic/toy/pistol,
/obj/item/ammo_box/magazine/toy/pistol,
/obj/item/ammo_box/magazine/toy/pistol)
crate_name = "foam force crate"
@@ -1653,59 +1506,4 @@
/obj/item/weapon/canvas/twentythreeXtwentythree,
/obj/item/toy/crayon/rainbow,
/obj/item/toy/crayon/rainbow)
crate_name= "art supply crate"
/datum/supply_pack/misc/bsa
name = "Bluespace Artillery Parts"
cost = 15000
special = TRUE
contains = list(/obj/item/weapon/circuitboard/machine/bsa/front,
/obj/item/weapon/circuitboard/machine/bsa/middle,
/obj/item/weapon/circuitboard/machine/bsa/back,
/obj/item/weapon/circuitboard/machine/computer/bsa_control
)
crate_name= "bluespace artillery parts crate"
/datum/supply_pack/misc/dna_vault
name = "DNA Vault Parts"
cost = 12000
special = TRUE
contains = list(
/obj/item/weapon/circuitboard/machine/dna_vault
)
crate_name= "dna vault parts crate"
/datum/supply_pack/misc/dna_probes
name = "DNA Vault Samplers"
cost = 3000
special = TRUE
contains = list(/obj/item/device/dna_probe,
/obj/item/device/dna_probe,
/obj/item/device/dna_probe,
/obj/item/device/dna_probe,
/obj/item/device/dna_probe
)
crate_name= "dna samplers crate"
/datum/supply_pack/misc/shield_sat
name = "Shield Generator Satellite"
cost = 3000
special = TRUE
contains = list(
/obj/machinery/satellite/meteor_shield,
/obj/machinery/satellite/meteor_shield,
/obj/machinery/satellite/meteor_shield
)
crate_name= "shield sat crate"
/datum/supply_pack/misc/shield_sat_control
name = "Shield System Control Board"
cost = 5000
special = TRUE
contains = list(
/obj/item/weapon/circuitboard/machine/computer/sat_control
)
crate_name= "shield control board crate"
crate_name= "art supply crate"