Skip to content

Commit

Permalink
Supply pack tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
EgorDinamit committed May 11, 2023
1 parent 350a331 commit a642414
Show file tree
Hide file tree
Showing 8 changed files with 144 additions and 79 deletions.
10 changes: 0 additions & 10 deletions code/datums/supplypacks/atmospherics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,6 @@
cost = 30
containername = "phoron tank crate"

/decl/hierarchy/supply_pack/atmospherics/voidsuit
name = "EVA - Atmospherics voidsuit"
contains = list(/obj/item/clothing/suit/space/void/atmos/alt,
/obj/item/clothing/head/helmet/space/void/atmos/alt,
/obj/item/clothing/shoes/magboots)
cost = 120
containername = "atmospherics voidsuit crate"
containertype = /obj/structure/closet/crate/secure/large
access = access_atmospherics

/decl/hierarchy/supply_pack/atmospherics/scanner_module
name = "Electronics - Atmospherics scanner modules"
contains = list(/obj/item/stock_parts/computer/scanner/atmos = 4)
Expand Down
59 changes: 31 additions & 28 deletions code/datums/supplypacks/engineering.dm
Original file line number Diff line number Diff line change
@@ -1,34 +1,47 @@
/decl/hierarchy/supply_pack/engineering
name = "Engineering"

/decl/hierarchy/supply_pack/engineering/telecomms_circuits
name = "Electronics - Telecommunications circuitry"
contains = list(
/obj/item/stock_parts/circuitboard/telecomms/receiver,
/obj/item/stock_parts/circuitboard/telecomms/hub,
/obj/item/stock_parts/circuitboard/telecomms/bus,
/obj/item/stock_parts/circuitboard/telecomms/processor,
/obj/item/stock_parts/circuitboard/telecomms/server,
/obj/item/stock_parts/circuitboard/telecomms/broadcaster,
)
cost = 50
containername = "superconducting magnetic energy storage unit circuitry crate"

/decl/hierarchy/supply_pack/engineering/smes_circuit
name = "Electronics - Superconducting magnetic energy storage unit circuitry"
contains = list(/obj/item/stock_parts/circuitboard/smes)
cost = 20
cost = 10
containername = "superconducting magnetic energy storage unit circuitry crate"

/decl/hierarchy/supply_pack/engineering/smescoil
name = "Parts - Superconductive magnetic coil"
contains = list(/obj/item/stock_parts/smes_coil)
cost = 35
cost = 20
containername = "superconductive magnetic coil crate"

/decl/hierarchy/supply_pack/engineering/smescoil_weak
name = "Parts - Basic superconductive magnetic coil"
contains = list(/obj/item/stock_parts/smes_coil/weak)
cost = 25
cost = 10
containername = "basic superconductive magnetic coil crate"

/decl/hierarchy/supply_pack/engineering/smescoil_super_capacity
name = "Parts - Superconductive capacitance coil"
contains = list(/obj/item/stock_parts/smes_coil/super_capacity)
cost = 45
cost = 30
containername = "superconductive capacitance coil crate"

/decl/hierarchy/supply_pack/engineering/smescoil_super_io
name = "Parts- Superconductive Transmission Coil"
contains = list(/obj/item/stock_parts/smes_coil/super_io)
cost = 45
cost = 30
containername = "Superconductive Transmission Coil crate"

/decl/hierarchy/supply_pack/engineering/electrical
Expand Down Expand Up @@ -106,7 +119,7 @@
/obj/structure/particle_accelerator/particle_emitter/right,
/obj/structure/particle_accelerator/power_box,
/obj/structure/particle_accelerator/end_cap)
cost = 40
cost = 30
containertype = /obj/structure/largecrate
containername = "particle accelerator crate"
access = access_ce
Expand All @@ -117,7 +130,7 @@
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/circuitboard/pacman)
cost = 45
cost = 20
containername = "\improper P.A.C.M.A.N. Portable Generator Construction Kit"
containertype = /obj/structure/closet/crate/secure
access = access_tech_storage
Expand All @@ -128,71 +141,71 @@
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/circuitboard/pacman/super)
cost = 55
cost = 30
containername = "\improper Super P.A.C.M.A.N. portable generator construction kit"
containertype = /obj/structure/closet/crate/secure
access = access_tech_storage

/decl/hierarchy/supply_pack/engineering/teg
name = "Power - Mark I Thermoelectric Generator"
contains = list(/obj/machinery/power/generator)
cost = 75
cost = 50
containertype = /obj/structure/closet/crate/secure/large
containername = "\improper Mk1 TEG crate"
access = access_engine_equip

/decl/hierarchy/supply_pack/engineering/circulator
name = "Equipment - Binary atmospheric circulator"
contains = list(/obj/machinery/atmospherics/binary/circulator)
cost = 60
cost = 20
containertype = /obj/structure/closet/crate/secure/large
containername = "atmospheric circulator crate"
access = access_atmospherics

/decl/hierarchy/supply_pack/engineering/air_dispenser
name = "Equipment - Pipe Dispenser"
contains = list(/obj/machinery/pipedispenser)
cost = 35
cost = 20
containertype = /obj/structure/closet/crate/secure/large
containername = "pipe dispenser crate"
access = access_atmospherics

/decl/hierarchy/supply_pack/engineering/disposals_dispenser
name = "Equipment - Disposals pipe dispenser"
contains = list(/obj/machinery/pipedispenser/disposal)
cost = 35
cost = 20
containertype = /obj/structure/closet/crate/secure/large
containername = "disposal dispenser crate"
access = access_atmospherics

/decl/hierarchy/supply_pack/engineering/shield_generator
name = "Equipment - Shield generator construction kit"
contains = list(/obj/item/stock_parts/circuitboard/shield_generator, /obj/item/stock_parts/capacitor, /obj/item/stock_parts/micro_laser, /obj/item/stock_parts/smes_coil, /obj/item/stock_parts/console_screen)
cost = 50
cost = 30
containertype = /obj/structure/closet/crate/secure
containername = "shield generator construction kit crate"
access = access_engine

/decl/hierarchy/supply_pack/engineering/smbig
name = "Power - Supermatter core"
contains = list(/obj/machinery/power/supermatter)
cost = 150
cost = 200
containertype = /obj/structure/closet/crate/secure/large/phoron
containername = "\improper Supermatter crate (CAUTION)"
access = access_ce

/decl/hierarchy/supply_pack/engineering/smsmall
name = "Power - Supermatter shard"
contains = list(/obj/machinery/power/supermatter/shard)
cost = 75
cost = 100
containertype = /obj/structure/closet/crate/secure/large/phoron
containername = "\improper Supermatter crate (CAUTION)"
access = access_ce

/decl/hierarchy/supply_pack/engineering/fueltank
name = "Liquid - Fuel tank"
contains = list(/obj/structure/reagent_dispensers/fueltank)
cost = 8
cost = 5
containertype = /obj/structure/largecrate
containername = "fuel tank crate"

Expand Down Expand Up @@ -223,7 +236,7 @@
/obj/item/stock_parts/subspace/filter,
/obj/item/stock_parts/subspace/crystal,
/obj/item/storage/toolbox/electrical)
cost = 75
cost = 40
containername = "emergency bluespace relay assembly kit"

/decl/hierarchy/supply_pack/engineering/firefighter
Expand All @@ -235,16 +248,6 @@
/obj/item/clothing/head/hardhat/red,
/obj/item/scrubpack/standard,
/obj/item/tank/scrubber)
cost = 20
cost = 10
containertype = /obj/structure/closet/firecloset
containername = "fire-safety closet"

/decl/hierarchy/supply_pack/engineering/voidsuit_engineering
name = "EVA - Voidsuit, Engineering"
contains = list(/obj/item/clothing/suit/space/void/engineering/alt,
/obj/item/clothing/head/helmet/space/void/engineering/alt,
/obj/item/clothing/shoes/magboots)
cost = 120
containername = "engineering voidsuit crate"
containertype = /obj/structure/closet/crate/secure/large
access = access_engine
24 changes: 11 additions & 13 deletions code/datums/supplypacks/livecargo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,68 +33,66 @@
/decl/hierarchy/supply_pack/livecargo/spidercubes
name = "Inert - Spiders"
contains = list(/obj/item/storage/box/monkeycubes/spidercubes)
cost = 50
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "\improper Spiderling crate"
contraband = 1
security_level = null


//actual live animals
// Actual live animals

/decl/hierarchy/supply_pack/livecargo/corgi
name = "Live - Corgi"
contains = list()
cost = 50
cost = 10
containertype = /obj/structure/largecrate/animal/corgi
containername = "corgi crate"

/decl/hierarchy/supply_pack/livecargo/cat
name = "Live - Cat"
contains = list()
cost = 50
cost = 10
containertype = /obj/structure/largecrate/animal/cat
containername = "cat crate"

/decl/hierarchy/supply_pack/livecargo/snek
name = "Live - Snake"
contains = list()
cost = 25
cost = 10
containertype = /obj/structure/largecrate/animal/snek
containername = "snake crate"

//farm animals - useless and annoying, but potentially a good source of food. expensive because they're live animals and their produce is available cheaper
// Farm animals - useless and annoying, but potentially a good source of food.
/decl/hierarchy/supply_pack/livecargo/cow
name = "Live - Cow"
cost = 80
cost = 40
containertype = /obj/structure/largecrate/animal/cow
containername = "cow crate"
access = access_hydroponics

/decl/hierarchy/supply_pack/livecargo/goat
name = "Live - Goat"
cost = 75
cost = 40
containertype = /obj/structure/largecrate/animal/goat
containername = "goat crate"
access = access_hydroponics

/decl/hierarchy/supply_pack/livecargo/sheep
name = "Live - Sheep"
cost = 60
cost = 40
containertype = /obj/structure/largecrate/animal/sheep
containername = "sheep crate"
access = access_hydroponics

/decl/hierarchy/supply_pack/livecargo/goose
name = "Live - Goose"
cost = 75
cost = 20
containertype = /obj/structure/largecrate/animal/goose
containername = "goose containment unit"
access = access_hydroponics

/decl/hierarchy/supply_pack/livecargo/chicken
name = "Live - Chicken"
cost = 70
cost = 20
containertype = /obj/structure/largecrate/animal/chick
containername = "chicken crate"
access = access_hydroponics
25 changes: 23 additions & 2 deletions code/datums/supplypacks/operations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,43 @@
cost = 15
containername = "webbing crate"

// EVA
/decl/hierarchy/supply_pack/operations/voidsuit_mining
name = "EVA - Mining voidsuit"
contains = list(/obj/item/clothing/suit/space/void/mining,
/obj/item/clothing/head/helmet/space/void/mining,
/obj/item/clothing/shoes/magboots)
cost = 100
containername = "mining voidsuit crate"
containertype = /obj/structure/closet/crate/secure/large
access = access_mining

/decl/hierarchy/supply_pack/operations/voidsuit_engineering
name = "EVA - Engineering voidsuit"
contains = list(/obj/item/clothing/suit/space/void/engineering/alt,
/obj/item/clothing/head/helmet/space/void/engineering/alt,
/obj/item/clothing/shoes/magboots)
cost = 120
cost = 100
containername = "engineering voidsuit crate"
containertype = /obj/structure/closet/crate/secure/large
access = access_engine

/decl/hierarchy/supply_pack/operations/voidsuit_atmospherics
name = "EVA - Atmospherics voidsuit"
contains = list(/obj/item/clothing/suit/space/void/atmos/alt,
/obj/item/clothing/head/helmet/space/void/atmos/alt,
/obj/item/clothing/shoes/magboots)
cost = 100
containername = "atmospherics voidsuit crate"
containertype = /obj/structure/closet/crate/secure/large
access = access_atmospherics

/decl/hierarchy/supply_pack/operations/voidsuit_medical
name = "EVA - Medical voidsuit"
contains = list(/obj/item/clothing/suit/space/void/medical/alt,
/obj/item/clothing/head/helmet/space/void/medical/alt,
/obj/item/clothing/shoes/magboots)
cost = 120
cost = 100
containername = "medical voidsuit crate"
containertype = /obj/structure/closet/crate/secure/large
access = access_medical_equip
Expand Down
21 changes: 2 additions & 19 deletions code/datums/supplypacks/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,12 @@
containertype = /obj/structure/closet/crate/secure/weapon
containername = "energy sidearms crate"
access = access_armory
security_level = SUPPLY_SECURITY_ELEVATED

/decl/hierarchy/supply_pack/security/egun/shady
name = "Weapons - Energy sidearms (For disposal)"
name = "Weapons - Unlocked energy sidearms"
contains = list(/obj/item/gun/energy/gun = 4)
cost = 60
contraband = 1
security_level = null

/decl/hierarchy/supply_pack/security/ion
name = "Weapons - Electromagnetic"
Expand All @@ -153,7 +151,6 @@
containertype = /obj/structure/closet/crate/secure/weapon
containername = "electromagnetic weapons crate"
access = access_armory
security_level = SUPPLY_SECURITY_ELEVATED

/decl/hierarchy/supply_pack/security/shotgun
name = "Weapons - Shotgun"
Expand All @@ -162,7 +159,6 @@
containertype = /obj/structure/closet/crate/secure/weapon
containername = "shotgun crate"
access = access_armory
security_level = SUPPLY_SECURITY_ELEVATED

/decl/hierarchy/supply_pack/security/flashbang
name = "Weapons - Flashbangs"
Expand All @@ -188,7 +184,6 @@
containertype = /obj/structure/closet/crate/secure/weapon
containername = "lethal shotgun shells crate"
access = access_security
security_level = SUPPLY_SECURITY_ELEVATED

/decl/hierarchy/supply_pack/security/shotgunbeanbag
name = "Ammunition - Beanbag shells"
Expand All @@ -205,7 +200,6 @@
containertype = /obj/structure/closet/crate/secure/weapon
containername = "SMG ammunition crate"
access = access_security
security_level = SUPPLY_SECURITY_HIGH

/decl/hierarchy/supply_pack/security/pdwammorubber
name = "Ammunition - SMG top mounted rubber"
Expand All @@ -224,13 +218,12 @@
access = access_security

/decl/hierarchy/supply_pack/security/bullpupammo
name = "Ammunition - military rifle"
name = "Ammunition - bullpup assault rifle"
contains = list(/obj/item/ammo_magazine/mil_rifle = 4)
cost = 60
containertype = /obj/structure/closet/crate/secure/weapon
containername = "military rifle ammunition crate"
access = access_security
security_level = SUPPLY_SECURITY_HIGH

/decl/hierarchy/supply_pack/security/bullpupammopractice
name = "Ammunition - military rifle practice"
Expand Down Expand Up @@ -297,13 +290,3 @@
containertype = /obj/structure/closet/crate/secure
containername = "security biohazard gear crate"
access = access_security

/decl/hierarchy/supply_pack/security/voidsuit_security
name = "EVA - Security (armored) voidsuit"
contains = list(/obj/item/clothing/suit/space/void/security/alt,
/obj/item/clothing/head/helmet/space/void/security/alt,
/obj/item/clothing/shoes/magboots)
cost = 120
containername = "security voidsuit crate"
containertype = /obj/structure/closet/crate/secure/large
access = access_brig
Loading

0 comments on commit a642414

Please sign in to comment.