Skip to content

Commit

Permalink
Fixes Sealed Food Inheritance (#6059)
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

1. **Fixes Inheritance of Sealed Traits.**

## Why It's Good For The Game

1. _Whoops. When I abstracted these types I forgot to put the traits
that affect the sealed foods on the abstract._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: Fixes Inheritance of Sealed Traits.
/: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
Captain277 authored Oct 9, 2023
1 parent 9ef47a6 commit 8911e50
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions code/modules/food/food/snacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6784,6 +6784,9 @@ END CITADEL CHANGE */
/obj/item/reagent_containers/food/snacks/wrapped/candy // Buff 4 >> 8
name = "ABSTRACT"
desc = "You shouldn't be seeing this. Contact an admin!"
sealed = TRUE
custom_open_sound = 'sound/effects/pageturn2.ogg'
open_message = "You peel back the wrapping!"

/obj/item/reagent_containers/food/snacks/wrapped/candy // Buff 4 >> 8
name = "candy"
Expand All @@ -6793,9 +6796,6 @@ END CITADEL CHANGE */
filling_color = "#7D5F46"
nutriment_amt = 3
nutriment_desc = list("candy" = 1)
sealed = TRUE
custom_open_sound = 'sound/effects/pageturn2.ogg'
open_message = "You peel back the wrapping!"

/obj/item/reagent_containers/food/snacks/wrapped/candy/Initialize(mapload)
. = ..()
Expand Down Expand Up @@ -6902,6 +6902,9 @@ END CITADEL CHANGE */
/obj/item/reagent_containers/food/snacks/bagged // Buff 3 >> 5
name = "ABSTRACT"
desc = "You shouldn't be seeing this. Contact an admin!"
sealed = TRUE
custom_open_sound = 'sound/bureaucracy/papercrumple.ogg'
open_message = "You pull the package open!"

/obj/item/reagent_containers/food/snacks/bagged/chips // Buff 3 >> 5
name = "chips"
Expand All @@ -6911,9 +6914,6 @@ END CITADEL CHANGE */
filling_color = "#E8C31E"
nutriment_amt = 5
nutriment_desc = list("salt" = 1, "chips" = 2)
sealed = TRUE
custom_open_sound = 'sound/bureaucracy/papercrumple.ogg'
open_message = "You pull the package open!"

/obj/item/reagent_containers/food/snacks/bagged/chips/Initialize(mapload)
. = ..()
Expand Down Expand Up @@ -6962,6 +6962,9 @@ END CITADEL CHANGE */
/obj/item/reagent_containers/food/snacks/boxed // Buff 3 >> 5
name = "ABSTRACT"
desc = "You shouldn't be seeing this. Contact an admin!"
sealed = TRUE
custom_open_sound = 'sound/misc/boxopen.ogg'
open_message = "You pop open the box!"

/obj/item/reagent_containers/food/snacks/boxed/no_raisin // Buff 6 >> 12
name = "4no Raisins"
Expand All @@ -6971,9 +6974,6 @@ END CITADEL CHANGE */
filling_color = "#343834"
nutriment_amt = 12
nutriment_desc = list("dried raisins" = 6)
sealed = TRUE
custom_open_sound = 'sound/misc/boxopen.ogg'
open_message = "You pop open the box!"

/obj/item/reagent_containers/food/snacks/boxed/no_raisin/Initialize(mapload)
. = ..()
Expand Down

0 comments on commit 8911e50

Please sign in to comment.