mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Remove fartbased everything
This commit is contained in:
Alffd
@@ -56,11 +56,11 @@
|
||||
|
||||
// Goon muts
|
||||
#define OBESITY 200 // Decreased metabolism
|
||||
#define TOXIC_FARTS 201 // Duh
|
||||
// 201 undefined
|
||||
#define STRONG 202 // (Nothing)
|
||||
#define SOBER 203 // Increased alcohol metabolism
|
||||
#define PSY_RESIST 204 // Block remoteview
|
||||
#define SUPER_FART 205 // Duh
|
||||
// 205 undefined
|
||||
#define EMPATH 206 //Read minds
|
||||
#define COMIC 207 //Comic Sans
|
||||
|
||||
|
||||
@@ -41,7 +41,6 @@ var/FATBLOCK = 0
|
||||
var/CHAVBLOCK = 0
|
||||
var/SWEDEBLOCK = 0
|
||||
var/SCRAMBLEBLOCK = 0
|
||||
var/TOXICFARTBLOCK = 0
|
||||
var/STRONGBLOCK = 0
|
||||
var/HORNSBLOCK = 0
|
||||
var/COMICBLOCK = 0
|
||||
@@ -55,7 +54,6 @@ var/CRYOBLOCK = 0
|
||||
var/EATBLOCK = 0
|
||||
var/JUMPBLOCK = 0
|
||||
var/EMPATHBLOCK = 0
|
||||
var/SUPERFARTBLOCK = 0
|
||||
var/IMMOLATEBLOCK = 0
|
||||
var/POLYMORPHBLOCK = 0
|
||||
|
||||
|
||||
@@ -182,18 +182,6 @@
|
||||
rearranged += cword
|
||||
return "[prefix][uppertext(jointext(rearranged," "))]!!"
|
||||
|
||||
// WAS: /datum/bioEffect/toxic_farts
|
||||
/datum/dna/gene/disability/toxic_farts
|
||||
name = "Toxic Farts"
|
||||
desc = "Causes the subject's digestion to create a significant amount of noxious gas."
|
||||
activation_message = "Your stomach grumbles unpleasantly."
|
||||
deactivation_message = "Your stomach stops acting up. Phew!"
|
||||
mutation = TOXIC_FARTS
|
||||
|
||||
/datum/dna/gene/disability/toxic_farts/New()
|
||||
..()
|
||||
block=TOXICFARTBLOCK
|
||||
|
||||
//////////////////
|
||||
// USELESS SHIT //
|
||||
//////////////////
|
||||
|
||||
@@ -615,54 +615,3 @@
|
||||
else if(prob(5) || M.mind.assigned_role=="Chaplain")
|
||||
to_chat(M, "<span class='warning'>You sense someone intruding upon your thoughts...</span>")
|
||||
return
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// WAS: /datum/bioEffect/superfart
|
||||
/datum/dna/gene/basic/grant_spell/superfart
|
||||
name = "High-Pressure Intestines"
|
||||
desc = "Vastly increases the gas capacity of the subject's digestive tract."
|
||||
activation_messages = list("You feel bloated and gassy.")
|
||||
deactivation_messages = list("You no longer feel gassy. What a relief!")
|
||||
instability = GENE_INSTABILITY_MINOR
|
||||
mutation = SUPER_FART
|
||||
spelltype = /obj/effect/proc_holder/spell/aoe_turf/superfart
|
||||
|
||||
/datum/dna/gene/basic/grant_spell/superfart/New()
|
||||
..()
|
||||
block = SUPERFARTBLOCK
|
||||
|
||||
/obj/effect/proc_holder/spell/aoe_turf/superfart
|
||||
name = "Super Fart"
|
||||
desc = "Fart with the fury of 1000 burritos."
|
||||
panel = "Abilities"
|
||||
charge_max = 900
|
||||
invocation_type = "emote"
|
||||
range = 3
|
||||
clothes_req = 0
|
||||
selection_type = "view"
|
||||
action_icon_state = "superfart"
|
||||
|
||||
/obj/effect/proc_holder/spell/aoe_turf/superfart/invocation(mob/user = usr)
|
||||
invocation = "<span class='warning'>[user] hunches down and grits [user.p_their()] teeth!</span>"
|
||||
invocation_emote_self = "<span class='warning'>You hunch down and grit your teeth!</span>"
|
||||
..(user)
|
||||
|
||||
/obj/effect/proc_holder/spell/aoe_turf/superfart/cast(list/targets, mob/user)
|
||||
var/UT = get_turf(user)
|
||||
if(do_after(user, 30, target = user))
|
||||
var/fartsize = pick("tremendous","gigantic","colossal")
|
||||
playsound(UT, 'sound/goonstation/effects/superfart.ogg', 50, 0)
|
||||
user.visible_message("<span class='warning'><b>[user]</b> unleashes a [fartsize] fart!</span>", "<span class='warning'>You hear a [fartsize] fart.</span>")
|
||||
for(var/T in targets)
|
||||
for(var/mob/living/M in T)
|
||||
shake_camera(M, 10, 5)
|
||||
if(M == user)
|
||||
continue
|
||||
to_chat(M, "<span class='warning'>You are sent flying!</span>")
|
||||
M.Weaken(5)
|
||||
step_away(M, UT, 15)
|
||||
step_away(M, UT, 15)
|
||||
step_away(M, UT, 15)
|
||||
else
|
||||
to_chat(user, "<span class='warning'>You were interrupted and couldn't fart! Rude!</span>")
|
||||
|
||||
@@ -74,7 +74,6 @@
|
||||
CHAVBLOCK = getAssignedBlock("CHAV", numsToAssign)
|
||||
SWEDEBLOCK = getAssignedBlock("SWEDE", numsToAssign)
|
||||
SCRAMBLEBLOCK = getAssignedBlock("SCRAMBLE", numsToAssign)
|
||||
TOXICFARTBLOCK = getAssignedBlock("TOXICFART", numsToAssign, good=1)
|
||||
STRONGBLOCK = getAssignedBlock("STRONG", numsToAssign, good=1)
|
||||
HORNSBLOCK = getAssignedBlock("HORNS", numsToAssign)
|
||||
COMICBLOCK = getAssignedBlock("COMIC", numsToAssign)
|
||||
@@ -89,7 +88,6 @@
|
||||
JUMPBLOCK = getAssignedBlock("JUMP", numsToAssign, DNA_HARD_BOUNDS, good=1)
|
||||
IMMOLATEBLOCK = getAssignedBlock("IMMOLATE", numsToAssign)
|
||||
EMPATHBLOCK = getAssignedBlock("EMPATH", numsToAssign, DNA_HARD_BOUNDS, good=1)
|
||||
SUPERFARTBLOCK = getAssignedBlock("SUPERFART", numsToAssign, DNA_HARDER_BOUNDS, good=1)
|
||||
POLYMORPHBLOCK = getAssignedBlock("POLYMORPH", numsToAssign, DNA_HARDER_BOUNDS, good=1)
|
||||
|
||||
//
|
||||
|
||||
@@ -134,12 +134,6 @@
|
||||
log_name = "RP"
|
||||
category = "Defensive"
|
||||
|
||||
/datum/spellbook_entry/rathens
|
||||
name = "Rathen's Secret"
|
||||
spell_type = /obj/effect/proc_holder/spell/targeted/rathens
|
||||
log_name = "RS"
|
||||
category = "Defensive"
|
||||
|
||||
/datum/spellbook_entry/timestop
|
||||
name = "Time Stop"
|
||||
spell_type = /obj/effect/proc_holder/spell/aoe_turf/conjure/timestop
|
||||
|
||||
@@ -70,9 +70,6 @@
|
||||
H.dna.SetSEState(JUMPBLOCK, TRUE)
|
||||
genemutcheck(H, JUMPBLOCK, null, MUTCHK_FORCED)
|
||||
|
||||
H.dna.SetSEState(SUPERFARTBLOCK, TRUE)
|
||||
genemutcheck(H, SUPERFARTBLOCK, null, MUTCHK_FORCED)
|
||||
|
||||
H.dna.SetSEState(IMMOLATEBLOCK, TRUE)
|
||||
genemutcheck(H, IMMOLATEBLOCK, null, MUTCHK_FORCED)
|
||||
|
||||
|
||||
@@ -832,11 +832,7 @@
|
||||
message = "<span class='danger'><b>[src]</b> snaps [p_their()] fingers right off!</span>"
|
||||
playsound(loc, 'sound/effects/snap.ogg', 50, 1)
|
||||
|
||||
// Needed for M_TOXIC_FART
|
||||
if("fart", "farts")
|
||||
if(reagents.has_reagent("simethicone"))
|
||||
return
|
||||
// playsound(loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
|
||||
if(locate(/obj/item/storage/bible) in get_turf(src))
|
||||
to_chat(viewers(src), "<span class='danger'>[src] farts on the Bible!</span>")
|
||||
var/image/cross = image('icons/obj/storage.dmi', "bible")
|
||||
@@ -844,29 +840,10 @@
|
||||
for(var/client/X in GLOB.admins)
|
||||
if(check_rights(R_EVENT, 0, X.mob))
|
||||
to_chat(X, adminbfmessage)
|
||||
else if(TOXIC_FARTS in mutations)
|
||||
message = "<b>[src]</b> unleashes a [pick("horrible", "terrible", "foul", "disgusting", "awful")] fart."
|
||||
else if(SUPER_FART in mutations)
|
||||
message = "<b>[src]</b> unleashes a [pick("loud", "deafening")] fart."
|
||||
else
|
||||
message = "<b>[src]</b> [pick("passes wind", "farts")]."
|
||||
m_type = 2
|
||||
|
||||
var/turf/location = get_turf(src)
|
||||
|
||||
// Process toxic farts first.
|
||||
if(TOXIC_FARTS in mutations)
|
||||
for(var/mob/living/carbon/C in range(location, 2))
|
||||
if(C.internal != null && C.wear_mask && (C.wear_mask.flags & AIRTIGHT))
|
||||
continue
|
||||
if(C == src)
|
||||
continue
|
||||
C.reagents.add_reagent("jenkem", 1)
|
||||
|
||||
// Farting as a form of locomotion in space
|
||||
if(SUPER_FART in mutations)
|
||||
newtonian_move(dir)
|
||||
|
||||
if("hem")
|
||||
message = "<b>[src]</b> hems."
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -51,7 +51,6 @@
|
||||
"evil",
|
||||
"exo",
|
||||
"exotic",
|
||||
"farty",
|
||||
"flux",
|
||||
"flying",
|
||||
"freak",
|
||||
@@ -471,4 +470,4 @@
|
||||
"concentrated_initro",
|
||||
"heartworms"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -131,8 +131,6 @@
|
||||
"OPAQUE",
|
||||
"GLOWING",
|
||||
"SHAKING",
|
||||
"FARTING",
|
||||
"POOPING",
|
||||
"BOUNCING",
|
||||
"COMMITTED",
|
||||
"MASKED",
|
||||
@@ -426,7 +424,6 @@
|
||||
"A REPAIRMAN",
|
||||
"BILL NYE THE SCIENCE GUY",
|
||||
"RAINBOWS",
|
||||
"A PET UNICORN THAT FARTS ICING",
|
||||
"THUNDERCATS HO",
|
||||
"AN ARMY OF SPIDERS",
|
||||
"GODDAMN FUCKING PIECE OF SHIT ASSHOLE BITCH-CHRISTING CUNTSMUGGLING SWEARING",
|
||||
@@ -603,7 +600,6 @@
|
||||
"IGNORE THE CLOWN",
|
||||
"IGNORE THE CAPTAIN",
|
||||
"IGNORE ASSISTANTS",
|
||||
"MAKE FART NOISES",
|
||||
"TALK ABOUT FOOD",
|
||||
"TALK ABOUT SEX",
|
||||
"TALK ABOUT YOUR DAY",
|
||||
|
||||
Reference in New Issue
Block a user