Skip to content

Commit

Permalink
granularizes a handfully of supply packs (#3044)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

granularizes a handful of tool and machine supply packs!
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Not everyone needs or can afford two pairs insulated gloves!
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
tweak: granularizes a handful of tool and machine supply packs!
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
FalloutFalcon authored Jun 2, 2024
1 parent a1c53bc commit 560a442
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 34 deletions.
25 changes: 10 additions & 15 deletions code/modules/cargo/packs/machinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,22 @@
/datum/supply_pack/machinery/thermomachine
name = "Thermomachine Crate"
desc = "Freeze or heat your air."
cost = 2000
contains = list(/obj/item/circuitboard/machine/thermomachine,
/obj/item/circuitboard/machine/thermomachine)
cost = 1000
contains = list(/obj/item/circuitboard/machine/thermomachine)
crate_name = "thermomachine crate"

/datum/supply_pack/machinery/portapump
name = "Portable Air Pump Crate"
desc = "Want to drain a room of air without losing a drop? We've got you covered. Contains two portable air pumps."
cost = 3000
contains = list(/obj/machinery/portable_atmospherics/pump,
/obj/machinery/portable_atmospherics/pump)
desc = "Want to drain a room of air without losing a drop? We've got you covered. Contains a portable air pump."
cost = 1500
contains = list(/obj/machinery/portable_atmospherics/pump)
crate_name = "portable air pump crate"

/datum/supply_pack/machinery/portascrubber
name = "Portable Scrubber Crate"
desc = "Clean up that pesky plasma leak with your very own set of two portable scrubbers."
cost = 3000
contains = list(/obj/machinery/portable_atmospherics/scrubber,
/obj/machinery/portable_atmospherics/scrubber)
desc = "Clean up that pesky plasma leak with your very own portable scrubber."
cost = 1500
contains = list(/obj/machinery/portable_atmospherics/scrubber)
crate_name = "portable scrubber crate"

/datum/supply_pack/machinery/hugescrubber
Expand Down Expand Up @@ -155,11 +152,9 @@

/datum/supply_pack/machinery/wall_shield_gen
name = "Shield Generator Crate"
desc = "These four shield wall generators are guaranteed to keep any unwanted lifeforms on the outside, where they belong! Not rated for containing singularities or tesla balls."
cost = 2000
desc = "These two shield wall generators are guaranteed to keep any unwanted lifeforms on the outside, where they belong! Not rated for containing singularities or tesla balls."
cost = 1000
contains = list(/obj/machinery/power/shieldwallgen,
/obj/machinery/power/shieldwallgen,
/obj/machinery/power/shieldwallgen,
/obj/machinery/power/shieldwallgen)
crate_name = "shield generators crate"
crate_type = /obj/structure/closet/crate/secure/plasma
Expand Down
3 changes: 1 addition & 2 deletions code/modules/cargo/packs/spacesuit_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
name = "Medical Hardsuit Crate"
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)
contains = list(/obj/item/clothing/suit/space/hardsuit/medical)
crate_name = "medical hardsuit crate"
crate_type = /obj/structure/closet/crate/medical

Expand Down
29 changes: 12 additions & 17 deletions code/modules/cargo/packs/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,11 @@
)
crate_name = "basic mining crate"

/datum/supply_pack/tools/jackhammers
/datum/supply_pack/tools/jackhammer
name = "Jackhammer Crate"
desc = "Contains two jackhammers, ideal for breaking rocks and breaking hull."
cost = 3500
contains = list(
/obj/item/pickaxe/drill/jackhammer,
/obj/item/pickaxe/drill/jackhammer,
)
desc = "Contains a jackhammer, ideal for breaking rocks and breaking hull."
cost = 1750
contains = list(/obj/item/pickaxe/drill/jackhammer)
crate_name = "jackhammer crate"


Expand All @@ -87,10 +84,9 @@

/datum/supply_pack/tools/insulated_gloves
name = "Insulated Gloves Crate"
desc = "The backbone of modern society. Barely ever ordered for actual engineering. Contains two insulated gloves."
cost = 1500
contains = list(/obj/item/clothing/gloves/color/yellow,
/obj/item/clothing/gloves/color/yellow)
desc = "The backbone of modern society. Barely ever ordered for actual engineering. Contains a pair of insulated gloves."
cost = 750
contains = list(/obj/item/clothing/gloves/color/yellow)
crate_name = "insulated gloves crate"

/datum/supply_pack/tools/jetpack
Expand All @@ -101,13 +97,12 @@
crate_name = "jetpack crate"
crate_type = /obj/structure/closet/crate/secure/plasma

/datum/supply_pack/tools/transfer_valves
/datum/supply_pack/tools/transfer_valve
name = "Tank Transfer Valves Crate"
desc = "The key ingredient for making a lot of people very angry very fast. Contains two tank transfer valves."
cost = 6000
contains = list(/obj/item/transfer_valve,
/obj/item/transfer_valve)
crate_name = "tank transfer valves crate"
desc = "The key ingredient for making a lot of people very angry very fast. Contains a tank transfer valve."
cost = 3000
contains = list(/obj/item/transfer_valve)
crate_name = "tank transfer valve crate"
crate_type = /obj/structure/closet/crate/secure/science

/*
Expand Down

0 comments on commit 560a442

Please sign in to comment.