Skip to content

Commit

Permalink
Removes South Bronx Paradise Bar (shiptest-ss13#3535)
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
as title
<!-- 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
As funny as it is I think it's kinda mean to have a trap item just.
Right there
<!-- 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:
del: South Bronx Paradise Bar
/: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
Erikafox authored and zimon9 committed Oct 29, 2024
1 parent f2e4327 commit 2166b36
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 82 deletions.
50 changes: 0 additions & 50 deletions code/datums/diseases/parasitic_infection.dm

This file was deleted.

30 changes: 0 additions & 30 deletions code/modules/food_and_drinks/food/snacks_vend.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,6 @@
/*food_flags = FOOD_FINGER_FOOD*/
w_class = WEIGHT_CLASS_TINY

/obj/item/reagent_containers/food/snacks/candy/bronx
name = "South Bronx Paradise bar"
desc = "Lose weight, guaranteed! Caramel Mocha Flavor. Something about product consumption..."
icon_state = "bronx"
item_state = "candy"
trash = /obj/item/trash/candy
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/yuck = 1)
junkiness = 10
bitesize = 10
filling_color = "#e4d4b7"
tastes = list("candy" = 5, "weight loss" = 4, "insect larva" = 1)
foodtype = JUNKFOOD | RAW | GROSS
custom_premium_price = 800
var/revelation = FALSE

/obj/item/reagent_containers/food/snacks/candy/bronx/On_Consume(mob/living/eater)
. = ..()
if(ishuman(eater))
var/mob/living/carbon/human/carl = eater
var/datum/disease/P = new /datum/disease/parasite()
carl.ForceContractDisease(P, FALSE, TRUE)

/obj/item/reagent_containers/food/snacks/candy/bronx/examine(mob/user)
. = ..()
if(revelation == FALSE)
to_chat(user, "<span class='notice'>Geeze, you need to get to get your eyes checked. You should look again...</span>")
desc = "Lose weight, guaranteed! Caramel Mocha Flavor! WARNING: PRODUCT NOT FIT FOR HUMAN CONSUMPTION. CONTAINS LIVE DIAMPHIDIA SPECIMENS."
name = "South Bronx Parasite bar"
revelation = TRUE

/obj/item/reagent_containers/food/snacks/sosjerky
name = "\improper Scaredy's Private Reserve Beef Jerky"
icon_state = "sosjerky"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vending/snack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/obj/item/storage/box/gum = 3,
/obj/item/reagent_containers/food/snacks/energybar = 6,
/obj/item/reagent_containers/food/snacks/syndicake = 6,
/obj/item/reagent_containers/food/snacks/candy/bronx = 1)
)
refill_canister = /obj/item/vending_refill/snack
canload_access_list = list(ACCESS_KITCHEN)
default_price = 60
Expand Down
1 change: 0 additions & 1 deletion shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,6 @@
#include "code\datums\diseases\heart_failure.dm"
#include "code\datums\diseases\legionvirus.dm"
#include "code\datums\diseases\magnitis.dm"
#include "code\datums\diseases\parasitic_infection.dm"
#include "code\datums\diseases\parrotpossession.dm"
#include "code\datums\diseases\pierrot_throat.dm"
#include "code\datums\diseases\retrovirus.dm"
Expand Down

0 comments on commit 2166b36

Please sign in to comment.