Merge pull request #10364 from Allfd/nofunallowed

Remove fart based mechanics
This commit is contained in:
variableundefined
2018-12-24 09:13:47 +08:00
committed by GitHub
18 changed files with 5 additions and 161 deletions
@@ -444,8 +444,6 @@
taste_message = "eggs"
/datum/reagent/consumable/egg/on_mob_life(mob/living/M)
if(prob(8))
M.emote("fart")
if(prob(3))
M.reagents.add_reagent("cholesterol", rand(1,2))
..()
@@ -644,8 +642,6 @@
taste_message = "burritos"
/datum/reagent/consumable/beans/on_mob_life(mob/living/M)
if(prob(10))
M.emote("fart")
return ..()
/datum/reagent/consumable/bread
@@ -844,13 +844,6 @@
/datum/reagent/medicine/insulin/on_mob_life(mob/living/M)
M.reagents.remove_reagent("sugar", 5)
..()
/datum/reagent/medicine/simethicone
name = "Simethicone"
id = "simethicone"
description = "This strange liquid seems to have no bubbles on the surface."
color = "#14AA46"
/datum/reagent/medicine/teporone
name = "Teporone"
@@ -366,31 +366,6 @@
to_chat(H, "<span class='notice'>Hair bursts forth from your every follicle!")
..()
/datum/reagent/fartonium
name = "Fartonium"
id = "fartonium"
description = "Oh god it never ends, IT NEVER STOPS!"
reagent_state = GAS
color = "#D06E27"
taste_message = "mexican cuisine"
/datum/reagent/fartonium/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(66))
M.emote("fart")
if(holder.has_reagent("simethicone"))
if(prob(25))
to_chat(M, "<span class='danger'>[pick("Oh god, something doesn't feel right!", "IT HURTS!", "FUCK!", "Something is seriously wrong!", "THE PAIN!", "You feel like you're gonna die!")]</span>")
update_flags |= M.adjustBruteLoss(1, FALSE)
if(prob(10))
M.custom_emote(1,"strains, but nothing happens.")
update_flags |= M.adjustBruteLoss(2, FALSE)
if(prob(5))
M.emote("scream")
update_flags |= M.adjustBruteLoss(4, FALSE)
return ..() | update_flags
/datum/reagent/hugs
name = "Pure hugs"
id = "hugs"
@@ -225,13 +225,6 @@
mix_message = "A minty and refreshing smell drifts from the effervescent mixture."
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/simethicone
name = "simethicone"
id = "simethicone"
result = "simethicone"
required_reagents = list("hydrogen" = 1, "chlorine" = 1, "silicon" = 1, "oxygen" = 1)
result_amount = 4
/datum/chemical_reaction/teporone
name = "Teporone"
id = "teporone"
@@ -239,14 +239,6 @@
result_amount = 3
mix_message = "The liquid becomes amazingly furry and smells peculiar."
/datum/chemical_reaction/fartonium
name = "Fartonium"
id = "fartonium"
result = "fartonium"
required_reagents = list("fake_cheese" = 1, "beans" = 1, "????" = 1, "egg" = 1)
result_amount = 2
mix_message = "The substance makes a little 'toot' noise and starts to smell pretty bad."
/datum/chemical_reaction/soapification
name = "Soapification"
id = "soapification"