From 48356af2b624732eb879c25140c63eb8e139ec8b Mon Sep 17 00:00:00 2001
From: Erika Fox <94164348+Bjarl@users.noreply.github.com>
Date: Tue, 15 Oct 2024 22:26:28 -0400
Subject: [PATCH] Removes South Bronx Paradise Bar (#3535)
## About The Pull Request
as title
## 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
## Changelog
:cl:
del: South Bronx Paradise Bar
/:cl:
---
code/datums/diseases/parasitic_infection.dm | 50 -------------------
.../food_and_drinks/food/snacks_vend.dm | 30 -----------
code/modules/vending/snack.dm | 2 +-
shiptest.dme | 1 -
4 files changed, 1 insertion(+), 82 deletions(-)
delete mode 100644 code/datums/diseases/parasitic_infection.dm
diff --git a/code/datums/diseases/parasitic_infection.dm b/code/datums/diseases/parasitic_infection.dm
deleted file mode 100644
index 055425d9cc6f..000000000000
--- a/code/datums/diseases/parasitic_infection.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-/datum/disease/parasite
- form = "Parasite"
- name = "Parasitic Infection"
- max_stages = 4
- cure_text = "Surgical removal of the liver."
- agent = "Consuming Live Parasites"
- spread_text = "Non-Biological"
- viable_mobtypes = list(/mob/living/carbon/human)
- permeability_mod = 1
- desc = "If left untreated the subject will passively lose nutrients, and eventually lose their liver."
- severity = DISEASE_SEVERITY_HARMFUL
- disease_flags = CAN_CARRY|CAN_RESIST
- spread_flags = DISEASE_SPREAD_NON_CONTAGIOUS
- required_organs = list(/obj/item/organ/liver)
- bypasses_immunity = TRUE
-
-/datum/disease/parasite/stage_act()
- . = ..()
- var/mob/living/carbon/C = affected_mob
- var/obj/item/organ/liver/L = C.getorgan(/obj/item/organ/liver)
- if(!L)
- src.cure()
- C.visible_message("[C]'s liver is covered in tiny larva! They quickly shrivel and die after being exposed to the open air.")
- switch(stage)
- if(1)
- if(prob(5))
- affected_mob.emote("cough")
- if(2)
- if(prob(10))
- if(prob(50))
- to_chat(affected_mob, "You feel the weight loss already!")
- affected_mob.adjust_nutrition(-3)
- if(3)
- if(prob(20))
- if(prob(20))
- to_chat(affected_mob, "You're... REALLY starting to feel the weight loss.")
- affected_mob.adjust_nutrition(-6)
- if(4)
- if(prob(30))
- if(affected_mob.nutrition >= 100)
- if(prob(10))
- to_chat(affected_mob, "You feel like your body's shedding weight rapidly!")
- affected_mob.adjust_nutrition(-12)
- else
- var/turf/T = get_turf(C)
- to_chat(affected_mob, "You feel much, MUCH lighter!")
- affected_mob.vomit(20, TRUE)
- L.Remove(C)
- L.forceMove(T)
- src.cure()
diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm
index b071add1027a..9d6470f5aec4 100644
--- a/code/modules/food_and_drinks/food/snacks_vend.dm
+++ b/code/modules/food_and_drinks/food/snacks_vend.dm
@@ -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, "Geeze, you need to get to get your eyes checked. You should look again...")
- 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"
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index 45d76a4754fa..cb9b6b1b9d95 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -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
diff --git a/shiptest.dme b/shiptest.dme
index 3b8fff05dd64..3166afb77a2a 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -618,7 +618,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"