diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm index e977f17a481..d992c6be9ea 100644 --- a/code/datums/supplypacks/atmospherics.dm +++ b/code/datums/supplypacks/atmospherics.dm @@ -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) diff --git a/code/datums/supplypacks/engineering.dm b/code/datums/supplypacks/engineering.dm index f44925a9da9..e2d566eef31 100644 --- a/code/datums/supplypacks/engineering.dm +++ b/code/datums/supplypacks/engineering.dm @@ -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 @@ -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 @@ -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 @@ -128,7 +141,7 @@ /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 @@ -136,7 +149,7 @@ /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 @@ -144,7 +157,7 @@ /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 @@ -152,7 +165,7 @@ /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 @@ -160,7 +173,7 @@ /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 @@ -168,7 +181,7 @@ /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 @@ -176,7 +189,7 @@ /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 @@ -184,7 +197,7 @@ /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 @@ -192,7 +205,7 @@ /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" @@ -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 @@ -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 diff --git a/code/datums/supplypacks/livecargo.dm b/code/datums/supplypacks/livecargo.dm index 3706a9690f4..edf7a9f2798 100644 --- a/code/datums/supplypacks/livecargo.dm +++ b/code/datums/supplypacks/livecargo.dm @@ -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 diff --git a/code/datums/supplypacks/operations.dm b/code/datums/supplypacks/operations.dm index ee9efdb0cf2..9df1ca68884 100644 --- a/code/datums/supplypacks/operations.dm +++ b/code/datums/supplypacks/operations.dm @@ -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 diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index b8a32804bc2..f9307a6cf4a 100644 --- a/code/datums/supplypacks/security.dm +++ b/code/datums/supplypacks/security.dm @@ -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" @@ -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" @@ -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" @@ -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" @@ -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" @@ -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" @@ -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 diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index b93d70a0341..6786e6be8e2 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -98,14 +98,14 @@ /obj/item/gun/projectile/automatic/assault_rifle name = "assault rifle" - desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Originally produced by Hephaestus. The serial number has been scratched off." + desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Originally produced by Hephaestus." icon = 'icons/obj/guns/assault_rifle.dmi' icon_state = "arifle" item_state = null w_class = ITEM_SIZE_HUGE force = 10 caliber = CALIBER_RIFLE - origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ESOTERIC = 5) + origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3, TECH_ESOTERIC = 3) slot_flags = SLOT_BACK load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/rifle diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index b4a3b73c11f..17f6e53e8ca 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -42,7 +42,7 @@ icon = 'icons/obj/guns/military_pistol2.dmi' icon_state = "military-alt" safety_icon = "safety" - origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2, TECH_ESOTERIC = 8) + origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3, TECH_ESOTERIC = 2) fire_delay = 5 /obj/item/gun/projectile/pistol/sec diff --git a/maps/intrepid/supplypacks/marine.dm b/maps/intrepid/supplypacks/marine.dm index 7178a8d86bc..b2ec2eb1ecd 100644 --- a/maps/intrepid/supplypacks/marine.dm +++ b/maps/intrepid/supplypacks/marine.dm @@ -1,12 +1,53 @@ /decl/hierarchy/supply_pack/marine name = "Marine Corps" -/decl/hierarchy/supply_pack/marine/bullpupammo - name = "Ammunition - military rifle" +// Weapons and ammo +/decl/hierarchy/supply_pack/marine/assault_rifle + name = "Weapons - Assault rifle" + contains = list(/obj/item/gun/projectile/automatic/assault_rifle = 1) + cost = 200 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "assault rifle crate" + access = access_marine + +/decl/hierarchy/supply_pack/marine/assault_ammo + name = "Ammunition - Assault rifle" + contains = list(/obj/item/ammo_magazine/rifle = 4) + cost = 80 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "assault rifle ammunition crate" + access = access_marine + +/decl/hierarchy/supply_pack/marine/bullpup_rifle + name = "Weapons - Bullpup assault rifle" + contains = list(/obj/item/gun/projectile/automatic/bullpup_rifle = 1) + cost = 100 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "bullpup assault rifle crate" + access = access_marine + +/decl/hierarchy/supply_pack/marine/bullpup_ammo + name = "Ammunition - Bullpup assault rifle" contains = list(/obj/item/ammo_magazine/mil_rifle = 4) - cost = 60 + cost = 40 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "bullpup assault rifle ammunition crate" + access = access_marine + +/decl/hierarchy/supply_pack/marine/pistol + name = "Weapons - Military pistol" + contains = list(/obj/item/gun/projectile/pistol/military/alt = 1) + cost = 80 containertype = /obj/structure/closet/crate/secure/weapon - containername = "military rifle ammunition crate" + containername = "military pistol crate" + access = access_marine + +/decl/hierarchy/supply_pack/marine/pistol_ammo + name = "Ammunition - Military pistol" + contains = list(/obj/item/ammo_magazine/pistol/double = 4) + cost = 20 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "military pistol ammunition crate" access = access_marine /decl/hierarchy/supply_pack/marine/frags @@ -24,3 +65,32 @@ containertype = /obj/structure/closet/crate/secure/weapon containername = "explosive weaponry crate" access = access_marine + +// Colony building stuff +/decl/hierarchy/supply_pack/marine/colony_kit + name = "Equipment - Colonization kit" + contains = list( + /obj/item/stock_parts/circuitboard/smes, + /obj/item/stock_parts/smes_coil, + /obj/item/rcd = 2, + /obj/item/rcd_ammo/large = 10, + /obj/item/storage/belt/utility/full = 3, + /obj/item/storage/toolbox/electrical = 2, + /obj/item/clothing/gloves/insulated = 2, + /obj/item/cell/high = 5, + /obj/item/solar_assembly = 14, + /obj/item/stock_parts/circuitboard/solar_control, + /obj/item/tracker_electronics, + /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, + /obj/item/stack/material/steel/fifty = 6, + /obj/item/stack/material/aluminium/fifty = 6, + /obj/item/stack/material/glass/reinforced/fifty = 6, + ) + cost = 300 + containertype = /obj/structure/largecrate + containername = "colonization kit"