Skip to content

Commit

Permalink
Makes Ration Heaters smaller. (shiptest-ss13#3486)
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. -->

Edits ration heaters to be able to be put back inside of ration packs.

It's really, really annoying that you can take ration heaters OUT of
ration packs, but CANNOT put them back in. This fixes this by making
them both the same size as the rations themselves, and adding ration
heaters to the list of accepted items that can be put in ration packs.

:cl:
code: Changes flameless ration heaters to "small" items
code: Adds flameless ration heaters to the ration pack item whitelist.
/: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
Aquidu authored and MysticalFaceLesS committed Oct 21, 2024
1 parent 3f60e6c commit 7da3137
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
7 changes: 3 additions & 4 deletions code/game/objects/items/storage/ration.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 7
// [CELADON-EDIT] - CELADON_QOL
// STR.set_holdable(list(/obj/item/reagent_containers/food)) // CELADON-EDIT - ORIGINAL
STR.set_holdable(list(/obj/item/reagent_containers/food, /obj/item/ration_heater))
// [/CELADON-EDIT]
STR.set_holdable(list(
/obj/item/reagent_containers/food,
/obj/item/ration_heater))
STR.locked = TRUE
STR.locked_flavor = "sealed closed"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@
icon_state = "ration_heater"
grind_results = list(/datum/reagent/iron = 10, /datum/reagent/water = 10, /datum/reagent/consumable/sodiumchloride = 5)
heat = 3800
w_class = WEIGHT_CLASS_SMALL
var/obj/item/tocook = null
var/mutable_appearance/ration_overlay
var/uses = 3
Expand Down

0 comments on commit 7da3137

Please sign in to comment.