mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-12 16:44:43 +01:00
[MIRROR] Cleans Up (a few) Single-Lines Over 300 Characters [MDB IGNORE] (#19123)
* Cleans Up (a few) Single-Lines Over 300 Characters (#73124) These were just super long picks with multiple strings/file references/whatever, let's convert it into a list of picks, maybe do some cool proc stuff, just make it look NICER. I found it by doing `rg '.{300,}' code > output.txt` from the root of my repository (used ripgrep because that's what i had at the time), and you can see a copy of the results I got here: https://github.com/tgstation/tgstation/files/10553651/output.txt in case you wanna take a stab at it. I didn't filter by .dm code file, so there's a few bulky JSONs and MD sections, but maybe those are good candidates for splitting up the wording or otherwise prettifying the JSON? Unsure. * Cleans Up (a few) Single-Lines Over 300 Characters --------- Co-authored-by: san7890 <the@san7890.com>
This commit is contained in:
SkyratBot
@@ -127,7 +127,11 @@
|
||||
if(target.loc == loc && isturf(target.loc)) //LADIES AND GENTLEMAN WE GOTEM PREPARE TO DUMP
|
||||
start_washing()
|
||||
if(mad)
|
||||
var/list/messagevoice = list("Well about fucking time you degenerate." = 'sound/voice/hygienebot/degenerate.ogg', "Fucking finally." = 'sound/voice/hygienebot/finally.ogg', "Thank god, you finally stopped." = 'sound/voice/hygienebot/thankgod.ogg')
|
||||
var/static/list/messagevoice = list(
|
||||
"Fucking finally." = 'sound/voice/hygienebot/finally.ogg',
|
||||
"Thank god, you finally stopped." = 'sound/voice/hygienebot/thankgod.ogg',
|
||||
"Well about fucking time you degenerate." = 'sound/voice/hygienebot/degenerate.ogg',
|
||||
)
|
||||
var/message = pick(messagevoice)
|
||||
speak(message)
|
||||
playsound(loc, messagevoice[message], 50)
|
||||
@@ -142,7 +146,15 @@
|
||||
return
|
||||
SSmove_manager.move_to(src, target, 0, currentspeed)
|
||||
if(mad && prob(min(frustration * 2, 60)))
|
||||
var/list/messagevoice = list("Get back here you foul smelling fucker." = 'sound/voice/hygienebot/foulsmelling.ogg', "STOP RUNNING OR I WILL CUT YOUR ARTERIES!" = 'sound/voice/hygienebot/cutarteries.ogg', "Just fucking let me clean you you arsehole!" = 'sound/voice/hygienebot/letmeclean.ogg', "STOP. RUNNING." = 'sound/voice/hygienebot/stoprunning.ogg', "Either you stop running or I will fucking drag you out of an airlock." = 'sound/voice/hygienebot/dragyouout.ogg', "I just want to fucking clean you you troglodyte." = 'sound/voice/hygienebot/troglodyte.ogg', "If you don't come back here I'll put a green cloud around you cunt." = 'sound/voice/hygienebot/greencloud.ogg')
|
||||
var/static/list/messagevoice = list(
|
||||
"Either you stop running or I will fucking drag you out of an airlock." = 'sound/voice/hygienebot/dragyouout.ogg',
|
||||
"Get back here you foul smelling fucker." = 'sound/voice/hygienebot/foulsmelling.ogg',
|
||||
"I just want to fucking clean you you troglodyte." = 'sound/voice/hygienebot/troglodyte.ogg',
|
||||
"If you don't come back here I'll put a green cloud around you cunt." = 'sound/voice/hygienebot/greencloud.ogg',
|
||||
"Just fucking let me clean you you arsehole!" = 'sound/voice/hygienebot/letmeclean.ogg',
|
||||
"STOP RUNNING OR I WILL CUT YOUR ARTERIES!" = 'sound/voice/hygienebot/cutarteries.ogg',
|
||||
"STOP. RUNNING." = 'sound/voice/hygienebot/stoprunning.ogg',
|
||||
)
|
||||
var/message = pick(messagevoice)
|
||||
speak(message)
|
||||
playsound(loc, messagevoice[message], 50)
|
||||
|
||||
@@ -374,7 +374,14 @@
|
||||
)
|
||||
playsound(src, pick(i_need_scissors), 70)
|
||||
else
|
||||
var/list/messagevoice = list("Radar, put a mask on!" = 'sound/voice/medbot/radar.ogg',"There's always a catch, and I'm the best there is." = 'sound/voice/medbot/catch.ogg',"I knew it, I should've been a plastic surgeon." = 'sound/voice/medbot/surgeon.ogg',"What kind of medbay is this? Everyone's dropping like flies." = 'sound/voice/medbot/flies.ogg',"Delicious!" = 'sound/voice/medbot/delicious.ogg', "Why are we still here? Just to suffer?" = 'sound/voice/medbot/why.ogg')
|
||||
var/static/list/messagevoice = list(
|
||||
"Delicious!" = 'sound/voice/medbot/delicious.ogg',
|
||||
"I knew it, I should've been a plastic surgeon." = 'sound/voice/medbot/surgeon.ogg',
|
||||
"Radar, put a mask on!" = 'sound/voice/medbot/radar.ogg',
|
||||
"There's always a catch, and I'm the best there is." = 'sound/voice/medbot/catch.ogg',
|
||||
"What kind of medbay is this? Everyone's dropping like flies." = 'sound/voice/medbot/flies.ogg',
|
||||
"Why are we still here? Just to suffer?" = 'sound/voice/medbot/why.ogg',
|
||||
)
|
||||
var/message = pick(messagevoice)
|
||||
speak(message)
|
||||
playsound(src, messagevoice[message], 50)
|
||||
|
||||
@@ -1201,7 +1201,7 @@
|
||||
affected_mob.adjust_jitter_up_to(6 SECONDS * REM * delta_time, 1 MINUTES)
|
||||
affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM * delta_time, 150, affected_organtype)
|
||||
if(DT_PROB(5, delta_time))
|
||||
affected_mob.say(pick("Yeah, well, you know, that's just, like, uh, your opinion, man.", "Am I glad he's frozen in there and that we're out here, and that he's the sheriff and that we're frozen out here, and that we're in there, and I just remembered, we're out here. What I wanna know is: Where's the caveman?", "It ain't me, it ain't me...", "Make love, not war!", "Stop, hey, what's that sound? Everybody look what's going down...", "Do you believe in magic in a young girl's heart?"), forced = /datum/reagent/medicine/earthsblood)
|
||||
affected_mob.say(return_hippie_line(), forced = /datum/reagent/medicine/earthsblood)
|
||||
affected_mob.adjust_drugginess_up_to(20 SECONDS * REM * delta_time, 30 SECONDS * REM * delta_time)
|
||||
..()
|
||||
. = TRUE
|
||||
@@ -1226,6 +1226,19 @@
|
||||
..()
|
||||
. = TRUE
|
||||
|
||||
/// Returns a hippie-esque string for the person affected by the reagent to say.
|
||||
/datum/reagent/medicine/earthsblood/proc/return_hippie_line()
|
||||
var/static/list/earthsblood_lines = list(
|
||||
"Am I glad he's frozen in there and that we're out here, and that he's the sheriff and that we're frozen out here, and that we're in there, and I just remembered, we're out here. What I wanna know is: Where's the caveman?",
|
||||
"Do you believe in magic in a young girl's heart?",
|
||||
"It ain't me, it ain't me...",
|
||||
"Make love, not war!",
|
||||
"Stop, hey, what's that sound? Everybody look what's going down...",
|
||||
"Yeah, well, you know, that's just, like, uh, your opinion, man.",
|
||||
)
|
||||
|
||||
return pick(earthsblood_lines)
|
||||
|
||||
/datum/reagent/medicine/haloperidol
|
||||
name = "Haloperidol"
|
||||
description = "Increases depletion rates for most stimulating/hallucinogenic drugs. Reduces druggy effects and jitteriness. Severe stamina regeneration penalty, causes drowsiness. Small chance of brain damage."
|
||||
|
||||
@@ -611,7 +611,23 @@
|
||||
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE
|
||||
|
||||
/datum/chemical_reaction/scream/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
|
||||
playsound(holder.my_atom, pick(list( 'sound/voice/human/malescream_1.ogg', 'sound/voice/human/malescream_2.ogg', 'sound/voice/human/malescream_3.ogg', 'sound/voice/human/malescream_4.ogg', 'sound/voice/human/malescream_5.ogg', 'sound/voice/human/malescream_6.ogg', 'sound/voice/human/femalescream_1.ogg', 'sound/voice/human/femalescream_2.ogg', 'sound/voice/human/femalescream_3.ogg', 'sound/voice/human/femalescream_4.ogg', 'sound/voice/human/femalescream_5.ogg', 'sound/voice/human/wilhelm_scream.ogg')), created_volume*5,TRUE)
|
||||
/// List of screams to play.
|
||||
var/static/list/screams = list(
|
||||
'sound/voice/human/femalescream_1.ogg',
|
||||
'sound/voice/human/femalescream_2.ogg',
|
||||
'sound/voice/human/femalescream_3.ogg',
|
||||
'sound/voice/human/femalescream_4.ogg',
|
||||
'sound/voice/human/femalescream_5.ogg',
|
||||
'sound/voice/human/malescream_1.ogg',
|
||||
'sound/voice/human/malescream_2.ogg',
|
||||
'sound/voice/human/malescream_3.ogg',
|
||||
'sound/voice/human/malescream_4.ogg',
|
||||
'sound/voice/human/malescream_5.ogg',
|
||||
'sound/voice/human/malescream_6.ogg',
|
||||
'sound/voice/human/wilhelm_scream.ogg',
|
||||
)
|
||||
|
||||
playsound(holder.my_atom, pick(screams), created_volume*5,TRUE)
|
||||
|
||||
/datum/chemical_reaction/hair_dye
|
||||
results = list(/datum/reagent/hair_dye = 5)
|
||||
|
||||
Reference in New Issue
Block a user