Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Granularizes the space suits and armor tab in Outpost cargo, and reduces the cost of specialized space suits #2894

Merged
merged 2 commits into from
Apr 16, 2024
Merged

Granularizes the space suits and armor tab in Outpost cargo, and reduces the cost of specialized space suits #2894

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ecab51
Granularizes suits, reduces costs
Gristlebee Apr 13, 2024
130af1e
Granularizes armor
Gristlebee Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 32 additions & 56 deletions code/modules/cargo/packs/spacesuit_armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,32 @@

/datum/supply_pack/spacesuit_armor/spacesuit
name = "Space Suit Crate"
desc = "Contains three basic space suits. Although the technology is centuries old, they should protect you from the vacuum of space."
cost = 1500
desc = "Contains one basic space suit. Although the technology is centuries old, it should protect you from the vacuum of space."
cost = 500
contains = list(/obj/item/clothing/suit/space,
/obj/item/clothing/suit/space,
/obj/item/clothing/suit/space,
/obj/item/clothing/head/helmet/space,
/obj/item/clothing/head/helmet/space,
/obj/item/clothing/head/helmet/space)
crate_name = "space suit crate"

/datum/supply_pack/spacesuit_armor/pilot_spacesuit
name = "Pilot Space Suit Crate"
desc = "Two pilot space suits, for improved mobility in mechs and pods."
cost = 3500
desc = "One pilot space suit, for improved mobility in mechs."
cost = 750
contains = list(/obj/item/clothing/suit/space/pilot,
/obj/item/clothing/suit/space/pilot,
/obj/item/clothing/head/helmet/space/pilot/random,
/obj/item/clothing/head/helmet/space/pilot/random)
crate_name = "pilot space suit crate"

/datum/supply_pack/spacesuit_armor/mining_hardsuits_indie
name = "Mining Hardsuit Crate"
desc = "Two independent branded mining hardsuits for when explorer suits just dont cut it."
cost = 4000
contains = list(/obj/item/clothing/suit/space/hardsuit/mining/independent,
/obj/item/clothing/suit/space/hardsuit/mining/independent)
desc = "One independent branded mining hardsuit for when explorer suits just dont cut it."
cost = 1500
contains = list(/obj/item/clothing/suit/space/hardsuit/mining/independent)
crate_name = "mining hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/plasma

/datum/supply_pack/spacesuit_armor/med_hardsuit
name = "Medical Hardsuit Crate"
desc = "Two medical hardsuits, resistant to diseases and useful for retrieving patients in space."
cost = 5000
desc = "One medical hardsuit, resistant to diseases and useful for retrieving patients in space."
cost = 1500
contains = list(/obj/item/clothing/suit/space/hardsuit/medical,
/obj/item/clothing/suit/space/hardsuit/medical)
crate_name = "medical hardsuit crate"
Expand All @@ -49,61 +42,51 @@
/datum/supply_pack/spacesuit_armor/mining_hardsuit_heavy
name = "Heavy Mining Hardsuit Crate"
desc = "One deluxe heavy mining hardsuit for dangerous frontier operations. Comes with a pair of EXOCOM jet boots."
cost = 6000
cost = 3500
contains = list(/obj/item/clothing/suit/space/hardsuit/mining/heavy,
/obj/item/clothing/shoes/bhop)
crate_name = "heavy mining hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/plasma

/datum/supply_pack/spacesuit_armor/sec_hardsuit_bundle
name = "Security Hardsuit Crate"
desc = "Contains two security hardsuits for light combat duty."
cost = 7500
contains = list(/obj/item/clothing/suit/space/hardsuit/security/independent,
/obj/item/clothing/suit/space/hardsuit/security/independent)
desc = "Contains one security hardsuit for light combat duty."
cost = 2500
contains = list(/obj/item/clothing/suit/space/hardsuit/security/independent)
crate_name = "security hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/gear

/datum/supply_pack/spacesuit_armor/sci_hardsuit
name = "Science Hardsuit Crate"
desc = "Contains two science hardsuits, designed to provide safety under advanced experimental conditions."
cost = 8500
contains = list(/obj/item/clothing/suit/space/hardsuit/rd,
/obj/item/clothing/suit/space/hardsuit/rd)
desc = "Contains one science hardsuit, designed to provide safety under advanced experimental conditions."
cost = 2000
contains = list(/obj/item/clothing/suit/space/hardsuit/rd)
crate_name = "science hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/science

/datum/supply_pack/spacesuit_armor/engi_spacesuit_bundle
name = "Engineering Space Suit Crate"
desc = "Need to turn your ship into a safety hazard? Not a problem! These three engineering space suits will help get the job done."
cost = 9000
desc = "Need to turn your ship into a safety hazard? Not a problem! This engineering space suit will help get the job done."
cost = 1500
contains = list(/obj/item/clothing/suit/space/engineer,
/obj/item/clothing/suit/space/engineer,
/obj/item/clothing/suit/space/engineer,
/obj/item/clothing/head/helmet/space/light/engineer,
/obj/item/clothing/head/helmet/space/light/engineer,
/obj/item/clothing/head/helmet/space/light/engineer)
crate_name = "engineering space suit crate"
crate_type = /obj/structure/closet/crate/secure/engineering

/datum/supply_pack/spacesuit_armor/atmos_hardsuit
name = "Atmospherics Hardsuit Crate"
desc = "The iconic hardsuit of Nanotrasen's Atmosphere Corps, these two hardsuits are known across space as a symbol of defiance in the face of sudden decompression. Smells faintly of plasma."
cost = 12000
contains = list(/obj/item/clothing/suit/space/hardsuit/engine/atmos,
/obj/item/clothing/suit/space/hardsuit/engine/atmos)
desc = "The iconic hardsuit of Nanotrasen's Atmosphere Corps, this hardsuit is known across space as a symbol of defiance in the face of sudden decompression. Smells faintly of plasma."
cost = 2500
contains = list(/obj/item/clothing/suit/space/hardsuit/engine/atmos)
crate_name = "atmospherics hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/engineering

/datum/supply_pack/spacesuit_armor/swat
name = "SWAT Crate"
desc = "Contains two fullbody sets of tough, fireproof, pressurized suits designed in a joint effort by IS-ERI and Nanotrasen. Each set contains a suit, helmet, and combat belt."
cost = 12000
desc = "Contains one fullbody set of tough, fireproof, pressurized suit designed in a joint effort by IS-ERI and Nanotrasen. The set contains a suit, helmet, and combat belt."
cost = 3500
contains = list(/obj/item/clothing/head/helmet/swat/nanotrasen,
/obj/item/clothing/head/helmet/swat/nanotrasen,
/obj/item/clothing/suit/space/swat,
/obj/item/clothing/suit/space/swat,
/obj/item/storage/belt/military/assault,
/obj/item/storage/belt/military/assault)
crate_name = "swat crate"
crate_type = /obj/structure/closet/crate/secure/gear
Expand All @@ -114,42 +97,35 @@

/datum/supply_pack/spacesuit_armor/basic_armor
name = "Armor Crate"
desc = "Two sets of well-rounded body armor. Each set includes a helmet and vest."
cost = 1500
desc = "One set of well-rounded body armor. The set includes a helmet and vest."
cost = 750
contains = list(/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/head/helmet/sec,
/obj/item/clothing/head/helmet/sec)
crate_name = "armor crate"
crate_type = /obj/structure/closet/crate/secure/plasma

/datum/supply_pack/spacesuit_armor/riot_armor
name = "Riot Armor Crate"
desc = "Contains two full sets of riot armor. Although heavily padded to deal with close-quarters threats, they perform poorly against most firearms."
cost = 3000
desc = "Contains one full set of riot armor. Although heavily padded to deal with close-quarters threats, they perform poorly against most firearms."
cost = 1500
contains = list(/obj/item/clothing/suit/armor/riot,
/obj/item/clothing/suit/armor/riot,
/obj/item/clothing/head/helmet/riot,
/obj/item/clothing/head/helmet/riot)
crate_name = "riot armor crate"
crate_type = /obj/structure/closet/crate/secure/plasma

/datum/supply_pack/spacesuit_armor/bullet_armor
name = "Bulletproof Armor Crate"
desc = "Contains two full sets of bulletproof armor, guaranteed to reduce a bullet's stopping power by half but with limited protection against melee weaponry."
cost = 3500
desc = "Contains one full set of bulletproof armor, guaranteed to reduce a bullet's stopping power by half but with limited protection against melee weaponry."
cost = 1750
contains = list(/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/head/helmet/bulletproof,
/obj/item/clothing/head/helmet/bulletproof)
crate_name = "bulletproof armor crate"
crate_type = /obj/structure/closet/crate/secure/plasma

/datum/supply_pack/spacesuit_armor/laser_armor
name = "Reflector Vest Crate"
desc = "Contains two vests of highly reflective material. Each armor piece diffuses a laser's energy by over half, as well as offering a good chance to reflect the laser entirely."
cost = 3000
contains = list(/obj/item/clothing/suit/armor/laserproof,
/obj/item/clothing/suit/armor/laserproof)
desc = "Contains one vest made of highly reflective material. The armor piece diffuses a laser's energy by over half, as well as offering a good chance to reflect the laser entirely."
cost = 1500
contains = list(/obj/item/clothing/suit/armor/laserproof)
crate_name = "reflector vest crate"
crate_type = /obj/structure/closet/crate/secure/plasma
Loading